← Back to branch summary

~ubuntu-branches/debian/stretch/nfs-utils/stretch

« back to all changes in this revision

Viewing changes to aclocal.m4

  • Committer: Bazaar Package Importer
  • Author(s): Luk Claes
  • Date: 2011-07-09 16:28:32 UTC
  • mfrom: (1.2.20 upstream)
  • Revision ID: james.westby@ubuntu.com-20110709162832-ovaehe77pm3hyy35
Tags: 1:1.2.4-1
http://bugs.debian.org/633155
http://bugs.debian.org/619877
http://bugs.debian.org/626478
* New upstream version
  - Fix host_reliable_addrinfo (Closes: #633155)
  - Allow multiple RPC listeners to share listener port number
  (Closes: #619877)
  - Add --enable-libmount-mount (Closes: #626478)
  - 12-svcgssd-document-n-option.patch applied upstream
  - Refresh 19-exports.man-Fix-comment-syntax.patch
  - 21-anticipate-RLIMIT_FSIZE.patch applied upstream
  - Add nfsidmap binary and manpage
  - Use autoreconf to avoid build failure

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],
136
138
See the pkg-config man page for more details.])
137
139
 
138
140
if test $pkg_failed = yes; then
 
141
        AC_MSG_RESULT([no])
139
142
        _PKG_SHORT_ERRORS_SUPPORTED
140
143
        if test $_pkg_short_errors_supported = yes; then
141
144
                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
145
148
        # Put the nasty error message in config.log where it belongs
146
149
        echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
147
150
 
148
 
        ifelse([$4], , [AC_MSG_ERROR(dnl
 
151
        m4_default([$4], [AC_MSG_ERROR(
149
152
[Package requirements ($2) were not met:
150
153
 
151
154
$$1_PKG_ERRORS
153
156
Consider adjusting the PKG_CONFIG_PATH environment variable if you
154
157
installed software in a non-standard prefix.
155
158
 
156
 
_PKG_TEXT
157
 
])],
158
 
                [AC_MSG_RESULT([no])
159
 
                $4])
 
159
_PKG_TEXT])
 
160
        ])
160
161
elif test $pkg_failed = untried; then
161
 
        ifelse([$4], , [AC_MSG_FAILURE(dnl
 
162
        AC_MSG_RESULT([no])
 
163
        m4_default([$4], [AC_MSG_FAILURE(
162
164
[The pkg-config script could not be found or is too old.  Make sure it
163
165
is in your PATH or set the PKG_CONFIG environment variable to the full
164
166
path to pkg-config.
165
167
 
166
168
_PKG_TEXT
167
169
 
168
 
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
169
 
                [$4])
 
170
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
 
171
        ])
170
172
else
171
173
        $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
172
174
        $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
173
175
        AC_MSG_RESULT([yes])
174
 
        ifelse([$3], , :, [$3])
 
176
        $3
175
177
fi[]dnl
176
178
])# PKG_CHECK_MODULES
177
179
 
1183
1185
m4_include([aclocal/bsdsignals.m4])
1184
1186
m4_include([aclocal/ipv6.m4])
1185
1187
m4_include([aclocal/kerberos5.m4])
 
1188
m4_include([aclocal/keyutils.m4])
1186
1189
m4_include([aclocal/libblkid.m4])
1187
1190
m4_include([aclocal/libcap.m4])
1188
1191
m4_include([aclocal/libevent.m4])