projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
secure_getenv: fix include typo
[gnulib.git]
/
gnulib-tool
diff --git
a/gnulib-tool
b/gnulib-tool
index
b295818
..
c5ab13b
100755
(executable)
--- a/
gnulib-tool
+++ b/
gnulib-tool
@@
-1,6
+1,6
@@
#! /bin/sh
#
#! /bin/sh
#
-# Copyright (C) 2002-201
2
Free Software Foundation, Inc.
+# Copyright (C) 2002-201
3
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
#
# 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
@@
-280,7
+280,6
@@
Options for --import, --add/remove-import:
--vc-files Update version control related files.
--no-vc-files Don't update version control related files
(.gitignore and/or .cvsignore).
--vc-files Update version control related files.
--no-vc-files Don't update version control related files
(.gitignore and/or .cvsignore).
- --no-changelog Don't update or create ChangeLog files.
Options for --create-[mega]testdir, --[mega]test:
Options for --create-[mega]testdir, --[mega]test:
@@
-957,7
+956,6
@@
fi
# - vc_files true if --vc-files was given, false if --no-vc-files was
# given, blank otherwise
# - autoconf_minversion minimum supported autoconf version
# - vc_files true if --vc-files was given, false if --no-vc-files was
# given, blank otherwise
# - autoconf_minversion minimum supported autoconf version
-# - do_changelog false if --no-changelog was given, : otherwise
# - doit : if actions shall be executed, false if only to be printed
# - symbolic true if --symlink or --more-symlinks was given, blank
# otherwise
# - doit : if actions shall be executed, false if only to be printed
# - symbolic true if --symlink or --more-symlinks was given, blank
# otherwise
@@
-998,7
+996,6
@@
fi
po_domain=
witness_c_macro=
vc_files=
po_domain=
witness_c_macro=
vc_files=
- do_changelog=:
doit=:
symbolic=
lsymbolic=
doit=:
symbolic=
lsymbolic=
@@
-1268,7
+1265,7
@@
fi
vc_files=false
shift ;;
--no-changelog | --no-changelo | --no-changel | --no-change | --no-chang | --no-chan | --no-cha | --no-ch )
vc_files=false
shift ;;
--no-changelog | --no-changelo | --no-changel | --no-change | --no-chang | --no-chan | --no-cha | --no-ch )
- do_changelog=false
+ # A no-op for backward compatibility.
shift ;;
--dry-run )
doit=false
shift ;;
--dry-run )
doit=false
@@
-1337,7
+1334,6
@@
fi
echo "you need to use 'gnulib --import' - at your own risk!" 1>&2
func_exit 1
fi
echo "you need to use 'gnulib --import' - at your own risk!" 1>&2
func_exit 1
fi
- do_changelog=false
fi
if test -n "$pobase" && test -z "$po_domain"; then
echo "gnulib-tool: together with --po-base, you need to specify --po-domain" 1>&2
fi
if test -n "$pobase" && test -z "$po_domain"; then
echo "gnulib-tool: together with --po-base, you need to specify --po-domain" 1>&2
@@
-3576,9
+3572,11
@@
func_emit_tests_Makefile_am ()
witness_macro="$1"
if test "$libtool" = true; then
libext=la
witness_macro="$1"
if test "$libtool" = true; then
libext=la
+ perhapsLT=LT
sed_eliminate_LDFLAGS="$sed_noop"
else
libext=a
sed_eliminate_LDFLAGS="$sed_noop"
else
libext=a
+ perhapsLT=
sed_eliminate_LDFLAGS='/^lib_LDFLAGS[ ]*+=/d'
fi
if $for_test; then
sed_eliminate_LDFLAGS='/^lib_LDFLAGS[ ]*+=/d'
fi
if $for_test; then
@@
-3892,6
+3890,7
@@
func_emit_initmacro_done ()
# func_emit_autoconf_snippet indentation
# emits the autoconf snippet of a module.
# Input:
# func_emit_autoconf_snippet indentation
# emits the autoconf snippet of a module.
# Input:
+# - indentation spaces to prepend on each line
# - local_gnulib_dir from --local-dir
# - modcache true or false, from --cache-modules/--no-cache-modules
# - sed_replace_build_aux sed expression that replaces reference to build-aux
# - local_gnulib_dir from --local-dir
# - modcache true or false, from --cache-modules/--no-cache-modules
# - sed_replace_build_aux sed expression that replaces reference to build-aux
@@
-3905,9
+3904,9
@@
func_emit_initmacro_done ()
# command line options.
# - disable_gettext true or false. It tells whether to disable AM_GNU_GETTEXT
# invocations.
# command line options.
# - disable_gettext true or false. It tells whether to disable AM_GNU_GETTEXT
# invocations.
-# - indentation spaces to prepend on each line
func_emit_autoconf_snippet ()
{
func_emit_autoconf_snippet ()
{
+ indentation="$1"
if { case $module in
gnumakefile | maintainer-makefile)
# These modules are meant to be used only in the top-level directory.
if { case $module in
gnumakefile | maintainer-makefile)
# These modules are meant to be used only in the top-level directory.
@@
-3931,7
+3930,9
@@
func_emit_autoconf_snippet ()
| { if $disable_gettext; then
sed -e 's/AM_GNU_GETTEXT(\[external\])/dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac./'
else
| { if $disable_gettext; then
sed -e 's/AM_GNU_GETTEXT(\[external\])/dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac./'
else
- cat
+ # Don't indent AM_GNU_GETTEXT_VERSION line, as that confuses
+ # autopoint through at least GNU gettext version 0.18.2.
+ sed -e 's/^ *AM_GNU_GETTEXT_VERSION/AM_GNU_GETTEXT_VERSION/'
fi
}
if test "$module" = 'alloca' && test "$libtool" = true && ! $disable_libtool; then
fi
}
if test "$module" = 'alloca' && test "$libtool" = true && ! $disable_libtool; then
@@
-5140,7
+5141,7
@@
s,//*$,/,'
fi
echo "gl_MACRO_PREFIX([$macro_prefix])"
echo "gl_PO_DOMAIN([$po_domain])"
fi
echo "gl_MACRO_PREFIX([$macro_prefix])"
echo "gl_PO_DOMAIN([$po_domain])"
- echo "gl_WITNESS_C_
DOMAIN
([$witness_c_macro])"
+ echo "gl_WITNESS_C_
MACRO
([$witness_c_macro])"
if test -n "$vc_files"; then
echo "gl_VC_FILES([$vc_files])"
fi
if test -n "$vc_files"; then
echo "gl_VC_FILES([$vc_files])"
fi
@@
-5340,7
+5341,7
@@
s,//*$,/,'
echo "Create $testsbase/$makefile_am"
rm -f "$tmpfile"
fi
echo "Create $testsbase/$makefile_am"
rm -f "$tmpfile"
fi
- func_append added_files "$testsbase/$makefile_am$nl"
+
func_append added_files "$testsbase/$makefile_am$nl"
fi
fi
fi
fi
@@
-5374,7
+5375,7
@@
s,//*$,/,'
(echo "$dir_added" | sed -e '/^$/d' | LC_ALL=C sort -u \
| LC_ALL=C join -v 1 - "$tmp"/ignore > "$tmp"/ignore-added
echo "$dir_removed" | sed -e '/^$/d' | LC_ALL=C sort -u \
(echo "$dir_added" | sed -e '/^$/d' | LC_ALL=C sort -u \
| LC_ALL=C join -v 1 - "$tmp"/ignore > "$tmp"/ignore-added
echo "$dir_removed" | sed -e '/^$/d' | LC_ALL=C sort -u \
-
| LC_ALL=C join -v 1 - "$tmp"/ignore
> "$tmp"/ignore-removed
+ > "$tmp"/ignore-removed
)
if test -s "$tmp"/ignore-added || test -s "$tmp"/ignore-removed; then
if $doit; then
)
if test -s "$tmp"/ignore-added || test -s "$tmp"/ignore-removed; then
if $doit; then