configure.in (multiosdir): Set to nothing if compiler is not GCC or if...

* configure.in (multiosdir): Set to nothing if compiler is not GCC
or if it doesn't support -print-multi-os-directory.
* configure: Rebuilt.

From-SVN: r63152

diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj
index 3186c869e3cb1f0d41ed81d6a28570356995f4c9..78e62e701b9020e4290644c79516bb4ce6e32c38 100644 (file)
--- a/zlib/ChangeLog.gcj
+++ b/zlib/ChangeLog.gcj
@@ -1,3 +1,9 @@
+2003-02-19  Alexandre Oliva  <aoliva@redhat.com>
+
+       * configure.in (multiosdir): Set to nothing if compiler is not GCC
+       or if it doesn't support -print-multi-os-directory.
+       * configure: Rebuilt.
+
 2003-01-27  Alexandre Oliva  <aoliva@redhat.com>
 
        * configure.in (toolexecdir, toolexeclibdir): Set and AC_SUBST.

diff --git a/zlib/configure b/zlib/configure
index 840a9f226d671265ed7cbb81f5bfda2ce4bc1390..ef9554772b57360c0f9680ff3101d9719deea016 100755 (executable)
--- a/zlib/configure
+++ b/zlib/configure
@@ -2669,7 +2669,12 @@ else
   toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
   toolexeclibdir='$(libdir)'
 fi
-toolexeclibdir=$toolexeclibdir/`$CC -print-multi-os-directory 2>/dev/null || echo .`
+if test "$GCC" = yes && $CC -print-multi-os-directory > /dev/null 2>&1; then
+  multiosdir=/`$CC -print-multi-os-directory`
+else
+  multiosdir=
+fi
+toolexeclibdir=${toolexeclibdir}${multiosdir}
 
 
 

diff --git a/zlib/configure.in b/zlib/configure.in
index 0b8be31513423a911ff9bfe791b046188f2d1cbb..ea6524e02909ad968ed8693e5caa26836c23c62f 100644 (file)
--- a/zlib/configure.in
+++ b/zlib/configure.in
@@ -121,7 +121,12 @@ else
   toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
   toolexeclibdir='$(libdir)'
 fi
-toolexeclibdir=$toolexeclibdir/`$CC -print-multi-os-directory 2>/dev/null || echo .`
+if test "$GCC" = yes && $CC -print-multi-os-directory > /dev/null 2>&1; then
+  multiosdir=/`$CC -print-multi-os-directory`
+else
+  multiosdir=
+fi
+toolexeclibdir=${toolexeclibdir}${multiosdir}
 AC_SUBST(toolexecdir)
 AC_SUBST(toolexeclibdir)