Get rid of the need to define DIST_SUBDIRS manually.

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index 2e628ea68992c885bfb370ac36f5fb9274f8a4cf..5ff94dfffca6484ef0c208aafbed2f115f682065 100644 (file)
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,13 @@
+2005-08-10  Bruno Haible  <bruno@clisp.org>
+
+       * configure.ac (SUBDIR_libasprintf, SUBDIR_glocale): Remove AC_SUBSTs.
+       (ENABLE_LIBASPRINTF, ENABLE_GLOCALE): New automake conditionals.
+       * Makefile.am (SUBDIR_libasprintf, SUBDIR_glocale): New variables.
+       (SUBDIRS): Use them.
+       (DIST_SUBDIRS): Remove variable. Automake computes it correctly through
+       the conditionals.
+       Suggested by Stepan Kasal <kasal@ucw.cz>.
+
 2005-07-31  Bruno Haible  <bruno@clisp.org>
 
        * glocale: New directory.

diff --git a/gettext-runtime/Makefile.am b/gettext-runtime/Makefile.am
index d8c1fc456cf1f6cef215e3c122cbeb7403ca5126..62477100d845aebde5afc562edafe98774cade38 100644 (file)
--- a/gettext-runtime/Makefile.am
+++ b/gettext-runtime/Makefile.am
@@ -22,8 +22,19 @@ ACLOCAL_AMFLAGS = -I m4 -I ../gettext-tools/m4 -I ../autoconf-lib-link/m4 -I ../
 
 MAKEINFO = env LANG= LC_MESSAGES= LC_ALL= LANGUAGE= @MAKEINFO@
 
-SUBDIRS =      doc intl intl-java intl-csharp lib @SUBDIR_libasprintf@ @SUBDIR_glocale@ src po man m4 tests
-DIST_SUBDIRS = doc intl intl-java intl-csharp lib libasprintf          glocale          src po man m4 tests
+# The list of subdirectories depends on whether --disable-libasprintf or
+# --disable-glocale was specified.
+if ENABLE_LIBASPRINTF
+SUBDIR_libasprintf = libasprintf
+else
+SUBDIR_libasprintf =
+endif
+if ENABLE_GLOCALE
+SUBDIR_glocale = glocale
+else
+SUBDIR_glocale =
+endif
+SUBDIRS = doc intl intl-java intl-csharp lib $(SUBDIR_libasprintf) $(SUBDIR_glocale) src po man m4 tests
 
 EXTRA_DIST = BUGS
 

diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index f19540480c7948059f9058fe1c85264efa506d28..ee80c77e6ee9a7dd81122c9d286bd0d5f201a22c 100644 (file)
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -147,7 +147,7 @@ AC_ARG_ENABLE(libasprintf,
 if test "$CXX" = ":"; then
   SUBDIR_libasprintf=
 fi
-AC_SUBST(SUBDIR_libasprintf)
+AM_CONDITIONAL([ENABLE_LIBASPRINTF], [test -n "$SUBDIR_libasprintf"])
 
 dnl Determine whether to build glocale.
 AC_ARG_ENABLE(libglocale,
@@ -158,7 +158,7 @@ AC_ARG_ENABLE(libglocale,
      SUBDIR_glocale=
    fi
   ], SUBDIR_glocale=glocale)
-AC_SUBST(SUBDIR_glocale)
+AM_CONDITIONAL([ENABLE_GLOCALE], [test -n "$SUBDIR_glocale"])
 
 AC_CONFIG_SUBDIRS(libasprintf glocale)