From: Erwin Janssen <erwinjanssen@outlook.com>
Date: Wed, 28 Dec 2016 20:22:27 +0000 (+0100)
Subject: Remove checks for 'libgen', library not used
X-Git-Tag: 2.42.0~213^2~4^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf92e8c0823bd004914bc453cd3deca0635806fd;p=graphviz

Remove checks for 'libgen', library not used

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.
---

diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index 3a5d43ffb..d708fc67e 100644
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -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)
diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am
index 3f81e735b..a53005f6d 100644
--- a/cmd/tools/Makefile.am
+++ b/cmd/tools/Makefile.am
@@ -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
diff --git a/configure.ac b/configure.ac
index 5af4945c5..361fe078b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am
index c61536142..df2b1cefe 100644
--- a/tclpkg/tcldot/Makefile.am
+++ b/tclpkg/tcldot/Makefile.am
@@ -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
diff --git a/windows/include/config.h b/windows/include/config.h
index b6fda2965..8b4a5c0f5 100644
--- a/windows/include/config.h
+++ b/windows/include/config.h
@@ -156,9 +156,6 @@
 /* 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