diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | autogen.sh | 7 | ||||
| -rw-r--r-- | gettext-runtime/ChangeLog | 7 | ||||
| -rw-r--r-- | gettext-runtime/Makefile.am | 4 | ||||
| -rw-r--r-- | gettext-runtime/configure.ac | 13 |
5 files changed, 32 insertions, 3 deletions
@@ -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. @@ -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 61ab4d5..2e628ea 100644 --- 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 62f1440..d8c1fc4 100644 --- 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 2492eee..f195404 100644 --- 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]) |