← Back to branch summary

~ubuntu-branches/ubuntu/vivid/aptitude/vivid

« back to all changes in this revision

Viewing changes to aclocal.m4

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2011-06-22 12:32:56 UTC
  • mfrom: (1.8.6 sid)
  • Revision ID: james.westby@ubuntu.com-20110622123256-8aox9w9ch3x72dci
Tags: 0.6.4-1ubuntu1
* Merge from debian unstable.  Remaining changes:
  - debian/05aptitude: never autoremove kernels
  - drop aptitude-doc to Suggests
  - 03_branding.dpatch: ubuntu branding
  - 04_changelog.dpatch: take changelogs from changelogs.ubuntu.com
  - 09_ubuntu_fortify_source.dpatch: Suppress a number of warnings (turned
    into errors by -Werror) triggered by Ubuntu's default of
    -D_FORTIFY_SOURCE=2.
  - 11_ubuntu_uses_sudo.dpatch: fix status line of 'Become root' menu entry
    to not refer to su.
  - 12_point_manpage_to_doc_package.dpatch: point Finnish manpage to the
    correct place for further info
  - 14_html2text_preferred.dpatch: switch back to html2text in favor of
    elinks, since html2text is in main and elinks isn't.
* dropped 01_intltool_update.dpatch
* updated 15_ftbfs_new_apt

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'.])])
21
21
 
22
22
# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
 
23
# serial 1 (pkg-config-0.24)
23
24
# 
24
25
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
25
26
#
47
48
AC_DEFUN([PKG_PROG_PKG_CONFIG],
48
49
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
49
50
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
50
 
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
 
51
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
 
52
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
 
53
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
 
54
 
51
55
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
52
56
        AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
53
57
fi
60
64
                AC_MSG_RESULT([no])
61
65
                PKG_CONFIG=""
62
66
        fi
63
 
                
64
67
fi[]dnl
65
68
])# PKG_PROG_PKG_CONFIG
66
69
 
69
72
# Check to see whether a particular set of modules exists.  Similar
70
73
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
71
74
#
72
 
#
73
 
# Similar to PKG_CHECK_MODULES, make sure that the first instance of
74
 
# this or PKG_CHECK_MODULES is called, or make sure to call
75
 
# PKG_CHECK_EXISTS manually
 
75
# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
 
76
# only at the first occurence in configure.ac, so if the first place
 
77
# it's called might be skipped (such as if it is within an "if", you
 
78
# have to call PKG_CHECK_EXISTS manually
76
79
# --------------------------------------------------------------
77
80
AC_DEFUN([PKG_CHECK_EXISTS],
78
81
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
79
82
if test -n "$PKG_CONFIG" && \
80
83
    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
81
 
  m4_ifval([$2], [$2], [:])
 
84
  m4_default([$2], [:])
82
85
m4_ifvaln([$3], [else
83
86
  $3])dnl
84
87
fi])
85
88
 
86
 
 
87
89
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
88
90
# ---------------------------------------------
89
91
m4_define([_PKG_CONFIG],
90
 
[if test -n "$PKG_CONFIG"; then
91
 
    if test -n "$$1"; then
92
 
        pkg_cv_[]$1="$$1"
93
 
    else
94
 
        PKG_CHECK_EXISTS([$3],
95
 
                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
96
 
                         [pkg_failed=yes])
97
 
    fi
98
 
else
99
 
        pkg_failed=untried
 
92
[if test -n "$$1"; then
 
93
    pkg_cv_[]$1="$$1"
 
94
 elif test -n "$PKG_CONFIG"; then
 
95
    PKG_CHECK_EXISTS([$3],
 
96
                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
 
97
                     [pkg_failed=yes])
 
98
 else
 
99
    pkg_failed=untried
100
100
fi[]dnl
101
101
])# _PKG_CONFIG
102
102
 
138
138
See the pkg-config man page for more details.])
139
139
 
140
140
if test $pkg_failed = yes; then
 
141
        AC_MSG_RESULT([no])
141
142
        _PKG_SHORT_ERRORS_SUPPORTED
142
143
        if test $_pkg_short_errors_supported = yes; then
143
 
                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
 
144
                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
144
145
        else 
145
 
                $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
 
146
                $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
146
147
        fi
147
148
        # Put the nasty error message in config.log where it belongs
148
149
        echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
149
150
 
150
 
        ifelse([$4], , [AC_MSG_ERROR(dnl
 
151
        m4_default([$4], [AC_MSG_ERROR(
151
152
[Package requirements ($2) were not met:
152
153
 
153
154
$$1_PKG_ERRORS
155
156
Consider adjusting the PKG_CONFIG_PATH environment variable if you
156
157
installed software in a non-standard prefix.
157
158
 
158
 
_PKG_TEXT
159
 
])],
160
 
                [AC_MSG_RESULT([no])
161
 
                $4])
 
159
_PKG_TEXT])[]dnl
 
160
        ])
162
161
elif test $pkg_failed = untried; then
163
 
        ifelse([$4], , [AC_MSG_FAILURE(dnl
 
162
        AC_MSG_RESULT([no])
 
163
        m4_default([$4], [AC_MSG_FAILURE(
164
164
[The pkg-config script could not be found or is too old.  Make sure it
165
165
is in your PATH or set the PKG_CONFIG environment variable to the full
166
166
path to pkg-config.
167
167
 
168
168
_PKG_TEXT
169
169
 
170
 
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
171
 
                [$4])
 
170
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
 
171
        ])
172
172
else
173
173
        $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
174
174
        $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
175
175
        AC_MSG_RESULT([yes])
176
 
        ifelse([$3], , :, [$3])
 
176
        $3
177
177
fi[]dnl
178
178
])# PKG_CHECK_MODULES
179
179