* 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 c78c0bdce0b2c13d07e42dc9a131faf859f8a44e..718bfc594ef10e8a63f01f92fa40eacbdad7994c 100644 (file)
--- 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 fd1d0ff50bce4fd7fbdbca8a6cde77b1f2e15063..045bf235c88679529643fd2c96e217af0b6d0888 100644 (file)
--- 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 107e3440af7ca149167c2ffc7fc5dbcfe4092c0a..5842f512105e72960ff3c0aa0a78678ba10dcfd1 100644 (file)
--- 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 8416357905d4ebfbb07873e46e8d26e878d6ac7f..c53bb1d0aa2d741c8d644fc6f66d915186e99c40 100644 (file)
--- 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])