From: John Ellson Date: Sat, 10 Mar 2012 17:30:40 +0000 (-0500) Subject: disconnect internal "mylibgd" library from distro and binaries X-Git-Tag: LAST_LIBGRAPH~32^2~464^2~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e3638ea1add9e7a0a13f895234f6b2c365e64729;p=graphviz disconnect internal "mylibgd" library from distro and binaries --- diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am index 2f544aa73..9839ba6ed 100644 --- a/cmd/dot/Makefile.am +++ b/cmd/dot/Makefile.am @@ -106,14 +106,9 @@ dot_builtins_LDADD = \ $(GTS_LIBS) $(ICONV_LIBS) $(EXPAT_LIBS) $(Z_LIBS) $(LIBGEN_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS) if WITH_LIBGD -if WITH_MYLIBGD -dot_static_LDADD += $(top_builddir)/plugin/gd/.libs/libgvplugin_gd_C.a $(top_builddir)/lib/gd/libgvgd_C.la $(FONTCONFIG_LIBS) $(FREETYPE2_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(Z_LIBS) -dot_builtins_LDADD += $(top_builddir)/plugin/gd/libgvplugin_gd.la $(top_builddir)/lib/gd/libgvgd_C.la $(FONTCONFIG_LIBS) $(FREETYPE2_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(Z_LIBS) -else 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) endif -endif if WITH_PANGOCAIRO dot_static_LDADD += $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS) diff --git a/configure.ac b/configure.ac index 1f2a6c72f..edee6bcc0 100644 --- a/configure.ac +++ b/configure.ac @@ -2578,19 +2578,13 @@ AC_ARG_WITH(libgd, [AS_HELP_STRING([--with-libgd=yes],[use gd library])], [], [with_libgd=yes]) -AC_ARG_WITH(mylibgd, - [AS_HELP_STRING([--with-mylibgd=no],[use internal gd library in preference to any installed libgd])], - [], [with_mylibgd=no]) - -if test "x$with_mylibgd" = "xyes"; then +if test "x$with_libgd" = "xyes"; then with_libgd=yes +else + use_gd="No (disabled)" fi -if test "x$with_libgd" != "xyes"; then - use_gd="No (disabled)" -else - if test "x$with_libgd" = "xyes"; then - if test "x$with_mylibgd" = "xno"; then +if test "x$use_gd" = "x"; then AC_PATH_PROG(GDLIB_CONFIG,gdlib-config) if test -n "$GDLIB_CONFIG"; then GD_INCLUDES=`$GDLIB_CONFIG --includes` @@ -2635,35 +2629,31 @@ else AC_MSG_WARN(Your libgd was not built with fontconfig support. This may result in problems resolving fonts.) fi - # GD version check >= 2.0.33 else revert to --with-mylibgd - ## centos-5.8 has gd-2.0.33 + # GD version check >= 2.0.33 -- centos-5.8 has gd-2.0.33 REQ_GD_MAJORVERSION=2 REQ_GD_MINORVERSION=0 REQ_GD_REVISION=33 if test $GD_MAJORVERSION -lt $REQ_GD_MAJORVERSION; then - with_mylibgd=yes + use_gd="No (major version too old)" else if test $GD_MAJORVERSION -eq $REQ_GD_MAJORVERSION; then if test $GD_MINORVERSION -lt $REQ_GD_MINORVERSION; then - with_mylibgd=yes + use_gd="No (minor version too old)" else if test $GD_MINORVERSION -eq $REQ_GD_MINORVERSION; then if test $GD_REVISION -lt $REQ_GD_REVISION; then - with_mylibgd=yes + use_gd="No (revision too old)" fi fi fi fi fi - if test "x$with_mylibgd" = "xyes"; then + if test "x$use_gd" != "x"; then AC_MSG_WARN(GD library version < $REQ_GD_MAJORVERSION.$REQ_GD_MINORVERSION.$REQ_GD_REVISION) fi else - with_mylibgd=yes - AC_MSG_WARN(No gdlib-config found.) + AC_MSG_WARN(GD gdlib-config not found) fi - fi - fi # prevent explicit use of -I/usr/include as it breaks mingw cross-compiles if test "x$GD_INCLUDES" = "x-I/usr/include"; then GD_INCLUDES=""; @@ -2676,7 +2666,7 @@ else GD_LDFLAGS=""; fi - if test "x$with_mylibgd" = "xno"; then + if test "x$use_gd" = "x"; then if test "x$with_libgd" = "xyes"; then # see if we can use the external gd lib save_CPPFLAGS=$CPPFLAGS @@ -2707,32 +2697,11 @@ else LDFLAGS=$save_LDFLAGS CPPFLAGS=$save_CPPFLAGS fi - else - # using the internal libgd - use_gd="Yes (internal)" - 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' fi AC_SUBST([GD_INCLUDES]) AC_SUBST([GD_LIBS]) fi AM_CONDITIONAL(WITH_LIBGD, [test "x$with_libgd" = "xyes"]) -AM_CONDITIONAL(WITH_MYLIBGD, [test "x$with_mylibgd" = "xyes"]) - -dnl ---------------------------------- -dnl INCLUDES and LIBS for FREETYPE2 and FONTCONFIG (only with mylibgd) - -if test "x$with_mylibgd" = "xyes"; then - if test "x$use_freetype" = "xYes"; then - AC_DEFINE_UNQUOTED(HAVE_GD_FREETYPE,1,[Define if the GD library has the GD_FREETYPE feature]) - fi - if test "x$use_fontconfig" = "xYes"; then - AC_DEFINE_UNQUOTED(HAVE_GD_FONTCONFIG,1,[Define if the GD library has the GD_FONTCONFIG feature]) - fi -fi dnl ----------------------------------- dnl INCLUDES and LIBS for GLUT @@ -2772,45 +2741,6 @@ CPPFLAGS=$save_CPPFLAGS AC_SUBST([GLUT_CFLAGS]) AC_SUBST([GLUT_LIBS]) -dnl ----------------------------------- -dnl INCLUDES and LIBS for ICONV (only with mylibgd) - -if test "x$with_mylibgd" = "xyes"; then - -save_CPPFLAGS=$CPPFLAGS -save_LDFLAGS=$LDFLAGS -AC_ARG_WITH(iconvincludedir, - [AS_HELP_STRING([--with-iconvincludedir=DIR],[use ICONV includes from DIR])], - [ICONV_INCLUDES="-I$withval"]) -CPPFLAGS="$CPPFLAGS $ICONV_INCLUDES" -AC_ARG_WITH(iconvlibdir, - [AS_HELP_STRING([--with-iconvlibdir=DIR],[use ICONV libraries from DIR])], - [ICONV_LIBS="-L$withval"]) -LDFLAGS="$LDFLAGS $ICONV_LIBS" - -# Some systems have iconv in a separate library (e.g. Tru64 UNIX) -AM_ICONV -if test -n "$LIBICONV" ; then - ICONV_LIBS="$LIBICONV" -else - ICONV_LIBS="" -fi - -AC_CHECK_HEADERS(iconv.h, - [AC_MSG_CHECKING(whether iconv.h defines iconv_t) - AC_EGREP_HEADER([typedef.*iconv_t],iconv.h, - [AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_ICONV_T_DEF, 1, - [Define if defines iconv_t.])], - AC_MSG_RESULT(no))]) - -LDFLAGS=$save_LDFLAGS -CPPFLAGS=$save_CPPFLAGS -AC_SUBST([ICONV_INCLUDES]) -AC_SUBST([ICONV_LIBS]) - -fi - dnl ----------------------------------- dnl INCLUDES and LIBS for PNG @@ -2859,57 +2789,6 @@ CPPFLAGS=$save_CPPFLAGS AC_SUBST([PNG_INCLUDES]) AC_SUBST([PNG_LIBS]) -dnl ----------------------------------- -dnl INCLUDES and LIBS for JPEG (only with mylibgd) - -AC_ARG_WITH(jpeg, - [AS_HELP_STRING([--with-jpeg=yes],[JPEG library])], - [], [with_jpeg=yes]) - -if test "x$with_jpeg" != "xyes"; then - use_jpeg="No (disabled)" -else - -if test "x$with_mylibgd" != "xyes"; then - use_jpeg="No (only required by internal libgd)" -else - - -save_CPPFLAGS=$CPPFLAGS -save_LDFLAGS=$LDFLAGS -AC_ARG_WITH(jpegincludedir, - [AS_HELP_STRING([--with-jpegincludedir=DIR],[use JPEG includes from DIR])], - [JPEG_INCLUDES="-I$withval"]) -CPPFLAGS="$CPPFLAGS $JPEG_INCLUDES" -JPEG_LIBDIR="/usr/lib$LIBPOSTFIX" -AC_ARG_WITH(jpeglibdir, - [AS_HELP_STRING([--with-jpeglibdir=DIR],[use JPEG libraries from DIR])], - [JPEG_LIBDIR="$withval"]) -if test "$JPEG_LIBDIR" != "/usr/lib$LIBPOSTFIX"; then - JPEG_LIBS="-L$JPEG_LIBDIR" - LDFLAGS="$LDFLAGS $JPEG_LIBS" -fi -if test -f "$JPEG_LIBDIR/libjpeg.la"; then - JPEG_LIBS="$JPEG_LIBDIR/libjpeg.la" -fi -AC_CHECK_HEADER(jpeglib.h, - AC_CHECK_LIB(jpeg,main, - use_jpeg="Yes" - [JPEG_LIBS="$JPEG_LIBS -ljpeg" - AC_DEFINE_UNQUOTED(HAVE_GD_JPEG,1,[Define if the GD library has the GD_JPEG feature]) - AC_DEFINE_UNQUOTED(HAVE_LIBJPEG,1,[Define if you have the JPEG library])], - use_jpeg="No (missing library)" - AC_MSG_WARN(Optional jpeg library not available)), - use_jpeg="No (missing header)" - AC_MSG_WARN(Optional jpeg library not available - no jpeglib.h)) -LDFLAGS=$save_LDFLAGS -CPPFLAGS=$save_CPPFLAGS -AC_SUBST([JPEG_INCLUDES]) -AC_SUBST([JPEG_LIBS]) - -fi -fi - # ----------------------------------- # tclInt.h if test -f "$TCL_SRC_DIR/generic/tclInt.h"; then @@ -3264,7 +3143,6 @@ AC_CONFIG_FILES(Makefile lib/graph/libgraph.pc lib/cgraph/Makefile lib/cgraph/libcgraph.pc - lib/gd/Makefile lib/rbtree/Makefile lib/pathplan/Makefile lib/pathplan/libpathplan.pc diff --git a/contrib/diffimg/Makefile.am b/contrib/diffimg/Makefile.am index 94f5764db..4db8970dd 100644 --- a/contrib/diffimg/Makefile.am +++ b/contrib/diffimg/Makefile.am @@ -16,13 +16,7 @@ endif diffimg_SOURCES = diffimg.c -if WITH_MYLIBGD -diffimg_LDADD = $(top_builddir)/lib/gd/libgvgd_C.la \ - @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @Z_LIBS@ @MATH_LIBS@ -AM_CPPFLAGS += -DNONDLL -else diffimg_LDADD = @GD_LIBS@ @MATH_LIBS@ -endif diffimg.1.pdf: $(srcdir)/diffimg.1 - $(GROFF) -Tps -man $(srcdir)/diffimg.1 | $(PS2PDF) - - >diffimg.1.pdf diff --git a/lib/Makefile.am b/lib/Makefile.am index 6a456a3a7..71d16f731 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -2,7 +2,7 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = cdt graph cgraph gd pathplan sfio vmalloc ast \ +SUBDIRS = cdt graph cgraph pathplan sfio vmalloc ast \ vpsc rbtree ortho sparse patchwork expr common \ pack xdot label gvc ingraphs topfish glcomp \ circogen dotgen dotgen2 fdpgen neatogen twopigen sfdpgen osage gvpr diff --git a/plugin/gd/Makefile.am b/plugin/gd/Makefile.am index d33b043d5..442c38a6e 100644 --- a/plugin/gd/Makefile.am +++ b/plugin/gd/Makefile.am @@ -34,21 +34,10 @@ 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_MYLIBGD -libgvplugin_gd_la_LIBADD = \ - $(top_builddir)/lib/gd/libgvgd_C.la \ - $(top_builddir)/lib/gvc/libgvc.la \ - $(top_builddir)/lib/$(GRAPH)/lib$(GRAPH).la \ - $(top_builddir)/lib/cdt/libcdt.la \ - $(top_builddir)/lib/pathplan/libpathplan.la \ - @PANGOCAIRO_LIBS@ @ICONV_LIBS@ @EXPAT_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @Z_LIBS@ @MATH_LIBS@ -AM_CPPFLAGS += -DNONDLL -else libgvplugin_gd_la_LIBADD = \ $(top_builddir)/lib/gvc/libgvc.la \ $(top_builddir)/lib/$(GRAPH)/lib$(GRAPH).la \ $(top_builddir)/lib/cdt/libcdt.la @PANGOCAIRO_LIBS@ @GD_LIBS@ @MATH_LIBS@ -endif libgvplugin_gd_la_DEPENDENCIES = $(top_builddir)/lib/gvc/libgvc.la if WITH_WIN32 diff --git a/tclpkg/gdtclft/Makefile.am b/tclpkg/gdtclft/Makefile.am index 5eeb538bd..eb733c70e 100644 --- a/tclpkg/gdtclft/Makefile.am +++ b/tclpkg/gdtclft/Makefile.am @@ -31,18 +31,10 @@ libgdtclft_la_SOURCES = gdtclft.c libgdtclft_la_LDFLAGS = -no-undefined if WITH_LIBGD -if WITH_MYLIBGD libgdtclft_la_LIBADD = \ $(top_builddir)/tclpkg/tclhandle/libtclhandle_C.la \ $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la \ - $(top_builddir)/lib/gd/libgvgd_C.la \ - @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @Z_LIBS@ @MATH_LIBS@ -else -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@ -endif + $(GD_LIBS) $(ICONV_LIBS) $(FONTCONFIG_LIBS) $(FREETYPE2_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(Z_LIBS) $(MATH_LIBS) if WITH_TCL all-local: pkgIndex.tcl diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am index 02b7c239d..ef78177e6 100644 --- a/tclpkg/tcldot/Makefile.am +++ b/tclpkg/tcldot/Makefile.am @@ -58,12 +58,7 @@ libtcldot_la_DEPENDENCIES = $(top_builddir)/lib/gvc/libgvc.la # GDTCLFT requires gd libs to be builtin if WITH_LIBGD -if WITH_MYLIBGD -libtcldot_la_LIBADD += $(top_builddir)/lib/gd/libgvgd_C.la -else -libtcldot_la_LIBADD += $(GD_LIBS) -endif -libtcldot_la_LIBADD += $(FONTCONFIG_LIBS) $(FREETYPE2_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(Z_LIBS) +libtcldot_la_LIBADD += $(GD_LIBS) $(FONTCONFIG_LIBS) $(FREETYPE2_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(Z_LIBS) endif libtcldot_la_LIBADD += $(LIBGEN_LIBS) $(ICONV_LIBS) $(MATH_LIBS) @@ -89,12 +84,7 @@ endif if WITH_LIBGD libtcldot_builtin_la_LIBADD += $(top_builddir)/plugin/gd/libgvplugin_gd_C.la -if WITH_MYLIBGD -libtcldot_builtin_la_LIBADD += $(top_builddir)/lib/gd/libgvgd_C.la -else -libtcldot_builtin_la_LIBADD += $(GD_LIBS) -endif -libtcldot_builtin_la_LIBADD += $(FONTCONFIG_LIBS) $(FREETYPE2_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(Z_LIBS) +libtcldot_builtin_la_LIBADD += $(GD_LIBS) $(FONTCONFIG_LIBS) $(FREETYPE2_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(Z_LIBS) endif libtcldot_builtin_la_LIBADD += $(ICONV_LIBS) $(EXPAT_LIBS) $(LIBGEN_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)