← Back to branch summary

~ubuntu-branches/ubuntu/raring/tracker/raring

« back to all changes in this revision

Viewing changes to aclocal.m4

  • Committer: Package Import Robot
  • Author(s): Michael Biebl
  • Date: 2011-12-16 18:47:47 UTC
  • mfrom: (4.3.22 sid)
  • Revision ID: package-import@ubuntu.com-20111216184747-0cqqd53tx91buc44
Tags: 0.12.9-1
http://bugs.debian.org/652141
* New upstream release.
* Change section of gir1.2-tracker-0.12 to introspection.
* Update homepage URL. (Closes: #652141)

Show diffs side-by-side

added added

removed removed

Lines of Context:
aclocal.m4
226
226
# ----------------------------------
227
227
AC_DEFUN([PKG_PROG_PKG_CONFIG],
228
228
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
229
 
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
 
229
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
 
230
m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
230
231
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
231
232
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
232
233
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
272
273
    pkg_cv_[]$1="$$1"
273
274
 elif test -n "$PKG_CONFIG"; then
274
275
    PKG_CHECK_EXISTS([$3],
275
 
                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
 
276
                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
 
277
                      test "x$?" != "x0" && pkg_failed=yes ],
276
278
                     [pkg_failed=yes])
277
279
 else
278
280
    pkg_failed=untried
320
322
        AC_MSG_RESULT([no])
321
323
        _PKG_SHORT_ERRORS_SUPPORTED
322
324
        if test $_pkg_short_errors_supported = yes; then
323
 
                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
 
325
                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
324
326
        else 
325
 
                $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
 
327
                $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
326
328
        fi
327
329
        # Put the nasty error message in config.log where it belongs
328
330
        echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
335
337
Consider adjusting the PKG_CONFIG_PATH environment variable if you
336
338
installed software in a non-standard prefix.
337
339
 
338
 
_PKG_TEXT])
 
340
_PKG_TEXT])[]dnl
339
341
        ])
340
342
elif test $pkg_failed = untried; then
341
343
        AC_MSG_RESULT([no])
346
348
 
347
349
_PKG_TEXT
348
350
 
349
 
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
 
351
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
350
352
        ])
351
353
else
352
354
        $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
1147
1149
  dnl Find a Python interpreter.  Python versions prior to 2.0 are not
1148
1150
  dnl supported. (2.0 was released on October 16, 2000).
1149
1151
  m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
1150
 
                    [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl
 
1152
                    [python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl
1151
1153
python2.1 python2.0])
1152
1154
 
1153
1155
  m4_if([$1],[],[