← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nfs-utils/saucy-proposed

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Luk Claes
  • Date: 2011-07-09 16:28:32 UTC
  • mfrom: (1.2.20 upstream)
  • mto: (71.1.1 ubuntu)
  • mto: This revision was merged to the branch mainline in revision 41.
  • 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:
configure.ac
1
1
dnl Process this file with autoconf to produce a configure script.
2
2
dnl
3
 
AC_INIT([linux nfs-utils],[1.2.3],[linux-nfs@vger.kernel.org],[nfs-utils])
 
3
AC_INIT([linux nfs-utils],[1.2.4],[linux-nfs@vger.kernel.org],[nfs-utils])
4
4
AC_CANONICAL_BUILD([])
5
5
AC_CANONICAL_HOST([])
6
6
AC_CONFIG_MACRO_DIR(aclocal)
132
132
        enable_mount=$enableval,
133
133
        enable_mount=yes)
134
134
        AM_CONDITIONAL(CONFIG_MOUNT, [test "$enable_mount" = "yes"])
 
135
 
 
136
if test "$enable_mount" = yes; then
 
137
        AC_ARG_ENABLE(libmount-mount,
 
138
                [AC_HELP_STRING([--enable-libmount-mount],
 
139
                                [Link mount.nfs with libmount (EXPERIMENTAL)])],
 
140
                enable_libmount=yes,
 
141
                enable_libmount=no)
 
142
fi
 
143
 
135
144
AC_ARG_ENABLE(tirpc,
136
145
        [AC_HELP_STRING([--enable-tirpc],
137
146
                        [enable use of TI-RPC @<:@default=yes@:>@])],
138
147
        enable_tirpc=$enableval,
139
 
        enable_tirpc='yes')
 
148
        enable_tirpc='')
140
149
AC_ARG_ENABLE(ipv6,
141
150
        [AC_HELP_STRING([--enable-ipv6],
142
151
                        [enable support for IPv6 @<:@default=no@:>@])],
247
256
  dnl check for nfsidmap libraries and headers
248
257
  AC_LIBNFSIDMAP
249
258
 
 
259
  dnl enable nfsidmap when its support by libnfsidmap
 
260
  AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$enable_nfsidmap" = "yes"])
 
261
 
 
262
  dnl check for the keyutils libraries and headers
 
263
  AC_KEYUTILS
 
264
 
250
265
  dnl librpcsecgss already has a dependency on libgssapi,
251
266
  dnl but we need to make sure we get the right version
252
267
  if test "$enable_gss" = yes; then
279
294
AC_SUBST(LIBBSD)
280
295
AC_SUBST(LIBBLKID)
281
296
 
 
297
if test "$enable_libmount" != no; then
 
298
   AC_CHECK_LIB(mount, mnt_context_do_mount, [LIBMOUNT="-lmount"], AC_MSG_ERROR([libmount needed]))
 
299
   AC_CHECK_HEADER(libmount/libmount.h, , AC_MSG_ERROR([Cannot find libmount header file libmount/libmount.h]))
 
300
fi
 
301
AM_CONDITIONAL(CONFIG_LIBMOUNT, [test "$enable_libmount" = "yes"])
 
302
AC_SUBST(LIBMOUNT)
 
303
 
282
304
if test "$enable_gss" = yes; then
283
305
  dnl 'gss' requires getnameinfo - at least for gssd_proc.c
284
306
  AC_CHECK_FUNC([getnameinfo], , [AC_MSG_ERROR([GSSAPI support requires 'getnameinfo' function])])
435
457
        utils/mountd/Makefile
436
458
        utils/nfsd/Makefile
437
459
        utils/nfsstat/Makefile
 
460
        utils/nfsidmap/Makefile
438
461
        utils/showmount/Makefile
439
462
        utils/statd/Makefile
440
463
        tests/Makefile