filename | aclocal.m4 |
changeset | 923:13ac59a786f4 |
prev | 658:f5926310bfbe |
author | nkeynes |
date | Thu Feb 23 15:24:47 2012 +1000 (12 years ago) |
permissions | -rw-r--r-- |
last change | Check for existence of glDrawBuffer (assuming that glReadBuffer will follow). Note only need to guard the common code in gl_fbo.c |
file | annotate | diff | log | raw |
1.1 --- a/aclocal.m4 Wed Apr 16 12:43:52 2008 +00001.2 +++ b/aclocal.m4 Thu Feb 23 15:24:47 2012 +10001.3 @@ -114,8 +114,7 @@1.4 #-----------------1.5 glib_DEFUN([GLIB_WITH_NLS],1.6 dnl NLS is obligatory1.7 - [AC_REQUIRE([AC_CANONICAL_HOST])dnl1.8 - USE_NLS=yes1.9 + [USE_NLS=yes1.10 AC_SUBST(USE_NLS)1.12 gt_cv_have_gettext=no1.13 @@ -221,7 +220,7 @@1.14 AC_CHECK_FUNCS(dcgettext)1.15 MSGFMT_OPTS=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.19 msgid ""1.20 msgstr ""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"; then1.27 - if test -n "$$1"; then1.28 - pkg_cv_[]$1="$$1"1.29 - else1.30 - PKG_CHECK_EXISTS([$3],1.31 - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],1.32 - [pkg_failed=yes])1.33 - fi1.34 -else1.35 - pkg_failed=untried1.36 +[if test -n "$$1"; then1.37 + pkg_cv_[]$1="$$1"1.38 + elif test -n "$PKG_CONFIG"; then1.39 + PKG_CHECK_EXISTS([$3],1.40 + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],1.41 + [pkg_failed=yes])1.42 + else1.43 + pkg_failed=untried1.44 fi[]dnl1.45 ])# _PKG_CONFIG1.47 @@ -591,9 +588,9 @@1.48 if test $pkg_failed = yes; then1.49 _PKG_SHORT_ERRORS_SUPPORTED1.50 if test $_pkg_short_errors_supported = yes; then1.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.53 else1.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.56 fi1.57 # Put the nasty error message in config.log where it belongs1.58 echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD1.59 @@ -1550,3 +1547,4 @@1.60 AC_SUBST([am__untar])1.61 ]) # _AM_PROG_TAR1.63 +m4_include([acinclude.m4])
.