can now drop all explit tests and links for libjpeg, libpng, libiconv

since all usage is now indirect

diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index 9839ba6edcd97ed3eb7224190c3629b7ac98ba85..59759dd393425eed9859244b55104f8eba274316 100644 (file)
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -90,7 +90,7 @@ dot_static_LDADD = \
        $(top_builddir)/lib/$(GRAPH)/lib$(GRAPH)_C.la \
        $(top_builddir)/lib/xdot/libxdot_C.la \
        $(top_builddir)/lib/cdt/libcdt_C.la \
-               $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS) $(GTS_LIBS) $(ICONV_LIBS) $(EXPAT_LIBS) $(Z_LIBS) $(LIBGEN_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
+               $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS) $(GTS_LIBS) $(EXPAT_LIBS) $(Z_LIBS) $(LIBGEN_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
 
 dot_builtins_SOURCES = dot.c dot_builtins.c
 dot_builtins_CPPFLAGS = $(AM_CPPFLAGS) -DDEMAND_LOADING=1
@@ -103,11 +103,11 @@ dot_builtins_LDADD = \
        $(top_builddir)/lib/$(GRAPH)/lib$(GRAPH).la \
        $(top_builddir)/lib/xdot/libxdot.la \
        $(top_builddir)/lib/cdt/libcdt.la \
-               $(GTS_LIBS) $(ICONV_LIBS) $(EXPAT_LIBS) $(Z_LIBS) $(LIBGEN_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
+               $(GTS_LIBS) $(EXPAT_LIBS) $(Z_LIBS) $(LIBGEN_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
 
 if WITH_LIBGD
-dot_static_LDADD += $(top_builddir)/plugin/gd/.libs/libgvplugin_gd_C.a $(GD_LIBS) $(FONTCONFIG_LIBS) $(FREETYPE2_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(Z_LIBS)
-dot_builtins_LDADD += $(top_builddir)/plugin/gd/libgvplugin_gd.la $(GD_LIBS) $(FONTCONFIG_LIBS) $(FREETYPE2_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(Z_LIBS)
+dot_static_LDADD += $(top_builddir)/plugin/gd/.libs/libgvplugin_gd_C.a $(GD_LIBS)
+dot_builtins_LDADD += $(top_builddir)/plugin/gd/libgvplugin_gd.la $(GD_LIBS)
 endif
 
 if WITH_PANGOCAIRO

diff --git a/cmd/smyrna/Makefile.am b/cmd/smyrna/Makefile.am
index a803ee9e372bb89440080e238805782ddec9e29c..c294dcba6e5a361a356736db536828985cc80221 100644 (file)
--- a/cmd/smyrna/Makefile.am
+++ b/cmd/smyrna/Makefile.am
@@ -65,8 +65,7 @@ smyrna_LDADD = $(top_builddir)/lib/cgraph/libcgraph_C.la \
                $(top_builddir)/lib/expr/libexpr_C.la \
                $(top_builddir)/lib/ingraphs/libingraphs_C.la \
                $(top_builddir)/lib/neatogen/libneatogen_C.la \
-               $(GTK_LIBS) $(GLUT_LIBS) $(GTKGLEXT_LIBS) $(GLADE_LIBS) $(EXPAT_LIBS) $(GTS_LIBS) $(PNG_LIBS) \
-               $(EXTRA_SMYRNA_LDFLAGS)
+               $(GTK_LIBS) $(GLUT_LIBS) $(GTKGLEXT_LIBS) $(GLADE_LIBS) $(EXPAT_LIBS) $(GTS_LIBS) $(EXTRA_SMYRNA_LDFLAGS)
 
 smyrna_static_SOURCES = $(smyrna_SOURCES)
 smyrna_static_LDADD = $(top_builddir)/lib/cgraph/libcgraph_C.la \
@@ -79,7 +78,7 @@ smyrna_static_LDADD = $(top_builddir)/lib/cgraph/libcgraph_C.la \
                $(top_builddir)/lib/expr/libexpr_C.la \
                $(top_builddir)/lib/ingraphs/libingraphs_C.la \
                $(top_builddir)/lib/neatogen/libneatogen_C.la \
-               $(GTK_LIBS) $(GLUT_LIBS) $(GTKGLEXT_LIBS) $(GLADE_LIBS) $(EXPAT_LIBS) $(GTS_LIBS) $(PNG_LIBS)
+               $(GTK_LIBS) $(GLUT_LIBS) $(GTKGLEXT_LIBS) $(GLADE_LIBS) $(EXPAT_LIBS) $(GTS_LIBS)
 
 smyrna.1.pdf: $(srcdir)/smyrna.1
        - @GROFF@ -Tps -man $(srcdir)/smyrna.1 | @PS2PDF@ - - >smyrna.1.pdf

diff --git a/configure.ac b/configure.ac
index edee6bcc0fa7e23bbe2460fe99c12b226534f89c..18e8958335491b8c40e89af1adc4f7f016ea4ff7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -525,14 +525,9 @@ LIBS="$save_LIBS"
 #AC_CHECK_LIB([cairo], [main])
 #AC_CHECK_LIB([dl], [main])
 #AC_CHECK_LIB([fl], [main])
-#AC_CHECK_LIB([fontconfig], [main])
-#AC_CHECK_LIB([freetype], [main])
-#AC_CHECK_LIB([iconv], [main])
 #AC_CHECK_LIB([intl], [main])
-#AC_CHECK_LIB([jpeg], [main])
 #AC_CHECK_LIB([m], [main])
 #AC_CHECK_LIB([perl], [main])
-#AC_CHECK_LIB([png], [main])
 #AC_CHECK_LIB([popt], [main])
 #AC_CHECK_LIB([xml2], [main])
 #AC_CHECK_LIB([z], [main])
@@ -2741,54 +2736,6 @@ CPPFLAGS=$save_CPPFLAGS
 AC_SUBST([GLUT_CFLAGS])
 AC_SUBST([GLUT_LIBS])
 
-dnl -----------------------------------
-dnl INCLUDES and LIBS for PNG 
-
-AC_ARG_WITH(png,
-  [AS_HELP_STRING([--with-png=yes],[PNG library])],
-  [], [with_png=yes])
-
-if test "x$with_png" != "xyes"; then
-  use_png="No (disabled)"
-else
-  save_CPPFLAGS=$CPPFLAGS
-  save_LDFLAGS=$LDFLAGS
-  AC_PATH_PROG(LIBPNG_CONFIG,libpng-config)
-  if test -n "$LIBPNG_CONFIG"; then
-        PNG_INCLUDES=`$LIBPNG_CONFIG --cflags`
-        PNG_PREFIX=`$LIBPNG_CONFIG --prefix`
-       if test "${PNG_PREFIX}/lib" != "/usr/lib" ; then
-               PNG_LIBS="-L${PNG_PREFIX}/lib"
-       fi
-  else
-       PNG_INCLUDES=""
-  fi
-  AC_ARG_WITH(pngincludedir,
-    [AS_HELP_STRING([--with-pngincludedir=DIR],[use PNG includes from DIR])],
-    [PNG_INCLUDES="-I$withval"])
-  CPPFLAGS="$CPPFLAGS $PNG_INCLUDES $Z_INCLUDES"
-  AC_ARG_WITH(pnglibdir,
-    [AS_HELP_STRING([--with-pnglibdir=DIR],[use PNG libraries from DIR])],
-    [PNG_LIBS="-L$withval"])
-  LDFLAGS="$LDFLAGS $PNG_LIBS $Z_LIBS"
-  AC_CHECK_HEADER(png.h,
-       AC_CHECK_LIB(png,main,
-               [PNG_LIBS="$PNG_LIBS -lpng"
-               use_png="Yes"
-               AC_DEFINE_UNQUOTED(HAVE_GD_PNG,1,[Define if the GD library has the GD_PNG feature])
-               AC_DEFINE_UNQUOTED(HAVE_LIBPNG,1,[Define if you have the PNG library])],
-               use_png="No (missing libpng)"
-               AC_MSG_WARN(Optional png library not available),
-               [$Z_LIBS $MATH_LIBS]),
-       use_png="No (missing png.h)"
-       AC_MSG_WARN(Optional png library not available - no png.h))
-
-fi
-LDFLAGS=$save_LDFLAGS
-CPPFLAGS=$save_CPPFLAGS
-AC_SUBST([PNG_INCLUDES])
-AC_SUBST([PNG_LIBS])
-
 # -----------------------------------
 # tclInt.h
 if test -f "$TCL_SRC_DIR/generic/tclInt.h"; then
@@ -2901,10 +2848,6 @@ else
      AC_MSG_WARN(SMYRNA requires GLUT)
      requires="$requires glut"
   fi
-  if test "x$use_png" != "xYes"; then
-     AC_MSG_WARN(SMYRNA requires PNG)
-     requires="$requires png"
-  fi
   if test "x$requires" != "x"; then
      use_smyrna="No (requires:$requires)"
   else
@@ -3297,8 +3240,6 @@ echo "  gts:           $use_gts"
 echo "  ipsepcola:     $use_ipsepcola"
 echo "  ltdl:          $use_ltdl"
 echo "  ortho:         $use_ortho"
-echo "  png:           $use_png"
-echo "  jpeg:          $use_jpeg"
 echo "  sfdp:          $use_sfdp"
 echo "  shared:        $use_shared"
 echo "  static:        $use_static"

diff --git a/graphviz.spec.in b/graphviz.spec.in
index 6a1c5c860bcb9dd7b01cfee5ed015bc2bb420c73..3c3de3a298f00f7d3dd8bc550cb6ac053efb4e5e 100644 (file)
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -39,11 +39,11 @@ Prefix: /usr
 
 # SuSE uses a different mechanism to generate BuildRequires
 # norootforbuild
-# neededforbuild  expat freetype2 freetype2-devel gcc libjpeg libpng-devel-packages tcl tcl-devel tk tk-devel x-devel-packages
+# neededforbuild  expat freetype2-devel gcc tcl tcl-devel tk tk-devel x-devel-packages
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: zlib-devel libpng-devel libjpeg-devel expat-devel
+BuildRequires: zlib-devel expat-devel
 BuildRequires: /bin/ksh bison m4 flex swig tk tcl >= 8.3 freetype-devel >= 2
 
 #-- Red Hat Enterprise Linux (also Centos) specific Build Requirements --------------------

diff --git a/tclpkg/gdtclft/Makefile.am b/tclpkg/gdtclft/Makefile.am
index eb733c70eea13aca1e7708bafb292491d433b3a9..29dc3e20cf6d3cb84ffa4abf8c466cba69da5bf5 100644 (file)
--- a/tclpkg/gdtclft/Makefile.am
+++ b/tclpkg/gdtclft/Makefile.am
@@ -34,7 +34,7 @@ if WITH_LIBGD
 libgdtclft_la_LIBADD = \
        $(top_builddir)/tclpkg/tclhandle/libtclhandle_C.la \
        $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la \
-       $(GD_LIBS) $(ICONV_LIBS) $(FONTCONFIG_LIBS) $(FREETYPE2_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(Z_LIBS) $(MATH_LIBS)
+       $(GD_LIBS)
 
 if WITH_TCL
 all-local: pkgIndex.tcl

diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am
index ef78177e6ca0a09996f8b42f7d88b46b341a690e..5cc3d5e0e1f8c6f9f36ea2291c80828c6848dfa8 100644 (file)
--- a/tclpkg/tcldot/Makefile.am
+++ b/tclpkg/tcldot/Makefile.am
@@ -58,10 +58,10 @@ libtcldot_la_DEPENDENCIES =  $(top_builddir)/lib/gvc/libgvc.la
 
 # GDTCLFT requires gd libs to be builtin
 if WITH_LIBGD
-libtcldot_la_LIBADD += $(GD_LIBS) $(FONTCONFIG_LIBS) $(FREETYPE2_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(Z_LIBS)
+libtcldot_la_LIBADD += $(GD_LIBS)
 endif
 
-libtcldot_la_LIBADD += $(LIBGEN_LIBS) $(ICONV_LIBS) $(MATH_LIBS)
+libtcldot_la_LIBADD += $(LIBGEN_LIBS) $(MATH_LIBS)
 
 libtcldot_builtin_la_SOURCES = tcldot.c tcldot_builtins.c $(GDTCLFT)
 libtcldot_builtin_la_CPPFLAGS = $(AM_CPPFLAGS) -DDEMAND_LOADING=1
@@ -84,10 +84,10 @@ endif
 
 if WITH_LIBGD
 libtcldot_builtin_la_LIBADD += $(top_builddir)/plugin/gd/libgvplugin_gd_C.la
-libtcldot_builtin_la_LIBADD += $(GD_LIBS) $(FONTCONFIG_LIBS) $(FREETYPE2_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(Z_LIBS)
+libtcldot_builtin_la_LIBADD += $(GD_LIBS)
 endif
 
-libtcldot_builtin_la_LIBADD += $(ICONV_LIBS) $(EXPAT_LIBS) $(LIBGEN_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
+libtcldot_builtin_la_LIBADD += $(EXPAT_LIBS) $(LIBGEN_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
 
 if WITH_TCL
 all-local: pkgIndex.tcl