From: Alexandre Oliva <oliva@dcc.unicamp.br>
Date: Thu, 4 Feb 1999 15:09:14 +0000 (+0000)
Subject: * libtool.m4 (ac_cv_sys_global_symbol_pipe): accept TAB in
X-Git-Tag: release-1-2f~144
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54ee3fb2b1240afa0a7f6e8074ee0e2483d6ea63;p=thirdparty%2Flibtool.git

* libtool.m4 (ac_cv_sys_global_symbol_pipe): accept TAB in
addition to space as separator, and allow more than one space
between the symbol code and the symbol name; HP/UX's nm, for
example, uses two spaces
* ltconfig.in (global_symbol_pipe): ditto
(bsdi4, deplibs_check_method): variable name was misspelled
* libltdl/configure.in (libltdl_cv_preloaded_symbols): rewrite
test, so as not to depend on the way global_symbol_pipe is
initialized; the current test would get false positives, as
global_symbol_pipe was initialized `x=""', not `x='
---

diff --git a/ChangeLog b/ChangeLog
index 743778627..172e1278a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 1999-02-04  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+	* libtool.m4 (ac_cv_sys_global_symbol_pipe): accept TAB in
+	addition to space as separator, and allow more than one space
+	between the symbol code and the symbol name; HP/UX's nm, for
+	example, uses two spaces
+	* ltconfig.in (global_symbol_pipe): ditto
+	(bsdi4, deplibs_check_method): variable name was misspelled
+	* libltdl/configure.in (libltdl_cv_preloaded_symbols): rewrite
+	test, so as not to depend on the way global_symbol_pipe is
+	initialized; the current test would get false positives, as
+	global_symbol_pipe was initialized `x=""', not `x='
+
 	* libltdl/ltdl.c (find_module): initialize filename if dir is NULL 
 	Reported by Godmar Back <gback@cs.utah.edu>
 
diff --git a/libltdl/configure.in b/libltdl/configure.in
index 7cd1f7808..7b8fe65d4 100644
--- a/libltdl/configure.in
+++ b/libltdl/configure.in
@@ -84,11 +84,19 @@ AC_CHECK_FUNCS(strdup strchr strrchr index rindex)
 
 AC_CACHE_CHECK([whether libtool supports -dlopen/-dlpreopen],
        libltdl_cv_preloaded_symbols, [dnl
-  if grep '^global_symbol_pipe=..*$' ./libtool >/dev/null; then
-    libltdl_cv_preloaded_symbols=yes
-  else
-    libltdl_cv_preloaded_symbols=no
-  fi
+  (
+    rm -f conftest
+    ./libtool --config > conftest
+    . ./conftest
+    rm -f conftest
+    if test -n "$global_symbol_pipe"; then
+      echo yes > conftest
+    else
+      echo no > conftest
+    fi
+  )
+  libltdl_cv_preloaded_symbols=`cat conftest`
+  rm -f conftest
 ])
 if test x"$libltdl_cv_preloaded_symbols" = x"yes"; then
   AC_DEFINE(HAVE_PRELOADED_SYMBOLS)
diff --git a/libtool.m4 b/libtool.m4
index b27034237..dccffd2d2 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -21,7 +21,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 30 AC_PROG_LIBTOOL
+# serial 31 AC_PROG_LIBTOOL
 AC_DEFUN(AC_PROG_LIBTOOL,
 [AC_PREREQ(2.12.2)dnl
 AC_REQUIRE([AC_ENABLE_SHARED])dnl
@@ -381,7 +381,7 @@ for ac_symprfx in "" "_"; do
   # Write the raw and C identifiers.
   # Unlike in ltconfig.in, we need $ac_symprfx before $ac_symxfrm here,
   # otherwise AC_SYS_SYMBOL_UNDERSCORE will always be false
-  ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.* $ac_symcode $ac_symprfx$ac_sympat$/$ac_symprfx$ac_symxfrm/p'"
+  ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]$ac_symcode[ 	][ 	]*$ac_symprfx$ac_sympat$/$ac_symprfx$ac_symxfrm/p'"
 
   # Check to see that the pipe works correctly.
   ac_pipe_works=no
diff --git a/ltconfig.in b/ltconfig.in
index 5f2fa8739..d5e2d066a 100755
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -1403,7 +1403,7 @@ fi
 for ac_symprfx in "" "_"; do
 
   # Write the raw and C identifiers.
-  global_symbol_pipe="sed -n -e 's/^.* $symcode $ac_symprfx$sympat$/$symxfrm/p'"
+  global_symbol_pipe="sed -n -e 's/^.*[ 	]$symcode[ 	][ 	]*$ac_symprfx$sympat$/$symxfrm/p'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -1605,7 +1605,7 @@ bsdi4*)
   soname_spec='${libname}.so'
   finish_cmds='PATH="$PATH:/sbin" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
-  check_shared_deplibs_method='file_magic ELF 32-bit LSB shared object'
+  deplibs_check_method='file_magic ELF 32-bit LSB shared object'
   sys_lib_search_path="/shlib /usr/lib /usr/local/lib"
   ;;