← Back to branch summary

~ubuntu-branches/debian/wheezy/idjc/wheezy

« back to all changes in this revision

Viewing changes to aclocal.m4

  • Committer: Package Import Robot
  • Author(s): Alessio Treglia
  • Date: 2011-12-03 16:33:59 UTC
  • mfrom: (0.2.6)
  • Revision ID: package-import@ubuntu.com-20111203163359-dq5fy9i756jpoy29
Tags: 0.8.6-1
* New upstream release.
* debian/control:
  - Wrap and sort.
  - Build-depend on autopoint.
  - Drop autotools-dev, unnecessary.
* Drop the whole patch set, none of them is still needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
aclocal.m4
13
13
 
14
14
m4_ifndef([AC_AUTOCONF_VERSION],
15
15
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
16
 
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
17
 
[m4_warning([this file was generated for autoconf 2.65.
 
16
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
 
17
[m4_warning([this file was generated for autoconf 2.68.
18
18
You have another version of autoconf.  It may work, but is not guaranteed to.
19
19
If you have problems, you may need to regenerate the build system entirely.
20
20
To do so, use the procedure documented by the package, typically `autoreconf'.])])
47
47
# ----------------------------------
48
48
AC_DEFUN([PKG_PROG_PKG_CONFIG],
49
49
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
50
 
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
 
50
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
 
51
m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
51
52
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
52
53
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
53
54
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
93
94
    pkg_cv_[]$1="$$1"
94
95
 elif test -n "$PKG_CONFIG"; then
95
96
    PKG_CHECK_EXISTS([$3],
96
 
                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
 
97
                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
 
98
                      test "x$?" != "x0" && pkg_failed=yes ],
97
99
                     [pkg_failed=yes])
98
100
 else
99
101
    pkg_failed=untried
141
143
        AC_MSG_RESULT([no])
142
144
        _PKG_SHORT_ERRORS_SUPPORTED
143
145
        if test $_pkg_short_errors_supported = yes; then
144
 
                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
 
146
                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
145
147
        else 
146
 
                $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
 
148
                $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
147
149
        fi
148
150
        # Put the nasty error message in config.log where it belongs
149
151
        echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
167
169
 
168
170
_PKG_TEXT
169
171
 
170
 
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
 
172
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
171
173
        ])
172
174
else
173
175
        $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
1376
1378
AC_SUBST([am__untar])
1377
1379
]) # _AM_PROG_TAR
1378
1380
 
 
1381
m4_include([m4/gettext.m4])
 
1382
m4_include([m4/iconv.m4])
 
1383
m4_include([m4/intlmacosx.m4])
 
1384
m4_include([m4/lib-ld.m4])
 
1385
m4_include([m4/lib-link.m4])
 
1386
m4_include([m4/lib-prefix.m4])
 
1387
m4_include([m4/nls.m4])
 
1388
m4_include([m4/po.m4])
 
1389
m4_include([m4/progtest.m4])