* configure.ac: It seems that AM_GNU_GETTEXT doesn't like being run
authorDavid Shaw <dshaw@jabberwocky.com>
Wed, 18 Jul 2007 19:36:24 +0000 (19:36 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Wed, 18 Jul 2007 19:36:24 +0000 (19:36 +0000)
conditionally and it confuses the includes when doing later type
checks.  This is bug#810.

ChangeLog
configure.ac

index 1f18632..fd5406c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-18  David Shaw  <dshaw@jabberwocky.com>
+
+       * configure.ac: It seems that AM_GNU_GETTEXT doesn't like being
+       run conditionally and it confuses the includes when doing later
+       type checks.  This is bug#810.
+
 2007-07-08  David Shaw  <dshaw@jabberwocky.com>
 
        * configure.ac: AM_PROG_CC_C_O is desired by automake 1.10 to do
index 02f82d7..89664de 100644 (file)
@@ -827,17 +827,14 @@ AC_SUBST(MPI_OPT_FLAGS)
 
 dnl Checks for libraries.
 
-AM_GNU_GETTEXT_VERSION(0.14.1)
 if test "$try_gettext" = yes; then
-  AM_GNU_GETTEXT(,[need-ngettext])
-
   # gettext requires some extra checks.  These really should be part of
   # the basic AM_GNU_GETTEXT macro.  TODO: move other gettext-specific
   # function checks to here.
 
   AC_CHECK_FUNCS(strchr)
 else
-  USE_NLS=no
+  enable_nls=no
   USE_INCLUDED_LIBINTL=no
   BUILD_INCLUDED_LIBINTL=no
   AC_SUBST(USE_NLS)
@@ -846,6 +843,9 @@ else
   AM_PO_SUBDIRS
 fi
 
+AM_GNU_GETTEXT_VERSION(0.14.1)
+AM_GNU_GETTEXT(,[need-ngettext])
+
 if test "$try_extensions" = yes || test x"$card_support" = xyes ; then
   if test "$need_dlopen" = yes; then
     _dl_save_libs=$LIBS