From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 19 Jan 2009 20:54:52 +0000 (+0100)
Subject: Another LT_AT_EXEC_CHECK fixup.
X-Git-Tag: v2.2.7b~140
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5e4f908446e68ea79acc84273d50bad6a6d92a32;p=thirdparty%2Flibtool.git

Another LT_AT_EXEC_CHECK fixup.

* tests/shlibpath.at (shlibpath_overrides_runpath): Use
LT_AT_EXEC_CHECK instead of AT_CHECK.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index d9a0b3765..b63ca023c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Another LT_AT_EXEC_CHECK fixup.
+	* tests/shlibpath.at (shlibpath_overrides_runpath): Use
+	LT_AT_EXEC_CHECK instead of AT_CHECK.
+
 2009-01-19  Roumen Petrov  <bugtrack@roumenpetrov.info>  (tiny change)
 
 	Add missing $EXEEXT to java test.
diff --git a/tests/shlibpath.at b/tests/shlibpath.at
index 658bfd8fe..eea059b9b 100644
--- a/tests/shlibpath.at
+++ b/tests/shlibpath.at
@@ -51,7 +51,7 @@ $LIBTOOL --mode=clean rm -f liba.la
 eval `$LIBTOOL --config | $EGREP '^(shlibpath_var|shlibpath_overrides_runpath)='`
 
 # No point checking a system with static libraries:
-AT_CHECK([{ ./m || exit 1; } && exit 77], [1], [ignore], [ignore])
+LT_AT_EXEC_CHECK([./m], [1], [ignore], [ignore], [|| exit 1 && exit 77])
 
 if test "$shlibpath_var" = PATH; then
   addpath=`pwd`/moved/bin
@@ -65,7 +65,7 @@ export $shlibpath_var
 if test "$shlibpath_overrides_runpath" != no; then
   LT_AT_EXEC_CHECK([./m], [0], [ignore], [ignore])
 else
-  AT_CHECK([./m || exit 1], [1], [ignore], [ignore])
+  LT_AT_EXEC_CHECK([./m], [1], [ignore], [ignore], [|| exit 1])
 fi
 # Test that shlibpath_var is effective in adding paths at all:
 LT_AT_EXEC_CHECK([./m2], [0], [ignore], [ignore])