New glocale library.

diff --git a/ChangeLog b/ChangeLog
index 6b9ac145c08c2c277a27b67e8ae8b24e9a1e8e01..7d742d60239b906a17d779542bfa8bb6e424bb53 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-31  Bruno Haible  <bruno@clisp.org>
+
+       * autogen.sh: Add commands for gettext-runtime/glocale directory.
+
 2005-07-24  Bruno Haible  <bruno@clisp.org>
 
        Tidy up exported symbols.

diff --git a/autogen.sh b/autogen.sh
index 74f680a2aa90930c641b614a9452b5413d81574c..e8a2f3bc6c129a9702fe6b1d47ee01b88d7d107d 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -43,6 +43,13 @@ automake
  automake
 )
 
+(cd gettext-runtime/glocale
+ aclocal -I m4 -I ../m4 -I ../../gettext-tools/m4 -I ../../m4
+ autoconf
+ autoheader && touch config.h.in
+ automake
+)
+
 cp -p gettext-runtime/ABOUT-NLS gettext-tools/ABOUT-NLS
 
 (cd gettext-tools

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index 61ab4d5f2c6d6d0326975f690843e3c9730c2237..2e628ea68992c885bfb370ac36f5fb9274f8a4cf 100644 (file)
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-31  Bruno Haible  <bruno@clisp.org>
+
+       * glocale: New directory.
+       * configure.ac (SUBDIR_glocale): New variable.
+       * Makefile.am (SUBDIRS): Add SUBDIR_glocale.
+       (DIST_SUBDIRS): Add glocale.
+
 2005-07-26  Bruno Haible  <bruno@clisp.org>
 
        * configure.ac: Move the AM_GNU_GETTEXT invocation early, since it

diff --git a/gettext-runtime/Makefile.am b/gettext-runtime/Makefile.am
index 62f1440593f31b2ad0aba9cd4be88a72a81007fb..d8c1fc456cf1f6cef215e3c122cbeb7403ca5126 100644 (file)
--- a/gettext-runtime/Makefile.am
+++ b/gettext-runtime/Makefile.am
@@ -22,8 +22,8 @@ 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@ src po man m4 tests
-DIST_SUBDIRS = doc intl intl-java intl-csharp lib libasprintf          src po man m4 tests
+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
 
 EXTRA_DIST = BUGS
 

diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index 2492eeece26949470f0baf08c05d407af13ba28f..f19540480c7948059f9058fe1c85264efa506d28 100644 (file)
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -149,7 +149,18 @@ if test "$CXX" = ":"; then
 fi
 AC_SUBST(SUBDIR_libasprintf)
 
-AC_CONFIG_SUBDIRS(libasprintf)
+dnl Determine whether to build glocale.
+AC_ARG_ENABLE(libglocale,
+  [  --disable-libglocale    do not build libglocale],
+  [if test "$enableval" != no; then
+     SUBDIR_glocale=glocale
+   else
+     SUBDIR_glocale=
+   fi
+  ], SUBDIR_glocale=glocale)
+AC_SUBST(SUBDIR_glocale)
+
+AC_CONFIG_SUBDIRS(libasprintf glocale)
 
 AC_CONFIG_FILES([Makefile])