am-ft: make the environment available earlier

[platform/upstream/automake.git] / t / init.sh

diff --git a/t/init.sh b/t/init.sh
old mode 100755 (executable)
new mode 100644 (file)
index d576814..2cd4e8e
--- a/t/init.sh
+++ b/t/init.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+# Copyright (C) 2006-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
@@ -17,7 +17,7 @@
 # Make sure we give a sensible error message when AC_INIT and
 # AM_INIT_AUTOMAKE are both given less than two arguments.
 
-. ./defs || Exit 1
+. test-init.sh
 
 for ac_init_args in '' '([x])'; do
   for am_init_args in '' '([1.10])'; do
@@ -28,9 +28,9 @@ for ac_init_args in '' '([x])'; do
 END
     cat configure.ac # For debugging.
     # The error message should mention AC_INIT, not AC_PACKAGE_VERSION.
-    ($ACLOCAL && $AUTOCONF) 2>stderr && { cat stderr >&2; Exit 1; }
+    ($ACLOCAL && $AUTOCONF) 2>stderr && { cat stderr >&2; exit 1; }
     cat stderr >&2
-    $FGREP AC_PACKAGE_VERSION stderr && Exit 1
+    $FGREP AC_PACKAGE_VERSION stderr && exit 1
     grep 'configure\.ac:.* AC_INIT .*arguments' stderr
   done
 done