From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sat, 27 Mar 2010 18:32:07 +0000 (-0700)
Subject: configure.ac: Define DEPENDS_ON_LIBINTL if LIBINTL is nonempty.
X-Git-Tag: v0.7.5~57
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c123de464dea801978314665b174f735a873378d;p=pspp-builds.git

configure.ac: Define DEPENDS_ON_LIBINTL if LIBINTL is nonempty.

This avoids a collision between the gnulib and libintl printf wrappers.
See http://permalink.gmane.org/gmane.comp.lib.gnulib.bugs/21139 for
more information.

Thanks to Michel Boaventura for reporting the problem and to Bruno Haible
for the fix.
---

diff --git a/configure.ac b/configure.ac
index 2ca57b74..5ad33fee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,9 @@ dnl Internationalization macros.
 AC_PROVIDE([AM_PO_SUBDIRS])	# PSPP provides its own po/ support.
 AM_GNU_GETTEXT([external], [need-ngettext])
 AM_GNU_GETTEXT_VERSION([0.17])
+if test -n "$LIBINTL"; then
+  AC_DEFINE([DEPENDS_ON_LIBINTL], [1], 
+    [Define to 1 if libintl is a separate library, not integrated into libc])
 fi
 
 dnl Checks for libraries.