From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 2 Aug 2010 20:21:05 +0000 (+0200)
Subject: Fix pic_flag test unportabilities.
X-Git-Tag: v2.4~103
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5892f61de832b6ab679ac3bf5a51cc680884c739;p=thirdparty%2Flibtool.git

Fix pic_flag test unportabilities.

* tests/pic_flag.at (override pic_flag at configure time): Skip
test if the compiler produces a warning containing `fpic'.
Do not use nonportable `grep -e', for Solaris.
Report by Charles Wilson.

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

diff --git a/ChangeLog b/ChangeLog
index a0e046915..3655c07dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Fix pic_flag test unportabilities.
+	* tests/pic_flag.at (override pic_flag at configure time): Skip
+	test if the compiler produces a warning containing `fpic'.
+	Do not use nonportable `grep -e', for Solaris.
+	Report by Charles Wilson.
+
 2010-08-01  Paolo Bonzini  <bonzini@gnu.org>
 
 	Fix bug in postdeps computation
diff --git a/tests/pic_flag.at b/tests/pic_flag.at
index a729d16e2..e62e1b7a5 100644
--- a/tests/pic_flag.at
+++ b/tests/pic_flag.at
@@ -34,7 +34,9 @@ int func(void) { return data; }
 cp foo.c foo.cpp
 C_pic_flag='-fpic -DPIC'
 AT_CHECK([$CC $CPPFLAGS $CFLAGS $C_pic_flag -c foo.c || exit 77],
-	 [], [ignore], [ignore])
+	 [], [stdout], [stderr])
+# The configure test for the PIC flag also checks for warnings.
+AT_CHECK([grep fpic stdout stderr && exit 77], [1])
 
 CXX_pic_flag='-fpic -DPIC'
 if $CXX $CPPFLAGS $CXXFLAGS $CXX_pic_flag -c foo.cpp; then :; else
@@ -46,6 +48,6 @@ AT_CHECK(["$abs_top_srcdir"/configure lt_cv_prog_compiler_pic="$C_pic_flag" ]dnl
 : ${MAKE=make}
 AT_CHECK([$MAKE], [], [stdout], [ignore])
 AT_CHECK([if ./libtool --features | grep 'enable shared libraries'; then ]dnl
-	 [  grep -e -fpic stdout; else exit 77; fi], [], [ignore], [ignore])
+	 [  grep ' -fpic' stdout; else exit 77; fi], [], [ignore], [ignore])
 
 AT_CLEANUP