From 2aa497521d504fbb61a0344e0bb2a91aae4f32a1 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Wed, 18 Jul 2007 19:36:24 +0000 Subject: * 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. --- ChangeLog | 6 ++++++ configure.ac | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f1863202..fd5406ce1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-07-18 David Shaw + + * 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 * configure.ac: AM_PROG_CC_C_O is desired by automake 1.10 to do diff --git a/configure.ac b/configure.ac index 02f82d78b..89664deca 100644 --- a/configure.ac +++ b/configure.ac @@ -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 -- cgit v1.2.3