← Back to branch summary

~ubuntu-branches/ubuntu/precise/gedit/precise

« back to all changes in this revision

Viewing changes to aclocal.m4

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-04-14 16:41:13 UTC
  • mfrom: (1.1.78 upstream)
  • Revision ID: james.westby@ubuntu.com-20100414164113-0xgl3u73pcs0ngbc
Tags: 2.30.0git20100413-0ubuntu1
* Updating to git snaptshot since 2.30.1 will be after lucid
* debian/patches/90_autoconf.patch:
  - new version update

Show diffs side-by-side

added added

removed removed

Lines of Context:
aclocal.m4
1121
1121
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
1122
1122
# ---------------------------------------------
1123
1123
m4_define([_PKG_CONFIG],
1124
 
[if test -n "$$1"; then
1125
 
    pkg_cv_[]$1="$$1"
1126
 
 elif test -n "$PKG_CONFIG"; then
1127
 
    PKG_CHECK_EXISTS([$3],
1128
 
                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
1129
 
                     [pkg_failed=yes])
1130
 
 else
1131
 
    pkg_failed=untried
 
1124
[if test -n "$PKG_CONFIG"; then
 
1125
    if test -n "$$1"; then
 
1126
        pkg_cv_[]$1="$$1"
 
1127
    else
 
1128
        PKG_CHECK_EXISTS([$3],
 
1129
                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
 
1130
                         [pkg_failed=yes])
 
1131
    fi
 
1132
else
 
1133
        pkg_failed=untried
1132
1134
fi[]dnl
1133
1135
])# _PKG_CONFIG
1134
1136
 
1172
1174
if test $pkg_failed = yes; then
1173
1175
        _PKG_SHORT_ERRORS_SUPPORTED
1174
1176
        if test $_pkg_short_errors_supported = yes; then
1175
 
                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
 
1177
                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
1176
1178
        else 
1177
 
                $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
 
1179
                $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
1178
1180
        fi
1179
1181
        # Put the nasty error message in config.log where it belongs
1180
1182
        echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD