diff options
| author | Bruno Haible <bruno@clisp.org> | 2006-10-16 12:18:21 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:14:07 +0200 |
| commit | 1ae8d362efeef51f6fd35f6dc9bbeb036baadfaf (patch) | |
| tree | 2234baf7e046abb06dd22fbe2ed49b4b66cc8bf9 /gettext-tools/misc | |
| parent | caa8db345f25020f01ebfeb4b47c44f786989dce (diff) | |
| download | external_gettext-1ae8d362efeef51f6fd35f6dc9bbeb036baadfaf.zip external_gettext-1ae8d362efeef51f6fd35f6dc9bbeb036baadfaf.tar.gz external_gettext-1ae8d362efeef51f6fd35f6dc9bbeb036baadfaf.tar.bz2 | |
Improve the recommendation how to run aclocal.
Diffstat (limited to 'gettext-tools/misc')
| -rw-r--r-- | gettext-tools/misc/ChangeLog | 9 | ||||
| -rw-r--r-- | gettext-tools/misc/gettextize.in | 23 |
2 files changed, 30 insertions, 2 deletions
diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog index 191dfe4..a33e026 100644 --- a/gettext-tools/misc/ChangeLog +++ b/gettext-tools/misc/ChangeLog @@ -1,3 +1,12 @@ +2006-10-15 Bruno Haible <bruno@clisp.org> + + * gettextize.in (m4dir_is_next): Reset it to empty when the m4dir was + seen. + (m4dir_defaulted): New variable. + In the recommendations how to run aclocal, show all the needed -I + options, not just one. + Reported by Ralf Wildenhues. + 2006-10-08 Bruno Haible <bruno@clisp.org> * gettextize.in (usage): Document the --symlink option instead of the diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in index 886e9a6..3913b4f 100644 --- a/gettext-tools/misc/gettextize.in +++ b/gettext-tools/misc/gettextize.in @@ -769,6 +769,7 @@ if test -f "$srcdir/Makefile.am"; then # Extract the macro directory name from Makefile.am. aclocal_amflags=`grep '^ACLOCAL_AMFLAGS[ ]*=' "$srcdir/Makefile.am" | sed -e 's/^ACLOCAL_AMFLAGS[ ]*=\(.*\)$/\1/'` m4dir=m4 + m4dir_defaulted=yes m4dir_is_next= for arg in $aclocal_amflags; do if test -n "$m4dir_is_next"; then @@ -777,9 +778,11 @@ if test -f "$srcdir/Makefile.am"; then /*) ;; *) m4dir="$arg" + m4dir_defaulted= break ;; esac + m4dir_is_next= else if test "X$arg" = "X-I"; then m4dir_is_next=yes @@ -961,7 +964,7 @@ if test -f "$srcdir/Makefile.am"; then }' < "$srcdir/Makefile.am" > "$srcdir/Makefile.am.tmp" func_modify_Makefile_am "(DIST_SUBDIRS): Remove $removed_directory." fi - if test -z "$m4dir_is_next"; then + if test -n "$m4dir_defaulted"; then if grep '^ACLOCAL_AMFLAGS[ ]*=' "$srcdir/Makefile.am" > /dev/null; then sed -e "s%^\(ACLOCAL_AMFLAGS[ ]*=\) \\?%\\1 -I $m4dir %" < "$srcdir/Makefile.am" > "$srcdir/Makefile.am.tmp" func_modify_Makefile_am "(ACLOCAL_AMFLAGS): Add -I $m4dir." @@ -992,8 +995,24 @@ if test -f "$srcdir/Makefile.am"; then func_modify_Makefile_am "(EXTRA_DIST): New variable." fi fi + # Extract the aclocal options name from Makefile.am. + aclocal_amflags=`grep '^ACLOCAL_AMFLAGS[ ]*=' "$srcdir/Makefile.am" | sed -e 's/^ACLOCAL_AMFLAGS[ ]*=\(.*\)$/\1/'` + aclocal_options= + m4dir_is_next= + for arg in $aclocal_amflags; do + if test -n "$m4dir_is_next"; then + aclocal_options="$aclocal_options -I $arg" + m4dir_is_next= + else + if test "X$arg" = "X-I"; then + m4dir_is_next=yes + else + m4dir_is_next= + fi + fi + done please="$please -Please run 'aclocal -I $m4dir' to regenerate the aclocal.m4 file. +Please run 'aclocal$aclocal_options' to regenerate the aclocal.m4 file. You need aclocal from GNU automake $min_automake_version (or newer) to do this. Then run 'autoconf' to regenerate the configure file. " |