]> granicus.if.org Git - graphviz/commitdiff
Remove checks for 'libgen', library not used
authorErwin Janssen <erwinjanssen@outlook.com>
Wed, 28 Dec 2016 20:22:27 +0000 (21:22 +0100)
committerErwin Janssen <erwinjanssen@outlook.com>
Wed, 4 Jan 2017 23:30:14 +0000 (00:30 +0100)
configure.ac contains checks for the `libgen` library and header, but the
header is never included, which means the library is never used. Checking
and linking is therefore not needed.

cmd/dot/Makefile.am
cmd/tools/Makefile.am
configure.ac
tclpkg/tcldot/Makefile.am
windows/include/config.h

index 3a5d43ffbd4b7ad2a610e48934420e101375d4d9..d708fc67e6740ae37097d3159d8943dd53fb9b54 100644 (file)
@@ -86,7 +86,7 @@ dot_static_LDADD = \
        $(top_builddir)/lib/cgraph/libcgraph_C.la \
        $(top_builddir)/lib/xdot/libxdot_C.la \
        $(top_builddir)/lib/cdt/libcdt_C.la \
-               $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS) $(GTS_LIBS) $(EXPAT_LIBS) $(Z_LIBS) $(LIBGEN_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
+               $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS) $(GTS_LIBS) $(EXPAT_LIBS) $(Z_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
 
 dot_builtins_SOURCES = dot.c dot_builtins.c
 dot_builtins_CPPFLAGS = $(AM_CPPFLAGS) -DDEMAND_LOADING=1
@@ -99,7 +99,7 @@ dot_builtins_LDADD = \
        $(top_builddir)/lib/cgraph/libcgraph.la \
        $(top_builddir)/lib/xdot/libxdot.la \
        $(top_builddir)/lib/cdt/libcdt.la \
-               $(GTS_LIBS) $(EXPAT_LIBS) $(Z_LIBS) $(LIBGEN_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
+               $(GTS_LIBS) $(EXPAT_LIBS) $(Z_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
 
 if WITH_LIBGD
 dot_static_LDADD += $(top_builddir)/plugin/gd/.libs/libgvplugin_gd_C.a $(GDLIB_LIBS)
index 3f81e735bd70cbf139257e79f3e891ff7d5c79df..a53005f6d1ff1f1bd40f163b3c1d4e903debaf83 100644 (file)
@@ -169,10 +169,10 @@ gvpack_static_LDADD = \
        $(top_builddir)/lib/pathplan/libpathplan_C.la \
        $(top_builddir)/lib/cgraph/libcgraph_C.la \
        $(top_builddir)/lib/cdt/libcdt_C.la \
-               $(EXPAT_LIBS) $(Z_LIBS) $(GTS_LIBS) $(LIBGEN_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS) 
+               $(EXPAT_LIBS) $(Z_LIBS) $(GTS_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
 endif
 
-#$(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS) $(GTS_LIBS) $(EXPAT_LIBS) $(Z_LIBS) $(LIBGEN_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
+#$(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS) $(GTS_LIBS) $(EXPAT_LIBS) $(Z_LIBS) $(_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
 
 gvpack.1.pdf: $(srcdir)/gvpack.1
        - @GROFF@ -Tps -man $(srcdir)/gvpack.1 | @PS2PDF@ - - >gvpack.1.pdf
index 5af4945c5397aff025714aac917906f732c96711..361fe078b90215f2a2164e48a2b712b001304284 100644 (file)
@@ -443,20 +443,6 @@ AC_CHECK_FUNCS([log2 sincos])
 
 LIBS=$save_LIBS
 
-dnl -----------------------------------
-dnl INCLUDES and LIBS for libgen (provides basename function)
-
-save_CPPFLAGS=$CPPFLAGS
-save_LDFLAGS=$LDFLAGS
-AC_CHECK_HEADER(libgen.h,
-        AC_CHECK_LIB(gen,basename,
-                [LIBGEN_LIBS="-lgen"
-                AC_DEFINE_UNQUOTED(HAVE_LIBGEN,1,[Define if the LIBGEN library has the basename feature])]),
-        AC_MSG_WARN(libgen.h header not available))
-LDFLAGS=$save_LDFLAGS
-CPPFLAGS=$save_CPPFLAGS
-AC_SUBST([LIBGEN_LIBS])
-
 # -----------------------------------
 
 # Checks for library functions
index c61536142e1e40cdc7efcaa8fe03b5cba72aa6e6..df2b1cefef0ab344be82deef2acdb7d922c85b1b 100644 (file)
@@ -67,7 +67,7 @@ if WITH_LIBGD
 libtcldot_la_LIBADD += $(GDLIB_LIBS)
 endif
 
-libtcldot_la_LIBADD += $(LIBGEN_LIBS) $(MATH_LIBS)
+libtcldot_la_LIBADD += $(MATH_LIBS)
 
 libtcldot_builtin_la_SOURCES = \
        tcldot.c \
@@ -100,7 +100,7 @@ libtcldot_builtin_la_LIBADD += $(top_builddir)/plugin/gd/libgvplugin_gd_C.la
 libtcldot_builtin_la_LIBADD += $(GD_LIBS)
 endif
 
-libtcldot_builtin_la_LIBADD += $(EXPAT_LIBS) $(LIBGEN_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
+libtcldot_builtin_la_LIBADD += $(EXPAT_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
 
 if WITH_TCL
 all-local: pkgIndex.tcl
index b6fda29654030546fa043bc4dd208eea85e26417..8b4a5c0f5f4a1917693171a3717f28e239829fa3 100644 (file)
 /* Define if either internal or external GD library is availabel */
 #define HAVE_LIBGD 1
 
-/* Define if the LIBGEN library has the basename feature */
-/* #undef HAVE_LIBGEN */
-
 /* Define if you have the JPEG library */
 #define HAVE_LIBJPEG 1