[svn] GnuPG - r4547 - branches/STABLE-BRANCH-1-4

[svn author dshaw]

Author: dshaw
Date: 2007-07-18 21:36:24 +0200 (Wed, 18 Jul 2007)
New Revision: 4547

Modified:
   branches/STABLE-BRANCH-1-4/ChangeLog
   branches/STABLE-BRANCH-1-4/configure.ac
Log:
* 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.


Modified: branches/STABLE-BRANCH-1-4/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/ChangeLog	2007-07-18 17:43:14 UTC (rev 4546)
+++ branches/STABLE-BRANCH-1-4/ChangeLog	2007-07-18 19:36:24 UTC (rev 4547)
@@ -1,3 +1,9 @@
+2007-07-18  David Shaw  <dshaw at 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 at jabberwocky.com>
 
 	* configure.ac: AM_PROG_CC_C_O is desired by automake 1.10 to do

Modified: branches/STABLE-BRANCH-1-4/configure.ac
===================================================================
--- branches/STABLE-BRANCH-1-4/configure.ac	2007-07-18 17:43:14 UTC (rev 4546)
+++ branches/STABLE-BRANCH-1-4/configure.ac	2007-07-18 19:36:24 UTC (rev 4547)
@@ -827,17 +827,14 @@
 
 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 @@
   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