From: Art Cancro <ajc@citadel.org>
Date: Wed, 21 Dec 2005 15:24:39 +0000 (+0000)
Subject: * configure.in: use different variable names for each AC_CHECK_PROG macro,
X-Git-Tag: v7.86~4358
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=374b2e41d61ea0e8765ade5bef6f5b184fb410e3;p=citadel.git

* configure.in: use different variable names for each AC_CHECK_PROG macro,
  because autoconf will see the same variable name as used before, pull some
  value from cache, and assume it knows the answer.  This causes NLS to be
  enabled on systems that have, for example, xgettext but not msgfmt (such as
  Mandrake).  Fixed.
---

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index aaf1f5331..c06d91b62 100644
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,5 +1,12 @@
 $Id$
 
+Wed Dec 21 10:22:51 EST 2005 ajc
+* configure.in: use different variable names for each AC_CHECK_PROG macro,
+  because autoconf will see the same variable name as used before, pull some
+  value from cache, and assume it knows the answer.  This causes NLS to be
+  enabled on systems that have, for example, xgettext but not msgfmt (such as
+  Mandrake).  Fixed.
+
 Wed Dec 21 10:08:18 EST 2005 ajc
 * Makefile.in: target 'distclean' - do not remove po/Makefile.in 
 
diff --git a/webcit/configure.in b/webcit/configure.in
index de39baae7..07b75866f 100644
--- a/webcit/configure.in
+++ b/webcit/configure.in
@@ -317,21 +317,25 @@ if test "$ok_nls" != "no"; then
 			exit(0);
 		}
 	],
-		ok_nls=yes,
-		ok_nls=no
+		ok_uselocale=yes,
+		ok_uselocale=no
 	)
+	ok_nls=$ok_uselocale
 fi
 
 if test "$ok_nls" != "no"; then
-	AC_CHECK_PROG(ok_nls, xgettext, yes, no)
+	AC_CHECK_PROG(ok_xgettext, xgettext, yes, no)
+	ok_nls=$ok_xgettext
 fi
 
 if test "$ok_nls" != "no"; then
-	AC_CHECK_PROG(ok_nls, msgmerge, yes, no)
+	AC_CHECK_PROG(ok_msgmerge, msgmerge, yes, no)
+	ok_nls=$ok_msgmerge
 fi
 
 if test "$ok_nls" != "no"; then
-	AC_CHECK_PROG(ok_nls, msgfmt, yes, no)
+	AC_CHECK_PROG(ok_msgfmt, msgfmt, yes, no)
+	ok_nls=$ok_msgfmt
 fi
 
 if test "$ok_nls" != "no"; then