tests: expose automake bug#13940

[platform/upstream/automake.git] / t / aclocal-acdir.sh

diff --git a/t/aclocal-acdir.sh b/t/aclocal-acdir.sh
old mode 100755 (executable)
new mode 100644 (file)
index e5b2bd2..80eba31
--- a/t/aclocal-acdir.sh
+++ b/t/aclocal-acdir.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2013 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
@@ -18,9 +18,12 @@
 # check that stuff in the automake acdir takes precedence over stuff in
 # the system acdir.
 
-. ./defs || Exit 1
+. test-init.sh
 
 mkdir am sys
+# FIXME: remove in Automake 2.0
+mkdir am/internal
+: > am/internal/ac-config-macro-dirs.m4
 
 cat >> configure.ac <<'END'
 MY_MACRO
@@ -70,6 +73,6 @@ $ACLOCAL --automake-acdir am --system-acdir sys
 $AUTOCONF --force
 $FGREP 'fake--init--automake' configure
 $FGREP 'am--macro' configure
-$FGREP 'my--macro' configure && Exit 1 # Just to be sure.
+$FGREP 'my--macro' configure && exit 1 # Just to be sure.
 
 :