From: Albert Chin-A-Young <china@thewrittenword.com>
Date: Wed, 17 May 2006 17:07:16 +0000 (+0000)
Subject: * tests/link-order.test: Take hardcode_direct into consideration
X-Git-Tag: release-1-5-23b~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b6634c9f0bed34218ca7b6746bf6828462f4922;p=thirdparty%2Flibtool.git

* tests/link-order.test: Take hardcode_direct into consideration
when testing link order.
---

diff --git a/ChangeLog b/ChangeLog
index cafbca11b..f851d923a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-17  Albert Chin-A-Young  <china@thewrittenword.com>
+
+	* tests/link-order.test: Take hardcode_direct into consideration
+	when testing link order.
+
 2006-05-15  Bruno Haible  <bruno@clisp.org>,
 	    Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
diff --git a/tests/link-order.test b/tests/link-order.test
index 9d9d8e99e..3250d9777 100755
--- a/tests/link-order.test
+++ b/tests/link-order.test
@@ -12,6 +12,10 @@ fi
 
 retcode=0
 
+eval `$libtool --config | $EGREP '^(hardcode_direct|shrext_cmds)='`
+module=no
+eval shared_ext=\"$shrext_cmds\"
+
 rm -rf linkorder.dir
 mkdir linkorder.dir
 top_dir=`pwd`/linkorder.dir
@@ -62,12 +66,24 @@ case $host in
 *-*-aix* | *-*-interix*) ;; # These systems have different path syntax
 *)
   # Do not error if we do not relink (e.g. static-only systems)
-  if $EGREP relinking $srcdir/stderr; then
-    if $EGREP ' -L.*\/new\/lib -lb -L.*\/old\/lib -lcee' $srcdir/stdout; then :; else
-      echo "$0: wrong link order" 1>&2
-      retcode=1
+  case $hardcode_direct in
+  yes)
+    if $EGREP relinking $srcdir/stderr; then
+      if $EGREP " .*\/new\/lib/libb$shared_ext .*\/old\/lib/libcee$shared_ext" $srcdir/stdout; then :; else
+        echo "$0: wrong link order" 1>&2
+        retcode=1
+      fi
     fi
-  fi
+    ;;
+  *)
+    if $EGREP relinking $srcdir/stderr; then
+      if $EGREP ' -L.*\/new\/lib -lb -L.*\/old\/lib -lcee' $srcdir/stdout; then :; else
+        echo "$0: wrong link order" 1>&2
+        retcode=1
+      fi
+    fi
+    ;;
+  esac
   ;;
 esac