1.1 --- a/aclocal.m4 Wed Apr 16 12:43:52 2008 +0000
1.2 +++ b/aclocal.m4 Wed Jun 03 03:59:22 2009 +0000
1.5 glib_DEFUN([GLIB_WITH_NLS],
1.6 dnl NLS is obligatory
1.7 - [AC_REQUIRE([AC_CANONICAL_HOST])dnl
1.12 gt_cv_have_gettext=no
1.14 AC_CHECK_FUNCS(dcgettext)
1.16 AC_MSG_CHECKING([if msgfmt accepts -c])
1.17 - GLIB_RUN_PROG([msgfmt -c -o /dev/null],[
1.18 + GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
1.21 "Content-Type: text/plain; charset=UTF-8\n"
1.22 @@ -538,16 +537,14 @@
1.23 # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
1.24 # ---------------------------------------------
1.25 m4_define([_PKG_CONFIG],
1.26 -[if test -n "$PKG_CONFIG"; then
1.27 - if test -n "$$1"; then
1.30 - PKG_CHECK_EXISTS([$3],
1.31 - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
1.35 - pkg_failed=untried
1.36 +[if test -n "$$1"; then
1.38 + elif test -n "$PKG_CONFIG"; then
1.39 + PKG_CHECK_EXISTS([$3],
1.40 + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
1.43 + pkg_failed=untried
1.48 if test $pkg_failed = yes; then
1.49 _PKG_SHORT_ERRORS_SUPPORTED
1.50 if test $_pkg_short_errors_supported = yes; then
1.51 - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
1.52 + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
1.54 - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
1.55 + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
1.57 # Put the nasty error message in config.log where it belongs
1.58 echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
1.59 @@ -1550,3 +1547,4 @@
1.60 AC_SUBST([am__untar])
1.63 +m4_include([acinclude.m4])