Biarch support.

9 files changed, 37 insertions, 20 deletions

diff --git a/autoconf-lib-link/ChangeLog b/autoconf-lib-link/ChangeLog
index f3854cd..18cdf7d 100644
--- a/autoconf-lib-link/ChangeLog
+++ b/autoconf-lib-link/ChangeLog
@@ -1,3 +1,15 @@
+2006-06-23  Bruno Haible  <bruno@clisp.org>
+
+	Biarch support.
+	* configure.ac: Invoke AC_LIB_PREPARE_MULTILIB. Set LIBDIRSTEM.
+	* tests/Makefile.am (TESTS_ENVIRONMENT): Set LIBDIRSTEM.
+	* tests/rpath-1: Pass --libdir to all configure invocations.
+	* tests/rpath-2_a: Likewise.
+	* tests/rpath-2_b: Likewise.
+	* tests/rpath-3_a: Likewise.
+	* tests/rpath-3_b: Likewise.
+	* tests/rpathcfg.sh: Likewise.
+
 2006-05-15  Bruno Haible  <bruno@clisp.org>
 
 	* config.rpath: Improve support for Sun C 5.9 on Linux, based on
diff --git a/autoconf-lib-link/configure.ac b/autoconf-lib-link/configure.ac
index db8705e..d69139a 100644
--- a/autoconf-lib-link/configure.ac
+++ b/autoconf-lib-link/configure.ac
@@ -58,6 +58,10 @@ AC_SUBST(with_gnu_ld)
 aclocaldir='${datadir}/aclocal'
 AC_SUBST(aclocaldir)
 
+AC_LIB_PREPARE_MULTILIB
+LIBDIRSTEM=$acl_libdirstem
+AC_SUBST(LIBDIRSTEM)
+
 AC_CONFIG_FILES([Makefile],
                 [FIX_MAKEFILE_DISTRIB])
 
diff --git a/autoconf-lib-link/tests/Makefile.am b/autoconf-lib-link/tests/Makefile.am
index 3aff86e..959057e 100644
--- a/autoconf-lib-link/tests/Makefile.am
+++ b/autoconf-lib-link/tests/Makefile.am
@@ -60,6 +60,7 @@ TESTS_ENVIRONMENT = top_srcdir=$(srcdir)/../.. srcdir=$(srcdir) \
 		    LIBTOOL='@LIBTOOL@' \
 		    CC='@CC@' CFLAGS='@CFLAGS@' \
 		    CPPFLAGS='@CPPFLAGS@' LDFLAGS='@LDFLAGS@' \
+		    LIBDIRSTEM='@LIBDIRSTEM@' \
 		    CONFIG_SHELL='$(SHELL)' \
 		    $(SHELL)
 
diff --git a/autoconf-lib-link/tests/rpath-1 b/autoconf-lib-link/tests/rpath-1
index 06dc4c6..4a5a76b 100644
--- a/autoconf-lib-link/tests/rpath-1
+++ b/autoconf-lib-link/tests/rpath-1
@@ -18,7 +18,7 @@ rm -rf tstdir/$rp-build1
 mkdir tstdir/$rp-build1
 (cd $srcdir/rpathx && tar cf - *) | (cd tstdir/$rp-build1 && tar xf -)
 (cd tstdir/$rp-build1
- ${CONFIG_SHELL-/bin/sh} ./configure $build1_configure_flags --prefix=$builddir/$rp-prefix > configure.log 2>&1
+ ${CONFIG_SHELL-/bin/sh} ./configure $build1_configure_flags --prefix=$builddir/$rp-prefix --libdir=$builddir/$rp-prefix/$LIBDIRSTEM > configure.log 2>&1
  make > make.log 2>&1
  make install > install.log 2>&1
 )
@@ -28,7 +28,7 @@ rm -rf tstdir/$rp-build2
 mkdir tstdir/$rp-build2
 (cd $srcdir/rpathlx && tar cf - *) | (cd tstdir/$rp-build2 && tar xf -)
 (cd tstdir/$rp-build2
- ${CONFIG_SHELL-/bin/sh} ./configure --prefix=$builddir/$rp-prefix > configure.log 2>&1
+ ${CONFIG_SHELL-/bin/sh} ./configure --prefix=$builddir/$rp-prefix --libdir=$builddir/$rp-prefix/$LIBDIRSTEM > configure.log 2>&1
  make > make.log 2>&1
  make check >> make.log
 )
diff --git a/autoconf-lib-link/tests/rpath-2_a b/autoconf-lib-link/tests/rpath-2_a
index 7995b58..1f4eec6 100644
--- a/autoconf-lib-link/tests/rpath-2_a
+++ b/autoconf-lib-link/tests/rpath-2_a
@@ -18,7 +18,7 @@ rm -rf tstdir/$rp-build1
 mkdir tstdir/$rp-build1
 (cd $srcdir/rpathx && tar cf - *) | (cd tstdir/$rp-build1 && tar xf -)
 (cd tstdir/$rp-build1
- ${CONFIG_SHELL-/bin/sh} ./configure $build1_configure_flags --prefix=$builddir/$rp-prefix > configure.log 2>&1
+ ${CONFIG_SHELL-/bin/sh} ./configure $build1_configure_flags --prefix=$builddir/$rp-prefix --libdir=$builddir/$rp-prefix/$LIBDIRSTEM > configure.log 2>&1
  make > make.log 2>&1
  make install > install.log 2>&1
 )
@@ -31,7 +31,7 @@ rm -rf tstdir/$rp-build2
 mkdir tstdir/$rp-build2
 (cd $srcdir/rpathy && tar cf - *) | (cd tstdir/$rp-build2 && tar xf -)
 (cd tstdir/$rp-build2
- ${CONFIG_SHELL-/bin/sh} ./configure $build2_configure_flags --prefix=$builddir/$rp-prefix > configure.log 2>&1
+ ${CONFIG_SHELL-/bin/sh} ./configure $build2_configure_flags --prefix=$builddir/$rp-prefix --libdir=$builddir/$rp-prefix/$LIBDIRSTEM > configure.log 2>&1
  make > make.log 2>&1
  make install > install.log 2>&1
 )
@@ -44,7 +44,7 @@ rm -rf tstdir/$rp-build3
 mkdir tstdir/$rp-build3
 (cd $srcdir/$build3_package && tar cf - *) | (cd tstdir/$rp-build3 && tar xf -)
 (cd tstdir/$rp-build3
- ${CONFIG_SHELL-/bin/sh} ./configure --prefix=$builddir/$rp-prefix > configure.log 2>&1
+ ${CONFIG_SHELL-/bin/sh} ./configure --prefix=$builddir/$rp-prefix --libdir=$builddir/$rp-prefix/$LIBDIRSTEM > configure.log 2>&1
  make > make.log 2>&1
  make check >> make.log
 )
diff --git a/autoconf-lib-link/tests/rpath-2_b b/autoconf-lib-link/tests/rpath-2_b
index 7fd4385..61205d0 100644
--- a/autoconf-lib-link/tests/rpath-2_b
+++ b/autoconf-lib-link/tests/rpath-2_b
@@ -26,7 +26,7 @@ rm -rf tstdir/$rp-build1
 mkdir tstdir/$rp-build1
 (cd $srcdir/rpathx && tar cf - *) | (cd tstdir/$rp-build1 && tar xf -)
 (cd tstdir/$rp-build1
- ${CONFIG_SHELL-/bin/sh} ./configure $build1_configure_flags --prefix=$builddir/$rp-prefix1 > configure.log 2>&1
+ ${CONFIG_SHELL-/bin/sh} ./configure $build1_configure_flags --prefix=$builddir/$rp-prefix1 --libdir=$builddir/$rp-prefix1/$LIBDIRSTEM > configure.log 2>&1
  make > make.log 2>&1
  make install > install.log 2>&1
 )
@@ -39,7 +39,7 @@ rm -rf tstdir/$rp-build2
 mkdir tstdir/$rp-build2
 (cd $srcdir/rpathy && tar cf - *) | (cd tstdir/$rp-build2 && tar xf -)
 (cd tstdir/$rp-build2
- ${CONFIG_SHELL-/bin/sh} ./configure $build2_configure_flags --prefix=$builddir/$rp-prefix2 --with-librpathx-prefix=$builddir/$rp-prefix1 > configure.log 2>&1
+ ${CONFIG_SHELL-/bin/sh} ./configure $build2_configure_flags --prefix=$builddir/$rp-prefix2 --libdir=$builddir/$rp-prefix2/$LIBDIRSTEM --with-librpathx-prefix=$builddir/$rp-prefix1 > configure.log 2>&1
  make > make.log 2>&1
  make install > install.log 2>&1
 )
@@ -57,7 +57,7 @@ mkdir tstdir/$rp-build3
  else
    build3_configure_flags=
  fi
- ${CONFIG_SHELL-/bin/sh} ./configure --prefix=$builddir/$rp-prefix --with-librpathy-prefix=$builddir/$rp-prefix2 $build3_configure_flags > configure.log 2>&1
+ ${CONFIG_SHELL-/bin/sh} ./configure --prefix=$builddir/$rp-prefix --libdir=$builddir/$rp-prefix/$LIBDIRSTEM --with-librpathy-prefix=$builddir/$rp-prefix2 $build3_configure_flags > configure.log 2>&1
  make > make.log 2>&1
  make check >> make.log
 )
diff --git a/autoconf-lib-link/tests/rpath-3_a b/autoconf-lib-link/tests/rpath-3_a
index cbef38b..0e59c7c 100644
--- a/autoconf-lib-link/tests/rpath-3_a
+++ b/autoconf-lib-link/tests/rpath-3_a
@@ -18,7 +18,7 @@ rm -rf tstdir/$rp-build1
 mkdir tstdir/$rp-build1
 (cd $srcdir/rpathx && tar cf - *) | (cd tstdir/$rp-build1 && tar xf -)
 (cd tstdir/$rp-build1
- ${CONFIG_SHELL-/bin/sh} ./configure $build1_configure_flags --prefix=$builddir/$rp-prefix > configure.log 2>&1
+ ${CONFIG_SHELL-/bin/sh} ./configure $build1_configure_flags --prefix=$builddir/$rp-prefix --libdir=$builddir/$rp-prefix/$LIBDIRSTEM > configure.log 2>&1
  make > make.log 2>&1
  make install > install.log 2>&1
 )
@@ -31,7 +31,7 @@ rm -rf tstdir/$rp-build2
 mkdir tstdir/$rp-build2
 (cd $srcdir/rpathy && tar cf - *) | (cd tstdir/$rp-build2 && tar xf -)
 (cd tstdir/$rp-build2
- ${CONFIG_SHELL-/bin/sh} ./configure $build2_configure_flags --prefix=$builddir/$rp-prefix > configure.log 2>&1
+ ${CONFIG_SHELL-/bin/sh} ./configure $build2_configure_flags --prefix=$builddir/$rp-prefix --libdir=$builddir/$rp-prefix/$LIBDIRSTEM > configure.log 2>&1
  make > make.log 2>&1
  make install > install.log 2>&1
 )
@@ -44,7 +44,7 @@ rm -rf tstdir/$rp-build3
 mkdir tstdir/$rp-build3
 (cd $srcdir/rpathz && tar cf - *) | (cd tstdir/$rp-build3 && tar xf -)
 (cd tstdir/$rp-build3
- ${CONFIG_SHELL-/bin/sh} ./configure $build3_configure_flags --prefix=$builddir/$rp-prefix > configure.log 2>&1
+ ${CONFIG_SHELL-/bin/sh} ./configure $build3_configure_flags --prefix=$builddir/$rp-prefix --libdir=$builddir/$rp-prefix/$LIBDIRSTEM > configure.log 2>&1
  make > make.log 2>&1
  make install > install.log 2>&1
 )
@@ -57,7 +57,7 @@ rm -rf tstdir/$rp-build4
 mkdir tstdir/$rp-build4
 (cd $srcdir/$build4_package && tar cf - *) | (cd tstdir/$rp-build4 && tar xf -)
 (cd tstdir/$rp-build4
- ${CONFIG_SHELL-/bin/sh} ./configure --prefix=$builddir/$rp-prefix > configure.log 2>&1
+ ${CONFIG_SHELL-/bin/sh} ./configure --prefix=$builddir/$rp-prefix --libdir=$builddir/$rp-prefix/$LIBDIRSTEM > configure.log 2>&1
  make > make.log 2>&1
  make check >> make.log
 )
diff --git a/autoconf-lib-link/tests/rpath-3_b b/autoconf-lib-link/tests/rpath-3_b
index 1625fb2..4ebd3fb 100644
--- a/autoconf-lib-link/tests/rpath-3_b
+++ b/autoconf-lib-link/tests/rpath-3_b
@@ -30,7 +30,7 @@ rm -rf tstdir/$rp-build1
 mkdir tstdir/$rp-build1
 (cd $srcdir/rpathx && tar cf - *) | (cd tstdir/$rp-build1 && tar xf -)
 (cd tstdir/$rp-build1
- ${CONFIG_SHELL-/bin/sh} ./configure $build1_configure_flags --prefix=$builddir/$rp-prefix1 > configure.log 2>&1
+ ${CONFIG_SHELL-/bin/sh} ./configure $build1_configure_flags --prefix=$builddir/$rp-prefix1 --libdir=$builddir/$rp-prefix1/$LIBDIRSTEM > configure.log 2>&1
  make > make.log 2>&1
  make install > install.log 2>&1
 )
@@ -43,7 +43,7 @@ rm -rf tstdir/$rp-build2
 mkdir tstdir/$rp-build2
 (cd $srcdir/rpathy && tar cf - *) | (cd tstdir/$rp-build2 && tar xf -)
 (cd tstdir/$rp-build2
- ${CONFIG_SHELL-/bin/sh} ./configure $build2_configure_flags --prefix=$builddir/$rp-prefix2 --with-librpathx-prefix=$builddir/$rp-prefix1 > configure.log 2>&1
+ ${CONFIG_SHELL-/bin/sh} ./configure $build2_configure_flags --prefix=$builddir/$rp-prefix2 --libdir=$builddir/$rp-prefix2/$LIBDIRSTEM --with-librpathx-prefix=$builddir/$rp-prefix1 > configure.log 2>&1
  make > make.log 2>&1
  make install > install.log 2>&1
 )
@@ -56,7 +56,7 @@ rm -rf tstdir/$rp-build3
 mkdir tstdir/$rp-build3
 (cd $srcdir/rpathz && tar cf - *) | (cd tstdir/$rp-build3 && tar xf -)
 (cd tstdir/$rp-build3
- ${CONFIG_SHELL-/bin/sh} ./configure $build3_configure_flags --prefix=$builddir/$rp-prefix3 --with-librpathx-prefix=$builddir/$rp-prefix1 --with-librpathy-prefix=$builddir/$rp-prefix2 > configure.log 2>&1
+ ${CONFIG_SHELL-/bin/sh} ./configure $build3_configure_flags --prefix=$builddir/$rp-prefix3 --libdir=$builddir/$rp-prefix3/$LIBDIRSTEM --with-librpathx-prefix=$builddir/$rp-prefix1 --with-librpathy-prefix=$builddir/$rp-prefix2 > configure.log 2>&1
  make > make.log 2>&1
  make install > install.log 2>&1
 )
@@ -74,7 +74,7 @@ mkdir tstdir/$rp-build4
  else
    build4_configure_flags=
  fi
- ${CONFIG_SHELL-/bin/sh} ./configure --prefix=$builddir/$rp-prefix --with-librpathz-prefix=$builddir/$rp-prefix3 $build4_configure_flags > configure.log 2>&1
+ ${CONFIG_SHELL-/bin/sh} ./configure --prefix=$builddir/$rp-prefix --libdir=$builddir/$rp-prefix/$LIBDIRSTEM --with-librpathz-prefix=$builddir/$rp-prefix3 $build4_configure_flags > configure.log 2>&1
  make > make.log 2>&1
  make check >> make.log
 )
diff --git a/autoconf-lib-link/tests/rpathcfg.sh b/autoconf-lib-link/tests/rpathcfg.sh
index 1b0ab79..2f89f6e 100755
--- a/autoconf-lib-link/tests/rpathcfg.sh
+++ b/autoconf-lib-link/tests/rpathcfg.sh
@@ -2,7 +2,7 @@
 # Prints information for maintaining config.rpath.
 
 # The caller should set the environment variables
-# top_srcdir, srcdir, CONFIG_SHELL, CC, GCC, LDFLAGS, LD, with_gnu_ld, host.
+# top_srcdir, srcdir, CONFIG_SHELL, CC, GCC, LDFLAGS, LD, LIBDIRSTEM, with_gnu_ld, host.
 
 echo "=============== rpathcfg for $host ==============="
 echo
@@ -25,7 +25,7 @@ mkdir tstprefix
 mkdir tstdir/build
 (cd $srcdir/rpathx && tar cf - *) | (cd tstdir/build && tar xf -)
 (cd tstdir/build
- ${CONFIG_SHELL-/bin/sh} ./configure --disable-shared --prefix=$builddir/tstprefix > configure.log 2>&1
+ ${CONFIG_SHELL-/bin/sh} ./configure --disable-shared --prefix=$builddir/tstprefix --libdir=$builddir/tstprefix/${LIBDIRSTEM-lib} > configure.log 2>&1
  make > make.log 2>&1
  make install > install.log 2>&1
 )
@@ -50,7 +50,7 @@ mkdir tstprefix
 mkdir tstdir/build
 (cd $srcdir/rpathx && tar cf - *) | (cd tstdir/build && tar xf -)
 (cd tstdir/build
- ${CONFIG_SHELL-/bin/sh} ./configure --disable-static --prefix=$builddir/tstprefix > configure.log 2>&1
+ ${CONFIG_SHELL-/bin/sh} ./configure --disable-static --prefix=$builddir/tstprefix --libdir=$builddir/tstprefix/${LIBDIRSTEM-lib} > configure.log 2>&1
  make > make.log 2>&1
  make install > install.log 2>&1
 )
@@ -75,7 +75,7 @@ mkdir tstprefix
 mkdir tstdir/build
 (cd $srcdir/rpathx && tar cf - *) | (cd tstdir/build && tar xf -)
 (cd tstdir/build
- ${CONFIG_SHELL-/bin/sh} ./configure --disable-static --prefix=$builddir/tstprefix > configure.log 2>&1
+ ${CONFIG_SHELL-/bin/sh} ./configure --disable-static --prefix=$builddir/tstprefix --libdir=$builddir/tstprefix/${LIBDIRSTEM-lib} > configure.log 2>&1
  make > make.log 2>&1
  make install > install.log 2>&1
 )