Merge branch 'maint'

[platform/upstream/automake.git] / tests / multlib.test

diff --git a/tests/multlib.test b/tests/multlib.test
index 75ef952..894effb 100755 (executable)
--- a/tests/multlib.test
+++ b/tests/multlib.test
@@ -1,6 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2003, 2004, 2007, 2010, 2012 Free Software Foundation,
-# Inc.
+# Copyright (C) 2003, 2004, 2007, 2010, 2011, 2012 Free Software
+# Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,8 +21,6 @@
 required='gcc GNUmake'
 . ./defs || Exit 1
 
-set -e
-
 # Multilib support has been deprecated in the Automake core.
 
 cat >>configure.in <<'END'
@@ -84,6 +82,7 @@ AC_CONFIG_SRCDIR(foo.c)
 AC_CONFIG_AUX_DIR(.)
 AM_INIT_AUTOMAKE
 AC_PROG_CC
+AM_PROG_AR
 AC_PROG_RANLIB
 AM_ENABLE_MULTILIB(Makefile,[..])
 AC_CONFIG_FILES([Makefile])
@@ -107,6 +106,7 @@ AC_INIT(libbar, 0.1, nobody@localhost)
 AC_CONFIG_AUX_DIR(.)
 AM_INIT_AUTOMAKE
 AC_PROG_CC
+AM_PROG_AR
 AC_PROG_RANLIB
 AM_ENABLE_MULTILIB(Makefile,[..])
 AC_CONFIG_FILES([Makefile sub/Makefile])
@@ -125,8 +125,7 @@ mkdir libbar/sub
 
 : > libbar/bar.c
 
-cp "$testsrcdir/../lib/config-ml.in" .
-cp "$testsrcdir/../lib/symlink-tree" .
+cp "$am_scriptdir"/config-ml.in "$am_scriptdir"/symlink-tree .
 
 $ACLOCAL -Wno-obsolete
 $AUTOCONF -Werror -Wall -Wno-obsolete