* m4/libtool.m4 (_LT_CMD_GLOBAL_SYMBOLS): Unicos 9 sed rejects

empty parentheses as in 's/x()/1/'.
(_LT_COMPILER_PIC) [unicos*]: wl=-Wl,.
* tests/sh.test: Not all sed's like '/.*n.*/' (Unicos 9 sed
loops endlessly).

diff --git a/ChangeLog b/ChangeLog
index 332df9f2495d95ff96d05f61d3877c904a19f5c6..2146b1085d3785b8a5a3a775e77085a2aee24d77 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-01-31  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * m4/libtool.m4 (_LT_CMD_GLOBAL_SYMBOLS): Unicos 9 sed rejects
+       empty parentheses as in 's/x\(\)/\1/'.
+       (_LT_COMPILER_PIC) [unicos*]: wl=-Wl,.
+       * tests/sh.test: Not all sed's like '/.*\n.*/' (Unicos 9 sed
+       loops endlessly).
+
        * tests/quote.test: Match link quoting against `"$wl"', not `-Wl,'.
 
        * tests/quote.test: Check for `--no-reexec' in $1 to avoid one reexec.

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index b1b3270eb7123bb08f75303ed00d23c35d60602c..8b823876daaba04237706abd751acdb5c79b142b 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -2769,9 +2769,6 @@ symcode='[[BCDEGRST]]'
 # Regexp to match symbols that can be accessed directly from C.
 sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
 
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \2\3 \3'
-
 # Define system-specific variables.
 case $host_os in
 aix*)
@@ -2824,8 +2821,11 @@ esac
 # Try without a prefix underscore, then with it.
 for ac_symprfx in "" "_"; do
 
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
   # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[     ]]\($symcode$symcode*\)[[       ]][[    ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
+  lt_cv_sys_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
@@ -3427,6 +3427,11 @@ m4_if([$1], [CXX], [
       fi
       ;;
 
+    unicos*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
     uts4*)
       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'

diff --git a/tests/sh.test b/tests/sh.test
index 5b6ebd66155a4fac2b3015f626da9ae04fcd6804..a296c659f6151d9cb7522bfaaea1de11cb936334 100755 (executable)
--- a/tests/sh.test
+++ b/tests/sh.test
@@ -84,7 +84,7 @@ fi
 # Check for using shift after set dummy (same or following line).
 for s in $scripts
 do
-  if $SED -n '/set[    ][      ]*dummy/{/set.*dummy.*;.*shift/d;N;/set.*dummy.*\n.*shift/D;p;}' "$s" |
+  if $SED -n '/set[    ][      ]*dummy/{/set.*dummy.*;.*shift/d;N;/\n.*shift/D;p;}' "$s" |
      $EGREP .; then
     echo "use \`shift' after \`set dummy' in $s"
     status=$EXIT_FAILURE