glocale is no longer part of gettext.

diff --git a/ChangeLog b/ChangeLog
index 7d742d60239b906a17d779542bfa8bb6e424bb53..f324c222555d4ab0c94332dfd3df20deccb77c41 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-28  Bruno Haible  <bruno@clisp.org>
+
+       * autogen.sh: Remove code for gettext-runtime/glocale.
+
 2005-07-31  Bruno Haible  <bruno@clisp.org>
 
        * autogen.sh: Add commands for gettext-runtime/glocale directory.

diff --git a/autogen.sh b/autogen.sh
index e8a2f3bc6c129a9702fe6b1d47ee01b88d7d107d..74f680a2aa90930c641b614a9452b5413d81574c 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -43,13 +43,6 @@ 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 3f6e21b6e27dbcdff4661ad229ed3136f2147a75..6833920c1067a60414fae2127663730a2fedc0b2 100644 (file)
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,13 @@
+2008-08-28  Bruno Haible  <bruno@clisp.org>
+
+       * glocale: Remove directory, moved to separate project.
+       * configure.ac (--disable-libglocale): Remove option.
+       (SUBDIR_glocale): Remove variable.
+       (ENABLE_GLOCALE): Remove conditional.
+       (AC_CONFIG_SUBDIRS): Remove glocale.
+       * Makefile.am (SUBDIR_glocale): Remove variable.
+       (SUBDIRS): Remove $(SUBDIR_glocale).
+
 2005-08-13  Bruno Haible  <bruno@clisp.org>
 
        New configure options --disable-java, --disable-native-java.

diff --git a/gettext-runtime/Makefile.am b/gettext-runtime/Makefile.am
index 62477100d845aebde5afc562edafe98774cade38..9904a34ba16c09d201b80c4ec251d00b7714211c 100644 (file)
--- a/gettext-runtime/Makefile.am
+++ b/gettext-runtime/Makefile.am
@@ -29,12 +29,7 @@ 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
+SUBDIRS = doc intl intl-java intl-csharp lib $(SUBDIR_libasprintf) src po man m4 tests
 
 EXTRA_DIST = BUGS
 

diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index 7ab4f823192b55837d5db5367299c6660e3ea370..f98f32a0bec2b350911df1618d64454dbb83e502 100644 (file)
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -151,18 +151,7 @@ if test "$CXX" = ":"; then
 fi
 AM_CONDITIONAL([ENABLE_LIBASPRINTF], [test -n "$SUBDIR_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)
-AM_CONDITIONAL([ENABLE_GLOCALE], [test -n "$SUBDIR_glocale"])
-
-AC_CONFIG_SUBDIRS(libasprintf glocale)
+AC_CONFIG_SUBDIRS(libasprintf)
 
 AC_CONFIG_FILES([Makefile])