am-ft: make the environment available earlier

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

diff --git a/t/nostdinc.sh b/t/nostdinc.sh
old mode 100755 (executable)
new mode 100644 (file)
index 8b780a6..fd777ba
--- a/t/nostdinc.sh
+++ b/t/nostdinc.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+# Copyright (C) 1999-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
@@ -21,7 +21,7 @@
 # just skip the rest of the test if configure fails to find a working C
 # compiler.
 
-. ./defs || Exit 1
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
@@ -37,7 +37,7 @@ END
 $ACLOCAL
 $AUTOMAKE
 
-$EGREP '(-I *\.|-I.*srcdir|am__isrc)' Makefile.in && Exit 1
+$EGREP '(-I *\.|-I.*srcdir|am__isrc)' Makefile.in && exit 1
 
 # We'll test the fully-processed Makefile too.
 $AUTOCONF
@@ -45,12 +45,12 @@ $AUTOCONF
 # Test with $builddir != $srcdir
 mkdir build
 cd build
-../configure || Exit $?
-$EGREP '.*-I *(\.|\$.srcdir.)' Makefile && Exit 1
+../configure || exit $?
+$EGREP '.*-I *(\.|\$.srcdir.)' Makefile && exit 1
 
 # Test with $builddir = $srcdir
 cd ..
-./configure || Exit $?
-$EGREP '.*-I *(\.|\$.srcdir.)' Makefile && Exit 1
+./configure || exit $?
+$EGREP '.*-I *(\.|\$.srcdir.)' Makefile && exit 1
 
-Exit 0
+exit 0