* libtool.m4 (_LT_AC_CHECK_DLFCN): Use the interrim new

AC_CHECK_HEADER with compiler rather than preprocessor.
(AC_LIBTOOL_SETUP): ...which was introduced in autoconf-2.56, so
we AC_PREREQ that version.
* ltdl.m4 (AC_WITH_LTDL, AC_LIB_LTDL, AC_LTDL_FUNC_ARGZ): Ditto.

diff --git a/ChangeLog b/ChangeLog
index e6325219730e47eb7755804368657af1bd0557db..e29d30448429f50343490710d3c440498a6c68e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-08-27  Gary V. Vaughan  <gary@gnu.org>
+
+       * libtool.m4 (_LT_AC_CHECK_DLFCN): Use the interrim new
+       AC_CHECK_HEADER with compiler rather than preprocessor.
+       (AC_LIBTOOL_SETUP): ...which was introduced in autoconf-2.56, so
+       we AC_PREREQ that version.
+       * ltdl.m4 (AC_WITH_LTDL, AC_LIB_LTDL, AC_LTDL_FUNC_ARGZ): Ditto.
+
 2003-08-27  Gary V. Vaughan  <gary@gnu.org>
 
        Work around a bug in AU_ALIAS in CVS Autoconf that inserts a

diff --git a/libtool.m4 b/libtool.m4
index 88a2816cfee55ebc3ad60179a1d9f77169a90f49..cff37f3048de1e220453ea3bc4fc16ea1ca5a2f9 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -22,7 +22,7 @@
 ## configuration script generated by Autoconf, you may include it under
 ## the same distribution terms that you use for the rest of that program.
 
-# serial 47 AC_PROG_LIBTOOL
+# serial 48 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -93,7 +93,7 @@ define([AC_PROG_LIBTOOL], [])
 # AC_LIBTOOL_SETUP
 # ----------------
 AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.50)dnl
+[AC_PREREQ(2.56)dnl We use the new compiler based header checking in 2.56
 AC_REQUIRE([AC_ENABLE_SHARED])dnl
 AC_REQUIRE([AC_ENABLE_STATIC])dnl
 AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
@@ -708,7 +708,7 @@ fi
 # _LT_AC_CHECK_DLFCN
 # --------------------
 AC_DEFUN([_LT_AC_CHECK_DLFCN],
-[AC_CHECK_HEADERS(dlfcn.h)dnl
+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
 ])# _LT_AC_CHECK_DLFCN
 
 
@@ -839,7 +839,7 @@ else
     lt_cv_dlopen_self=yes
     ])
    ;;
-    
+
   *)
     AC_CHECK_FUNC([shl_load],
          [lt_cv_dlopen="shl_load"],
@@ -1079,7 +1079,7 @@ fi
    *)
   AC_MSG_RESULT([no])
     ;;
-  esac  
+  esac
 fi
 ])# AC_LIBTOOL_SYS_LIB_STRIP
 
@@ -2576,7 +2576,7 @@ aix4*)
             ;;
           10.*)
             _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-            ;;            
+            ;;
         esac
       fi
       ;;
@@ -2594,8 +2594,8 @@ aix4*)
     _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
   else
     _LT_AC_TAGVAR(ld_shlibs, $1)=no
-  fi  
-    ;;  
+  fi
+    ;;
 esac
 AC_MSG_RESULT([$enable_shared])
 
@@ -2913,7 +2913,7 @@ case $host_os in
             ;;
           10.*)
             _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-            ;;            
+            ;;
         esac
       fi
       ;;
@@ -3851,7 +3851,7 @@ if test -f "$ltmain"; then
   # without removal of \ escapes.
   if test -n "${ZSH_VERSION+set}" ; then
     setopt NO_GLOB_SUBST
-  fi  
+  fi
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
@@ -3905,7 +3905,7 @@ if test -f "$ltmain"; then
     _LT_AC_TAGVAR(archive_cmds, $1) | \
     _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
     _LT_AC_TAGVAR(module_cmds, $1) | \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \   
+    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
     _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
     _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
     extract_expsyms_cmds | reload_cmds | finish_cmds | \
@@ -4668,7 +4668,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
            _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
            _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
            _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-           ;; 
+           ;;
          cxx)
            # Compaq C++
            # Make sure the PIC flag is empty.  It appears that all Alpha
@@ -5028,7 +5028,7 @@ ifelse([$1],[CXX],[
   _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
   _LT_AC_TAGVAR(hardcode_automatic, $1)=no
   _LT_AC_TAGVAR(module_cmds, $1)=
-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=  
+  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
   _LT_AC_TAGVAR(always_export_symbols, $1)=no
   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   # include_expsyms should be a list of space-separated symbols to be *always*
@@ -5375,7 +5375,7 @@ EOF
             ;;
           10.*)
             _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-            ;;            
+            ;;
         esac
       fi
        ;;
@@ -5403,9 +5403,9 @@ EOF
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-    else  
+    else
       _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi  
+    fi
       ;;
 
     dgux*)
@@ -5755,7 +5755,7 @@ x|xyes)
       AC_MSG_CHECKING([whether -lc should be explicitly linked in])
       $rm conftest*
       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-  
+
       if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
         soname=conftest
         lib=conftest

diff --git a/ltdl.m4 b/ltdl.m4
index 8e40ed8d9bf294e80f7125ed4bf0a96a29faf05a..7dd3000cefcf86d2376af85925652d55802f5895 100644 (file)
--- a/ltdl.m4
+++ b/ltdl.m4
@@ -44,8 +44,11 @@ if test "x$with_included_ltdl" != xyes; then
   AC_CHECK_HEADER([ltdl.h],
       [AC_CHECK_LIB([ltdl], [lt_dlcaller_register],
           [with_included_ltdl=no],
-          [with_included_ltdl=yes])
-  ])
+          [with_included_ltdl=yes])],
+
+      [],
+      [AC_INCLUDES_DEFAULT]
+  )
 fi
 
 if test "x$enable_ltdl_install" != xyes; then
@@ -94,9 +97,9 @@ AC_REQUIRE([AC_LTDL_SYS_DLOPEN_DEPLIBS])
 AC_REQUIRE([AC_LTDL_FUNC_ARGZ])
 
 AC_CHECK_HEADERS([assert.h ctype.h errno.h malloc.h memory.h stdlib.h \
-                 stdio.h unistd.h])
-AC_CHECK_HEADERS([dl.h sys/dl.h dld.h mach-o/dyld.h])
-AC_CHECK_HEADERS([string.h strings.h], [break])
+                 stdio.h unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h],
+       [], [], [AC_INCLUDES_DEFAULT])
+AC_CHECK_HEADERS([string.h strings.h], [break], [], [AC_INCLUDES_DEFAULT])
 
 AC_CHECK_FUNCS([strchr index], [break])
 AC_CHECK_FUNCS([strrchr rindex], [break])
@@ -141,7 +144,7 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
     # Assuming the user has installed a libdl from somewhere, this is true
     # If you are looking for one http://www.opendarwin.org/projects/dlcompat
     libltdl_cv_sys_dlopen_deplibs=yes
-    ;;   
+    ;;
   kfreebsd*-gnu)
     libltdl_cv_sys_dlopen_deplibs=yes
     ;;
@@ -421,7 +424,7 @@ fi
 # AC_LTDL_FUNC_ARGZ
 # -----------------
 AC_DEFUN([AC_LTDL_FUNC_ARGZ],
-[AC_CHECK_HEADERS([argz.h])
+[AC_CHECK_HEADERS([argz.h], [], [], [AC_INCLUDES_DEFAULT])
 
 AC_CHECK_TYPES([error_t],
   [],