fix build when gd-devel not installed

diff --git a/configure.ac b/configure.ac
index 635e1887540fa54719393e31d01f40a34f75675a..28121ca37b8776896f2791dab867edd56cdb6753 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2574,9 +2574,7 @@ AC_ARG_WITH(libgd,
   [AS_HELP_STRING([--with-libgd=yes],[use gd library])],
   [], [with_libgd=yes])
 
-if test "x$with_libgd" = "xyes"; then
-  with_libgd=yes
-else
+if test "x$with_libgd" != "xyes"; then
   use_gd="No (disabled)"
 fi
 
@@ -2679,6 +2677,7 @@ if test "x$use_gd" = "x"; then
       AC_CHECK_HEADER(gd.h,,[
         AC_MSG_WARN(Optional GD library not available - no gd.h)
         use_gd="No (gd headers not found)"
+       with_libgd="no"
       ])
       if test "x$use_gd" = "x"; then
         AC_CHECK_LIB(gd,main,[

diff --git a/plugin/gd/Makefile.am b/plugin/gd/Makefile.am
index 442c38a6edf9fe2e2b6788c7bb6e03f4f04b9f46..2c68687bd4d156b2ab12192c2e3107728f98742c 100644 (file)
--- a/plugin/gd/Makefile.am
+++ b/plugin/gd/Makefile.am
@@ -16,6 +16,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib/cdt \
        $(PANGOCAIRO_CFLAGS) $(GD_INCLUDES) $(LIBGVC_CFLAGS)
 
+if WITH_LIBGD
 noinst_LTLIBRARIES = libgvplugin_gd_C.la
 
 if WITH_WIN32
@@ -23,6 +24,7 @@ lib_LTLIBRARIES = libgvplugin_gd.la
 else
 pkglib_LTLIBRARIES = libgvplugin_gd.la
 endif
+endif
 
 libgvplugin_gd_C_la_SOURCES = \
        gvplugin_gd.c \
@@ -34,6 +36,8 @@ libgvplugin_gd_C_la_SOURCES = \
 
 libgvplugin_gd_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
 libgvplugin_gd_la_SOURCES = $(libgvplugin_gd_C_la_SOURCES)
+
+if WITH_LIBGD
 libgvplugin_gd_la_LIBADD = \
        $(top_builddir)/lib/gvc/libgvc.la \
        $(top_builddir)/lib/$(GRAPH)/lib$(GRAPH).la \
@@ -48,6 +52,7 @@ endif
 if WITH_DARWIN9
 libgvplugin_gd_la_LDFLAGS += -Wl,-exported_symbol,_gvplugin_gd_LTX_library
 endif
+endif
 
 EXTRA_DIST = Makefile.old gvplugin_gd.vcproj gvplugin_gd.def