From: Eric Blake <ebb9@byu.net>
Date: Tue, 22 Aug 2006 17:51:03 +0000 (+0000)
Subject: * libltdl/m4/ltdl.m4 (LTDL_INIT): Avoid macros marked obsolete in
X-Git-Tag: release-2-1b~266
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8495dfccc0fbdb23e991655e15d97055dae2632;p=thirdparty%2Flibtool.git

* libltdl/m4/ltdl.m4 (LTDL_INIT): Avoid macros marked obsolete in
latest autoconf.
* libltdl/m4/libtool.m4 (_lt_cv_sys_global_symbol_pipe): Work in
spite of -Wmissing-prototypes.
* libltdl/libltdl/lt__dirent.h: Rewrite to accomodate loss of
AC_HEADER_DIRENT.
---

diff --git a/ChangeLog b/ChangeLog
index c78c0bdce..718bfc594 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2006-08-22  Eric Blake  <ebb9@byu.net>
 
+	* libltdl/m4/ltdl.m4 (LTDL_INIT): Avoid macros marked obsolete in
+	latest autoconf.
+	* libltdl/m4/libtool.m4 (_lt_cv_sys_global_symbol_pipe): Work in
+	spite of -Wmissing-prototypes.
+	* libltdl/libltdl/lt__dirent.h: Rewrite to accomodate loss of
+	AC_HEADER_DIRENT.
+
 	* libltdl/m4/libtool.m4: Avoid space-tab.
 
 2006-08-07  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
diff --git a/libltdl/libltdl/lt__dirent.h b/libltdl/libltdl/lt__dirent.h
index fd1d0ff50..045bf235c 100644
--- a/libltdl/libltdl/lt__dirent.h
+++ b/libltdl/libltdl/lt__dirent.h
@@ -1,5 +1,5 @@
 /* lt__dirent.h -- internal directory entry scanning interface
-   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004, 2006 Free Software Foundation, Inc.
    Originally by Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
 
    NOTE: The canonical source of this file is maintained with the
@@ -40,27 +40,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 
 #include "lt_system.h"
 
-#if defined(HAVE_CLOSEDIR) && defined(HAVE_OPENDIR) && defined(HAVE_READDIR) && defined(HAVE_DIRENT_H)
+#ifdef HAVE_DIRENT_H
 /* We have a fully operational dirent subsystem.  */
 #  include <dirent.h>
 #  define D_NAMLEN(dirent) (strlen((dirent)->d_name))
 
-#elif !defined(__WINDOWS__)
-/* We are not on windows, so we can get the same functionality from the
-   `direct' API.  */
-#  define dirent direct
-#  define D_NAMLEN(dirent) ((dirent)->d_namlen)
-#  if defined(HAVE_SYS_NDIR_H)
-#    include <sys/ndir.h>
-#  endif
-#  if defined(HAVE_SYS_DIR_H)
-#    include <sys/dir.h>
-#  endif
-#  if defined(HAVE_NDIR_H)
-#    include <ndir.h>
-#  endif
-
-#else  /* __WINDOWS__ */
+#elif defined __WINDOWS__
 /* Use some wrapper code to emulate dirent on windows..  */
 #  define WINDOWS_DIRENT_EMULATION 1
 
@@ -96,6 +81,8 @@ LT_SCOPE void		closedir	(DIR *entry);
 
 LT_END_C_DECLS
 
+#else /* !defined(__WINDOWS__)*/
+ERROR - cannot find dirent
 #endif /*!defined(__WINDOWS__)*/
 
 #endif /*!defined(LT__DIRENT_H)*/
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 107e3440a..5842f5121 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -3223,7 +3223,8 @@ for ac_symprfx in "" "_"; do
 extern "C" {
 #endif
 char nm_test_var;
-void nm_test_func(){}
+void nm_test_func(void);
+void nm_test_func(void){}
 #ifdef __cplusplus
 }
 #endif
diff --git a/libltdl/m4/ltdl.m4 b/libltdl/m4/ltdl.m4
index 841635790..c53bb1d0a 100644
--- a/libltdl/m4/ltdl.m4
+++ b/libltdl/m4/ltdl.m4
@@ -240,9 +240,6 @@ dnl AC_DEFUN([AC_WITH_LTDL], [])
 # other users should call LT_WITH_LTDL instead.
 AC_DEFUN([LTDL_INIT],
 [AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_C_CONST])dnl
-AC_REQUIRE([AC_HEADER_STDC])dnl
-AC_REQUIRE([AC_HEADER_DIRENT])dnl
 AC_REQUIRE([LT_SYS_MODULE_EXT])dnl
 AC_REQUIRE([LT_SYS_MODULE_PATH])dnl
 AC_REQUIRE([LT_SYS_DLSEARCH_PATH])dnl
@@ -288,7 +285,7 @@ m4_ifset([AH_HEADER],
 	[])])])
 AC_SUBST([LT_CONFIG_H])
 
-AC_CHECK_HEADERS([memory.h unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h],
+AC_CHECK_HEADERS([memory.h unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h dirent.h],
 	[], [], [AC_INCLUDES_DEFAULT])
 AC_CHECK_HEADERS([string.h strings.h], [break], [], [AC_INCLUDES_DEFAULT])