diff options
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/ChangeLog | 5 | ||||
| -rw-r--r-- | macros/autogen.sh | 32 |
2 files changed, 35 insertions, 2 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index 758a71d345..10714eaf0a 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,3 +1,8 @@ +1998-12-01 Changwoo Ryu <cwryu@adam.kaist.ac.kr> + + * autogen.sh: Run gettextize if needed. + : Run libtoolize only if configure.in has "^AM_PROG_LIBTOOL". + 1998-11-30 Jeff Garzik <jgarzik@pobox.com> * gnome.m4: Re-arranged tests such that "--without-gnome" is diff --git a/macros/autogen.sh b/macros/autogen.sh index f99299b0a0..2e9390e320 100644 --- a/macros/autogen.sh +++ b/macros/autogen.sh @@ -11,6 +11,7 @@ DIE=0 DIE=1 } +(grep -q "^AM_PROG_LIBTOOL" configure.in) && { (libtool --version) < /dev/null > /dev/null 2>&1 || { echo echo "**Error**: You must have "\`libtool\'" installed to compile Gnome." @@ -18,6 +19,18 @@ DIE=0 echo "(or a newer version if it is available)" DIE=1 } +} + +grep -q "^AM_GNU_GETTEXT" configure.in && { +grep -q "sed.*POTFILES" configure.in || \ +(gettext --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have "\`gettext\'" installed to compile Gnome." + echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz" + echo "(or a newer version if it is available)" + DIE=1 +} +} (automake --version) < /dev/null > /dev/null 2>&1 || { echo @@ -71,9 +84,24 @@ do if test -d $k; then aclocalinclude="$aclocalinclude -I $k"; \ else echo "**Warning**: No such directory \`$k'. Ignored."; fi; \ done; \ - libtoolize --copy --force; \ + if grep -q "^AM_GNU_GETTEXT" configure.in; then \ + if grep -q "sed.*POTFILES" configure.in; then \ + : do nothing -- we still have an old unmodified configure.in + else + echo "Running gettextize... Ignore non-fatal messages."; \ + echo "no" | gettextize --force; \ + fi \ + fi; \ + if grep -q "^AM_PROG_LIBTOOL" configure.in; then \ + echo "Running libtoolize..."; \ + libtoolize --force; \ + fi aclocal $aclocalinclude; \ - autoheader; automake --add-missing --gnu $am_opt; autoheader; autoconf) + if grep -q "^AM_CONFIG_HEADER" configure.in; then \ + echo "Running autoheader..."; \ + autoheader; \ + fi + automake --add-missing --gnu $am_opt; autoconf) fi done |