From 26f170840ff27c6ca227532f35d456933e6fb16c Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Thu, 20 Feb 2003 02:32:58 +0000 Subject: [PATCH] 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 --- zlib/ChangeLog.gcj | 6 ++++++ zlib/configure | 7 ++++++- zlib/configure.in | 7 ++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj index 3186c869e3cb..78e62e701b90 100644 --- a/zlib/ChangeLog.gcj +++ b/zlib/ChangeLog.gcj @@ -1,3 +1,9 @@ +2003-02-19 Alexandre Oliva + + * 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 * configure.in (toolexecdir, toolexeclibdir): Set and AC_SUBST. diff --git a/zlib/configure b/zlib/configure index 840a9f226d67..ef9554772b57 100755 --- 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 0b8be3151342..ea6524e02909 100644 --- 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) -- 2.47.2