diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-06-08 18:34:41 +0200 |
---|---|---|
committer | Daiki Ueno <ueno@gnu.org> | 2013-06-10 11:28:22 +0900 |
commit | 3bf01bf68b6f3f72c6f8d1cd34834bfbc8cac85a (patch) | |
tree | 2f6a41c5d904faaaed7b8a5a65ded222f797ab23 /autogen.sh | |
parent | 99577a97baf06378f0c4b01b95188f6295fb4633 (diff) | |
download | external_gettext-3bf01bf68b6f3f72c6f8d1cd34834bfbc8cac85a.zip external_gettext-3bf01bf68b6f3f72c6f8d1cd34834bfbc8cac85a.tar.gz external_gettext-3bf01bf68b6f3f72c6f8d1cd34834bfbc8cac85a.tar.bz2 |
build: drop the 'fixacocal' auxiliary script
The comments in that script state that its use is only required to
work around issues in aclocal from Automake 1.10, while the rest
of the Gettext build infrastructure assumes Automake >= 1.11 anyway.
* autogen.sh: Drop invocations of 'fixaclocal', simply invoke the
'aclocal' program directly.
* build-aux/fixaclocal: Remove.
* Makefile.am (EXTRA_DIST): Stop distributing it.
(ACLOCAL): Drop redefinition in function of 'fixaclocal'.
* gettext-runtime/Makefile.am (ACLOCAL): Likewise.
* gettext-runtime/libasprintf/Makefile.am (ACLOCAL): Likewise.
* gettext-tools/Makefile.am (ACLOCAL): Likewise.
* gettext-tools/examples/Makefile.am (ACLOCAL): Likewise.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'autogen.sh')
-rwxr-xr-x | autogen.sh | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -337,14 +337,14 @@ else fi (cd gettext-runtime/libasprintf - ../../build-aux/fixaclocal aclocal -I ../../m4 -I ../m4 -I gnulib-m4 + aclocal -I ../../m4 -I ../m4 -I gnulib-m4 autoconf autoheader && touch config.h.in automake --add-missing --copy ) (cd gettext-runtime - ../build-aux/fixaclocal aclocal -I m4 -I ../m4 -I gnulib-m4 + aclocal -I m4 -I ../m4 -I gnulib-m4 autoconf autoheader && touch config.h.in automake --add-missing --copy @@ -361,7 +361,7 @@ fi cp -p gettext-runtime/ABOUT-NLS gettext-tools/ABOUT-NLS (cd gettext-tools/examples - ../../build-aux/fixaclocal aclocal -I ../../gettext-runtime/m4 -I ../../m4 + aclocal -I ../../gettext-runtime/m4 -I ../../m4 autoconf automake --add-missing --copy # Rebuilding the examples PO files is only rarely needed. @@ -371,7 +371,7 @@ cp -p gettext-runtime/ABOUT-NLS gettext-tools/ABOUT-NLS ) (cd gettext-tools - ../build-aux/fixaclocal aclocal -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 + aclocal -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 autoconf autoheader && touch config.h.in test -d intl || mkdir intl @@ -392,6 +392,6 @@ cp -p gettext-runtime/ABOUT-NLS gettext-tools/ABOUT-NLS fi ) -build-aux/fixaclocal aclocal -I m4 +aclocal -I m4 autoconf automake |