summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog13
-rwxr-xr-xautogen.sh20
2 files changed, 23 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index eb79eaf..c725433 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-11-05 Bruno Haible <bruno@clisp.org>
+
+ * autogen.sh (GNULIB_MODULES_RUNTIME_FOR_SRC): Renamed from
+ GNULIB_MODULES_FOR_SRC.
+ (GNULIB_MODULES_RUNTIME_OTHER): Renamed from GNULIB_MODULES_OTHER.
+ (GNULIB_MODULES_TOOLS_FOR_SRC): Renamed from GNULIB_MODULES_FOR_SRC.
+ (GNULIB_MODULES_TOOLS_FOR_LIBGREP): Renamed from
+ GNULIB_MODULES_FOR_LIBGREP.
+ (GNULIB_MODULES_TOOLS_OTHER): Renamed from GNULIB_MODULES_OTHER.
+ (GNULIB_MODULES_LIBGETTEXTPO): Renamed from
+ GNULIB_MODULES_FOR_LIBGETTEXTPO.
+ (GNULIB_MODULES_LIBGETTEXTPO_OTHER): Renamed from GNULIB_MODULES_OTHER.
+
2006-10-27 Bruno Haible <bruno@clisp.org>
Work around automake-1.10 annoyance.
diff --git a/autogen.sh b/autogen.sh
index fee55b2..773ab10 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -51,7 +51,7 @@ fi
# Skip the gnulib-tool step if gnulib-tool was not found.
if test -n "$GNULIB_TOOL"; then
# In gettext-runtime:
- GNULIB_MODULES_FOR_SRC='
+ GNULIB_MODULES_RUNTIME_FOR_SRC='
atexit
basename
closeout
@@ -69,16 +69,16 @@ if test -n "$GNULIB_TOOL"; then
unlocked-io
xalloc
'
- GNULIB_MODULES_OTHER='
+ GNULIB_MODULES_RUNTIME_OTHER='
gettext-runtime-misc
csharpcomp-script
java
javacomp-script
'
$GNULIB_TOOL --dir=gettext-runtime --lib=libgrt --source-base=gnulib-lib --m4-base=gnulib-m4 --no-libtool --local-dir=gnulib-local \
- --import $GNULIB_MODULES_FOR_SRC $GNULIB_MODULES_OTHER
+ --import $GNULIB_MODULES_RUNTIME_FOR_SRC $GNULIB_MODULES_RUNTIME_OTHER
# In gettext-tools:
- GNULIB_MODULES_FOR_SRC='
+ GNULIB_MODULES_TOOLS_FOR_SRC='
alloca-opt
atexit
backupfile
@@ -149,7 +149,7 @@ if test -n "$GNULIB_TOOL"; then
xvasprintf
'
# Not yet used. Add some files to gettext-tools-misc instead.
- GNULIB_MODULES_FOR_LIBGREP='
+ GNULIB_MODULES_TOOLS_FOR_LIBGREP='
error
exitfail
gettext-h
@@ -159,16 +159,16 @@ if test -n "$GNULIB_TOOL"; then
stdbool
xalloc
'
- GNULIB_MODULES_OTHER='
+ GNULIB_MODULES_TOOLS_OTHER='
gettext-tools-misc
gcj
java
'
$GNULIB_TOOL --dir=gettext-tools --lib=libgettextlib --source-base=gnulib-lib --m4-base=gnulib-m4 --libtool --local-dir=gnulib-local \
- --import $GNULIB_MODULES_FOR_SRC $GNULIB_MODULES_OTHER
+ --import $GNULIB_MODULES_TOOLS_FOR_SRC $GNULIB_MODULES_TOOLS_OTHER
# In gettext-tools/libgettextpo:
# This is a subset of the GNULIB_MODULES_FOR_SRC.
- GNULIB_MODULES_FOR_LIBGETTEXTPO='
+ GNULIB_MODULES_LIBGETTEXTPO='
basename
c-ctype
c-strcase
@@ -199,11 +199,11 @@ if test -n "$GNULIB_TOOL"; then
xstriconv
xvasprintf
'
- GNULIB_MODULES_OTHER='
+ GNULIB_MODULES_LIBGETTEXTPO_OTHER='
gettext-tools-libgettextpo-misc
'
$GNULIB_TOOL --dir=gettext-tools --source-base=libgettextpo --m4-base=libgettextpo/gnulib-m4 --macro-prefix=gtpo --makefile-name=Makefile.gnulib --libtool --local-dir=gnulib-local \
- --import $GNULIB_MODULES_FOR_LIBGETTEXTPO $GNULIB_MODULES_OTHER
+ --import $GNULIB_MODULES_LIBGETTEXTPO $GNULIB_MODULES_LIBGETTEXTPO_OTHER
fi
(cd autoconf-lib-link