Make libgd optional, default without.

	Use:  --with-mylibgd to add it back in
	or use: graphviz-gd  to get it from a plugin.

diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index 4fd4d1dd7376f4dfcf3bf2371c6275a7ff943512..03627009fb2198eb79cdaffd1dcbe4e794331e53 100644 (file)
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -54,8 +54,7 @@ dot_static_LDADD = \
        $(top_builddir)/lib/pack/.libs/libpack.a \
        $(top_builddir)/lib/graph/.libs/libgraph.a \
        $(top_builddir)/lib/cdt/.libs/libcdt.a \
-       $(top_builddir)/lib/gd/.libs/libgvgd.a \
-       @ICONV_LIBS@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @MATH_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@
+       @GD_LIBS_STATIC@ @ICONV_LIBS@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @MATH_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@
 
 EXTRA_DIST = Makefile.old dot.1 dot.pdf
 

diff --git a/configure.ac b/configure.ac
index 781fcf9c98eb078d2df4bc0bb8ff9c77005a275c..90b1c9d82ac50ec8fce202833fc0fa3e0658097e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -136,13 +136,13 @@ dnl -----------------------------------
 
 AC_ARG_ENABLE(static,
         [AC_HELP_STRING([--enable-static], [build static executable])])
-if test "x$enable_static" != "xno"; then
+if test "x$enable_static" = "xyes"; then
        AC_ENABLE_STATIC
        AC_DEFINE(ENABLE_STATIC,1,[Define if you want statically linked executables])
 else
        AC_DISABLE_STATIC
 fi
-AM_CONDITIONAL(ENABLE_STATIC, [test "x$enable_static" != "xno"])
+AM_CONDITIONAL(ENABLE_STATIC, [test "x$enable_static" = "xyes"])
 
 dnl -----------------------------------
 dnl checks for various programs
@@ -1113,13 +1113,34 @@ AC_SUBST(IPSEPCOLA_LIBS)
                                                                                 
 AM_CONDITIONAL(WITH_IPSEPCOLA, [test "x$with_ipsepcola" = "xyes"])
 
+dnl -----------------------------------
+dnl INCLUDES and LIBS for PANGO, CAIRO et.al.
+                                                                                
+PKG_CHECK_MODULES(PANGOCAIRO, [pangocairo >= 1.0],
+       [AC_DEFINE_UNQUOTED(HAVE_PANGOCAIRO,1,
+               [Define if you have the pangocairo library])],
+       [AC_MSG_WARN(pangocairo library not available)])
+AC_SUBST(PANGOCAIRO_CFLAGS)
+AC_SUBST(PANGOCAIRO_LIBS)
+
 dnl -----------------------------------
 dnl INCLUDES and LIBS for GD
                                                                                 
+### default is to not build with libgd
+
+AC_ARG_WITH(libgd,
+  [AC_HELP_STRING([--with-libgd],
+                  [use gd library])])
+
 AC_ARG_WITH(mylibgd,
   [AC_HELP_STRING([--with-mylibgd],
                   [use internal gd library in preference to any installed libgd])])
 
+if test "x$with_mylibgd" = "xyes"; then
+       with_libgd=yes
+fi
+
+if test "x$with_libgd" = "xyes"; then
 if test "x$with_mylibgd" != "xyes"; then
     AC_PATH_PROG(GDLIB_CONFIG,gdlib-config)
     if test -n "$GDLIB_CONFIG"; then
@@ -1160,8 +1181,10 @@ if test "x$with_mylibgd" != "xyes"; then
         AC_MSG_WARN(No gdlib-config found.)
     fi
 fi
+fi
 
 if test "x$with_mylibgd" != "xyes"; then
+if test "x$with_libgd" = "xyes"; then
 # see if we can use the external gd lib
     save_CPPFLAGS=$CPPFLAGS
     save_LDFLAGS=$LDFLAGS
@@ -1176,22 +1199,28 @@ if test "x$with_mylibgd" != "xyes"; then
     AC_CHECK_HEADER(gd.h,
     AC_CHECK_LIB(gd,main,
         [GD_LIBS="$GD_LDFLAGS -lgd $GD_LIBS"
-        AC_DEFINE_UNQUOTED(HAVE_LIBGD,1,[Define if you have the GD library])],
-        AC_MSG_WARN(Optional GD library not available),
-       $GD_LIBS),
-    AC_MSG_WARN(Optional GD library not available - no gd.h))
+            AC_DEFINE_UNQUOTED(HAVE_LIBGD,1,[Define if you have the GD library])],
+        AC_MSG_WARN(Optional GD library not available), $GD_LIBS),
+           AC_MSG_WARN(Optional GD library not available - no gd.h))
     LDFLAGS=$save_LDFLAGS
     CPPFLAGS=$save_CPPFLAGS
+    GD_LIBS_STATIC=$(GD_LIBS)
+fi
 else
     # using the internal libgd
     AC_MSG_WARN(Using internal libgd source.)
     AC_DEFINE_UNQUOTED(HAVE_GD_GIF,1,[Define if the GD library has the GD_GIF feature])
+    AC_DEFINE_UNQUOTED(HAVE_LIBGD,1,[Define if either internal or external GD library is availabel])
     GD_INCLUDES='-I$(top_srcdir)/lib/gd'
     GD_LIBS='$(top_builddir)/lib/gd/libgvgd.la'
+    GD_LIBS_STATIC='$(top_builddir)/lib/gd/.libs/libgvgd.a'
 fi
 AC_SUBST(GD_INCLUDES)
 AC_SUBST(GD_LIBS)
+AC_SUBST(GD_LIBS_STATIC)
+AC_SUBST(HAVE_LIBGD)
                                                                                 
+AM_CONDITIONAL(WITH_LIBGD, [test "x$with_libgd" = "xyes"])
 AM_CONDITIONAL(WITH_MYLIBGD, [test "x$with_mylibgd" = "xyes"])
 
 dnl -----------------------------------

diff --git a/contrib/diffimg/Makefile.am b/contrib/diffimg/Makefile.am
index 3d57ae675b1ed55e59c6ca792a7ac3ec949d5c98..50e3a9456f83033059b097d4c600b87e7b466f20 100644 (file)
--- a/contrib/diffimg/Makefile.am
+++ b/contrib/diffimg/Makefile.am
@@ -5,7 +5,9 @@ VERSION=0.2
 
 AM_CPPFLAGS = @GD_INCLUDES@
 
+if WITH_LIBGD
 noinst_PROGRAMS = diffimg
+endif
 
 diffimg_SOURCES = diffimg.c