From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 19 Feb 2007 09:10:32 +0000 (+0000)
Subject: * libltdl/m4/ltdl.m4 (LT_WITH_LTDL): Fix detection of new enough
X-Git-Tag: release-2-1b~185
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82b619a320faa7b5405854dc28a462cadc31f7be;p=thirdparty%2Flibtool.git

* libltdl/m4/ltdl.m4 (LT_WITH_LTDL): Fix detection of new enough
libltdl by actually checking for the declaration of
lt_dlinterface_register in ltdl.h with AC_CHECK_DECL.
Remove redundant configure output line.
---

diff --git a/ChangeLog b/ChangeLog
index 890acada7..c0ac15f50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-02-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	* libltdl/m4/ltdl.m4 (LT_WITH_LTDL): Fix detection of new enough
+	libltdl by actually checking for the declaration of
+	lt_dlinterface_register in ltdl.h with AC_CHECK_DECL.
+	Remove redundant configure output line.
+
 	* tests/template.at: Reformat, add M4 quoting.  Use $LDFLAGS
 	consistently for link mode.
 
diff --git a/libltdl/m4/ltdl.m4 b/libltdl/m4/ltdl.m4
index 82f8b01aa..0185b84ef 100644
--- a/libltdl/m4/ltdl.m4
+++ b/libltdl/m4/ltdl.m4
@@ -5,7 +5,7 @@
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 11 LTDL_INIT
+# serial 12 LTDL_INIT
 
 # LT_CONFIG_LTDL_DIR(DIRECTORY, [LTDL-MODE])
 # ------------------------------------------
@@ -182,18 +182,17 @@ AC_ARG_WITH([included_ltdl],
 if test "x$with_included_ltdl" != xyes; then
   # We are not being forced to use the included libltdl sources, so
   # decide whether there is a useful installed version we can use.
-  lt_dlinterface_register_found=no
   AC_CHECK_HEADER([ltdl.h],
-      [AC_CHECK_LIB([ltdl], [lt_dlinterface_register],
-          [with_included_ltdl=no],
-          [with_included_ltdl=yes])],
-
-      [],
+      [AC_CHECK_DECL([lt_dlinterface_register],
+	   [AC_CHECK_LIB([ltdl], [lt_dlinterface_register],
+	       [with_included_ltdl=no],
+	       [with_included_ltdl=yes])],
+	   [with_included_ltdl=yes],
+	   [AC_INCLUDES_DEFAULT
+	    #include <ltdl.h>])],
+      [with_included_ltdl=yes],
       [AC_INCLUDES_DEFAULT]
   )
-  AC_MSG_CHECKING([for lt_dlinterface_register in ltdl.h])
-  test "x$with_included_ltdl" = xno && lt_dlinterface_register_found=yes
-  AC_MSG_RESULT([$lt_dlinterface_register_found])
 fi
 
 if test "x$enable_ltdl_install" != xyes; then