diff options
| author | Jack Howarth <howarth@bromo.med.uc.edu> | 2007-01-17 19:48:52 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2007-01-17 19:48:52 +0000 |
| commit | 8a489465117c57c6ce20deb182b3175a81bf958c (patch) | |
| tree | ba422ba5a50ae9a3f5256c25bd733545c65207e6 /zlib/configure | |
| parent | 0dce3ca161fa6664c8505cfe0718a9dbccb8765c (diff) | |
| download | gcc-8a489465117c57c6ce20deb182b3175a81bf958c.zip gcc-8a489465117c57c6ce20deb182b3175a81bf958c.tar.gz gcc-8a489465117c57c6ce20deb182b3175a81bf958c.tar.bz2 | |
aclocal.m4: Regenerate to use multi.m4.
2007-01-17 Jack Howarth <howarth@bromo.med.uc.edu>
boehm-gc/
* aclocal.m4: Regenerate to use multi.m4.
* configure: Regenerate.
* Makefile.in: Regenerate.
zlib/
* Makefile.am: Add ACLOCAL_AMFLAGS to use multi.m4.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* Makefile.in: Regenerate.
libffi/
* Makefile.am: Add ACLOCAL_AMFLAGS to use multi.m4.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* Makefile.in: Regenerate.
libjava/
* configure.ac: Use multi.m4 from aclocal rather than custom
code. Use multi_basedir instead libgcj_basedir. Test for
/proc/self/exe when not cross-compiling.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* Makefile.in: Regenerate.
libjava/classpath/
* configure.ac: Use multi.m4 from aclocal rather than
custom code. Use multi_basedir instead libgcj_basedir.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* Makefile.in: Regenerate.
libjava/libltdl/
* Makefile.am: Add ACLOCAL_AMFLAGS to use multi.m4.
* configure.ac: Use multi.m4 from aclocal rather than
custom code.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* Makefile.in: Regenerate.
From-SVN: r120870
Diffstat (limited to 'zlib/configure')
| -rwxr-xr-x | zlib/configure | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/zlib/configure b/zlib/configure index 20f35a8..ce419f1 100755 --- a/zlib/configure +++ b/zlib/configure @@ -1337,6 +1337,13 @@ else fi +# Even if the default multilib is not a cross compilation, +# it may be that some of the other multilibs are. +if test $cross_compiling = no && test $multilib = yes \ + && test "x${with_multisubdir}" != x ; then + cross_compiling=maybe +fi + ac_config_commands="$ac_config_commands default-1" @@ -3879,7 +3886,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 3882 "configure"' > conftest.$ac_ext + echo '#line 3889 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? |