projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test-unlinkat: enhance test, to expose Solaris 9 bug
[gnulib.git]
/
gnulib-tool
diff --git
a/gnulib-tool
b/gnulib-tool
index
c633da2
..
a847431
100755
(executable)
--- a/
gnulib-tool
+++ b/
gnulib-tool
@@
-703,7
+703,7
@@
if test -z "$have_echo" \
&& test "X$1" != "X--no-reexec" \
&& test -n "$CONFIG_SHELL" \
&& test -f "$CONFIG_SHELL" \
&& test "X$1" != "X--no-reexec" \
&& test -n "$CONFIG_SHELL" \
&& test -f "$CONFIG_SHELL" \
- && $CONFIG_SHELL -c
'echo '\t' | grep t > /dev/null'
; then
+ && $CONFIG_SHELL -c
"echo '\\t' | grep t > /dev/null"
; then
exec $CONFIG_SHELL "$0" --no-reexec "$@"
exit 127
fi
exec $CONFIG_SHELL "$0" --no-reexec "$@"
exit 127
fi
@@
-2874,8
+2874,8
@@
s,^\(.................................................[^ ]*\) *,
fi
fi
fi
fi
- # Determine script to apply to auxil
l
iary files that go into $auxdir/.
- sed_transform_build_aux_file=
"$sed_transform_lib_file"
+ # Determine script to apply to auxiliary files that go into $auxdir/.
+ sed_transform_build_aux_file=
if test -n "$do_copyrights"; then
# Update license.
sed_transform_build_aux_file=$sed_transform_build_aux_file'
if test -n "$do_copyrights"; then
# Update license.
sed_transform_build_aux_file=$sed_transform_build_aux_file'
@@
-4010,7
+4010,7
@@
func_create_testdir ()
echo "AC_CONFIG_AUX_DIR([$auxdir])"
echo "AM_INIT_AUTOMAKE"
echo
echo "AC_CONFIG_AUX_DIR([$auxdir])"
echo "AM_INIT_AUTOMAKE"
echo
- echo "A
M_CONFIG_HEADER
([config.h])"
+ echo "A
C_CONFIG_HEADERS
([config.h])"
echo
echo "AC_PROG_CC"
echo "AC_PROG_INSTALL"
echo
echo "AC_PROG_CC"
echo "AC_PROG_INSTALL"
@@
-4100,7
+4100,8
@@
func_create_testdir ()
# by "merging" config.h into $testsbase/config.h; look out for gcc warnings.
echo "AH_TOP([#include \"../config.h\"])"
echo
# by "merging" config.h into $testsbase/config.h; look out for gcc warnings.
echo "AH_TOP([#include \"../config.h\"])"
echo
- echo "AC_OUTPUT([Makefile])"
+ echo "AC_CONFIG_FILES([Makefile])"
+ echo "AC_OUTPUT"
) > "$testdir/$testsbase/configure.ac"
auxdir="$saved_auxdir"
func_append subdirs " $testsbase"
) > "$testdir/$testsbase/configure.ac"
auxdir="$saved_auxdir"
func_append subdirs " $testsbase"
@@
-4125,7
+4126,7
@@
func_create_testdir ()
fi
echo "AM_INIT_AUTOMAKE"
echo
fi
echo "AM_INIT_AUTOMAKE"
echo
- echo "A
M_CONFIG_HEADER
([config.h])"
+ echo "A
C_CONFIG_HEADERS
([config.h])"
echo
echo "AC_PROG_CC"
echo "AC_PROG_INSTALL"
echo
echo "AC_PROG_CC"
echo "AC_PROG_INSTALL"
@@
-4216,7
+4217,8
@@
func_create_testdir ()
*) func_append makefiles " $d/Makefile" ;;
esac
done
*) func_append makefiles " $d/Makefile" ;;
esac
done
- echo "AC_OUTPUT([$makefiles])"
+ echo "AC_CONFIG_FILES([$makefiles])"
+ echo "AC_OUTPUT"
) > "$testdir/configure.ac"
# Create autogenerated files.
) > "$testdir/configure.ac"
# Create autogenerated files.
@@
-4378,7
+4380,8
@@
func_create_megatestdir ()
echo "AC_PROG_MAKE_SET"
echo
echo "AC_CONFIG_SUBDIRS([$megasubdirs])"
echo "AC_PROG_MAKE_SET"
echo
echo "AC_CONFIG_SUBDIRS([$megasubdirs])"
- echo "AC_OUTPUT([Makefile])"
+ echo "AC_CONFIG_FILES([Makefile])"
+ echo "AC_OUTPUT"
) > "$megatestdir/configure.ac"
# Create autogenerated files.
) > "$megatestdir/configure.ac"
# Create autogenerated files.
@@
-4417,7
+4420,7
@@
case $mode in
if test -f "$destdir"/configure.in; then
configure_ac="$destdir/configure.in"
else
if test -f "$destdir"/configure.in; then
configure_ac="$destdir/configure.in"
else
- func_fatal_error "cannot find $destdir/configure.ac"
+ func_fatal_error "cannot find $destdir/configure.ac
- make sure you run gnulib-tool from within your package's directory
"
fi
fi
fi
fi