add configure, rpm, and Makefile support for -lgts on smyrna

diff --git a/cmd/smyrna/Makefile.am b/cmd/smyrna/Makefile.am
index 8b6793323791d6a9a63f59c0a28920373ee7e16a..6fac4da6336e4c95002d8d31bb9c9458e5cedbc6 100644 (file)
--- a/cmd/smyrna/Makefile.am
+++ b/cmd/smyrna/Makefile.am
@@ -9,7 +9,7 @@ AM_CPPFLAGS = \
         -I$(top_srcdir)/lib/topfish \
         -I$(top_srcdir)/lib/common \
         -I$(top_srcdir)/cmd/smyrna/gui \
-       $(GTK_CFLAGS) $(GTKGLEXT_CFLAGS) $(GLADE_CFLAGS) $(FREETYPE2_CFLAGS) $(FONTCONFIG_CFLAGS)
+       $(GTK_CFLAGS) $(GTKGLEXT_CFLAGS) $(GLADE_CFLAGS) $(FREETYPE2_CFLAGS) $(FONTCONFIG_CFLAGS) $(GTS_CFLAGS)
 
 if WITH_SMYRNA
 noinst_HEADERS = btree.h draw.h filter.h glexpose.h glmotion.h gltemplate.h \
@@ -35,4 +35,4 @@ smyrna_LDADD = $(top_builddir)/lib/cgraph/libcgraph_C.la \
                $(top_builddir)/lib/glcomp/libglcomp_C.la \
                $(top_builddir)/lib/topfish/libtopfish_C.la \
                $(top_builddir)/lib/common/libcommon_C.la \
-               $(GTK_LIBS) $(GTKGLEXT_LIBS) $(GLADE_LIBS) $(EXPAT_LIBS)
+               $(GTK_LIBS) $(GTKGLEXT_LIBS) $(GLADE_LIBS) $(EXPAT_LIBS) $(GTS_LIBS)

diff --git a/configure.ac b/configure.ac
index 740dbf675e9ca0ac718bb6da763eea6b7339dfff..d6530a95a37bfba53b871a8f7c6cdd564a3af85c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1783,7 +1783,7 @@ PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.7.0],
         [HAVE_GTK=1
         AC_DEFINE_UNQUOTED(HAVE_GTK,1,
                 [Define if you have the gtk+ library])],
-        [AC_MSG_WARN(gtk+ library not available. desktop features will not be built)])
+        [AC_MSG_WARN(gtk+ library not available.)])
 fi
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
@@ -1801,7 +1801,7 @@ PKG_CHECK_MODULES(GTKGL, [gtkgl-2.0],
         [HAVE_GTKGL=1
         AC_DEFINE_UNQUOTED(HAVE_GTKGL,1,
                 [Define if you have the gtkgl library])],
-        [AC_MSG_WARN(gtkgl library not available. desktop features will not be built)])
+        [AC_MSG_WARN(gtkgl library not available.)])
 fi
 AC_SUBST(GTKGL_CFLAGS)
 AC_SUBST(GTKGL_LIBS)
@@ -1819,12 +1819,30 @@ PKG_CHECK_MODULES(GTKGLEXT, [gtkglext-1.0],
         [HAVE_GTKGLEXT=1
         AC_DEFINE_UNQUOTED(HAVE_GTKGLEXT,1,
                 [Define if you have the gtkglext library])],
-        [AC_MSG_WARN(gtkglext library not available. desktop features will not be built)])
+        [AC_MSG_WARN(gtkglext library not available.)])
 fi
 AC_SUBST(GTKGLEXT_CFLAGS)
 AC_SUBST(GTKGLEXT_LIBS)
 AM_CONDITIONAL(WITH_GTKGLEXT, [test "x$HAVE_GTKGLEXT" != "x"])
 
+dnl -----------------------------------
+dnl INCLUDES and LIBS for GTS.
+
+AC_ARG_WITH(gts,
+  [AC_HELP_STRING([--with-gts=yes], [gts library])],
+  [], [with_gts=yes])
+
+if test "x$with_gts" = "xyes"; then
+PKG_CHECK_MODULES(GTS, [gts],
+        [HAVE_GTS=1
+        AC_DEFINE_UNQUOTED(HAVE_GTS,1,
+                [Define if you have the gts library])],
+        [AC_MSG_WARN(gts library not available.)])
+fi
+AC_SUBST(GTS_CFLAGS)
+AC_SUBST(GTS_LIBS)
+AM_CONDITIONAL(WITH_GTS, [test "x$HAVE_GTS" != "x"])
+
 dnl -----------------------------------
 dnl INCLUDES and LIBS for GLADE.
 
@@ -2270,10 +2288,6 @@ if test "x$HAVE_GTK" != "x1"; then
        with_smyrna=no
        AC_MSG_WARN(SMYRNA requires GTK)
 fi
-#if test "x$HAVE_GTKGL" != "x1"; then
-#      with_smyrna=no
-#      AC_MSG_WARN(SMYRNA requires GTKGL on Linux, but not on Mac)
-#fi
 if test "x$HAVE_GTKGLEXT" != "x1"; then
        with_smyrna=no
        AC_MSG_WARN(SMYRNA requires GTKGLEXT)
@@ -2282,6 +2296,10 @@ if test "x$HAVE_GLADE" != "x1"; then
        with_smyrna=no
        AC_MSG_WARN(SMYRNA requires GLADE)
 fi
+if test "x$HAVE_GTS" != "x1"; then
+       with_smyrna=no
+       AC_MSG_WARN(SMYRNA requires GTS)
+fi
 
 if test "x$with_smyrna" = "xyes"; then
        AC_DEFINE_UNQUOTED(SMYRNA,1,[Define if you want SMYRNA])

diff --git a/graphviz.spec.in b/graphviz.spec.in
index 22e5a9a39ad53d801cf3436418ef42342b2be876..f9070b2ff2decec2668a7df9517562f6a8f6705c 100644 (file)
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -192,7 +192,7 @@ BuildRequires: R-devel swig >= 1.3.33
 # packaging is ok, but code is not ready for distribution
 #
 # <percent>define SMYRNA 1
-# BuildRequires: gtkglarea2-devel gtkglext-devel glade3-libgladeui-devel
+# BuildRequires: gtkglarea2-devel gtkglext-devel glade3-libgladeui-devel gts-devel
 # <percent>define GLITZ 1
 # BuildRequires: glitz-devel
 %endif
@@ -251,7 +251,7 @@ BuildRequires: gd gd-devel perl-devel DevIL-devel
 %define R_LANG 1
 BuildRequires: R-devel swig >= 1.3.33
 %define SMYRNA 1
-BuildRequires: gtkglarea2-devel gtkglext-devel glade3-libgladeui-devel
+BuildRequires: gtkglarea2-devel gtkglext-devel glade3-libgladeui-devel gts-devel
 # <percent>define GLITZ 1
 # BuildRequires: glitz-devel
 %endif