pull up r25425 from trunk

 ------------------------------------------------------------------------
 r25425 | ghudson | 2011-10-31 23:49:16 -0400 (Mon, 31 Oct 2011) | 10 lines

 ticket: 6997
 target_version: 1.10
 tags: pullup

 Conditionalize po subdir on msgfmt, not dgetext

 The presence of dgettext in libc or libintl doesn't imply that msgfmt
 is installed, so conditionalize building the po subdir on whether
 msgfmt is installed.

ticket: 6997
version_fixed: 1.10
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-10@25451 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/configure.in b/src/configure.in
index 9de430f26752d17c97d7d6d7a7f0d88cbe1acc07..e5de90335de2f631c0813106e249875e557046fc 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -66,12 +66,16 @@ LIBUTIL=-lutil
 ])
 AC_SUBST(LIBUTIL)
 
-po=
 AC_CHECK_HEADER(libintl.h, [
        AC_SEARCH_LIBS(dgettext, intl, [
-               po=po
                AC_DEFINE(ENABLE_NLS, 1,
                        [Define if translation functions should be used.])])])
+
+AC_CHECK_PROG(MSGFMT,msgfmt,msgfmt)
+po=
+if test x"$MSGFMT" != x; then
+       po=po
+fi
 AC_SUBST(po)
 
 # for kdc