From eeeb5819eee5a60efadd1dc4f6f134eb996bc9cd Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Mon, 7 Nov 2011 22:35:41 +0000 Subject: [PATCH] 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 --- src/configure.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/configure.in b/src/configure.in index 9de430f267..e5de90335d 100644 --- 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 -- 2.47.3