* ltconfig.in: Handle case where /bin/nm -p outputs multiple

symbol types (like under HP-UX 11.00).

diff --git a/ChangeLog b/ChangeLog
index 8b38799574406fbe0e935994c8cb14d816d4b725..54b061a37c503b0baa231994302a8a765db5e201 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-24 Albert Chin-A-Young <china@thewrittenword.com>
+
+       * ltconfig.in: Handle case where /bin/nm -p outputs multiple
+       symbol types (like under HP-UX 11.00).
+
 2001-04-24  Ossama Othman  <ossama@debian.org>
 
        * ltcf-cxx.sh (output_verbose_link_cmds): Renamed this variable to

diff --git a/ltconfig.in b/ltconfig.in
index 33d3e85c0c138770df5a34c5b38c297c3c169cef..d97e90655b779534fec7e1d22ee5ff27b143e888 100755 (executable)
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -1376,7 +1376,7 @@ cygwin* | mingw* | pw32*)
   symcode='[ABCDGISTW]'
   ;;
 hpux*) # Its linker distinguishes data from code symbols
-  global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^. .* \(.*\)$/extern char \1;/p'"
+  global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
   ;;
 irix*)
   symcode='[BCDEGRST]'
@@ -1406,7 +1406,7 @@ fi
 for ac_symprfx in "" "_"; do
 
   # Write the raw and C identifiers.
-global_symbol_pipe="sed -n -e 's/^.*[  ]\($symcode\)[  ][      ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
+  global_symbol_pipe="sed -n -e 's/^.*[        ]\($symcode$symcode*\)[         ][      ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -1464,7 +1464,7 @@ const struct {
 lt_preloaded_symbols[] =
 {
 EOF
-         sed 's/^. \(.*\) \(.*\)$/  {"\2", (lt_ptr_t) \&\2},/' < "$nlist" >> conftest.$ac_ext
+         sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" >> conftest.$ac_ext
          cat <<\EOF >> conftest.$ac_ext
   {0, (lt_ptr_t) 0}
 };