X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=configure;h=ee0f532588e6ba91e70c0d6427dc922d692a56d9;hp=0f561fff42014bdd002f9db621823b229a999386;hb=9d7dd927aa757b74cc098d7a2f5dc0066f9e0717;hpb=bec68598de8fafacf185fa1676e6fba89d903d13 diff --git a/configure b/configure index 0f561ff..ee0f532 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for linux nfs-utils 1.1.0-rc1. +# Generated by GNU Autoconf 2.61 for linux nfs-utils 1.1.0. # # Report bugs to . # @@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='linux nfs-utils' PACKAGE_TARNAME='nfs-utils' -PACKAGE_VERSION='1.1.0-rc1' -PACKAGE_STRING='linux nfs-utils 1.1.0-rc1' +PACKAGE_VERSION='1.1.0' +PACKAGE_STRING='linux nfs-utils 1.1.0' PACKAGE_BUGREPORT='nfs@lists.sf.net' ac_default_prefix=/usr @@ -856,8 +856,6 @@ CONFIG_GSS_TRUE CONFIG_GSS_FALSE kprefix secure_statd -CONFIG_RQUOTAD_TRUE -CONFIG_RQUOTAD_FALSE RPCGEN_PATH CONFIG_RPCGEN_TRUE CONFIG_RPCGEN_FALSE @@ -1450,7 +1448,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures linux nfs-utils 1.1.0-rc1 to adapt to many kinds of systems. +\`configure' configures linux nfs-utils 1.1.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1520,7 +1518,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of linux nfs-utils 1.1.0-rc1:";; + short | recursive ) echo "Configuration of linux nfs-utils 1.1.0:";; esac cat <<\_ACEOF @@ -1534,7 +1532,6 @@ Optional Features: --enable-gss enable support for rpcsec_gss [default=yes] --enable-kprefix install progs as rpc.knfsd etc --enable-secure-statd Only lockd can use statd (security) - --enable-rquotad enable rquotad [default=yes] --without-uuid Exclude uuid support and so avoid possibly buggy libblkid --enable-mount Create mount.nfs and don't use the util-linux @@ -1654,7 +1651,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -linux nfs-utils configure 1.1.0-rc1 +linux nfs-utils configure 1.1.0 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1668,7 +1665,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by linux nfs-utils $as_me 1.1.0-rc1, which was +It was created by linux nfs-utils $as_me 1.1.0, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2442,7 +2439,7 @@ fi # Define the identity of the package. PACKAGE='nfs-utils' - VERSION='1.1.0-rc1' + VERSION='1.1.0' cat >>confdefs.h <<_ACEOF @@ -2762,26 +2759,6 @@ _ACEOF fi -# Check whether --enable-rquotad was given. -if test "${enable_rquotad+set}" = set; then - enableval=$enable_rquotad; enable_rquotad=$enableval -else - enable_rquotad=yes -fi - - if test "$enable_rquotad" = yes; then - RQUOTAD=rquotad - else - RQUOTAD= - fi - if test "$enable_rquotad" = "yes"; then - CONFIG_RQUOTAD_TRUE= - CONFIG_RQUOTAD_FALSE='#' -else - CONFIG_RQUOTAD_TRUE='#' - CONFIG_RQUOTAD_FALSE= -fi - # Check whether --with-rpcgen was given. if test "${with_rpcgen+set}" = set; then @@ -2808,16 +2785,11 @@ fi # Check whether --enable-uuid was given. if test "${enable_uuid+set}" = set; then - enableval=$enable_uuid; if test "$enableval" = "yes" ; then use_blkid=1; else use_blkid=0; fi + enableval=$enable_uuid; if test "$enableval" = "yes" ; then choose_blkid=yes; else choose_blkid=no; fi else - use_blkid=1 + choose_blkid=default fi - -cat >>confdefs.h <<_ACEOF -#define USE_BLKID $use_blkid -_ACEOF - # Check whether --enable-mount was given. if test "${enable_mount+set}" = set; then enableval=$enable_mount; enable_mount=$enableval @@ -6706,7 +6678,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6709 "configure"' > conftest.$ac_ext + echo '#line 6681 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8735,11 +8707,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8738: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8710: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8742: \$? = $ac_status" >&5 + echo "$as_me:8714: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9003,11 +8975,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9006: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8978: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9010: \$? = $ac_status" >&5 + echo "$as_me:8982: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9107,11 +9079,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9110: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9082: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9114: \$? = $ac_status" >&5 + echo "$as_me:9086: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11404,7 +11376,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13815: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13847: \$? = $ac_status" >&5 + echo "$as_me:13819: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13944,11 +13916,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13947: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13919: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13951: \$? = $ac_status" >&5 + echo "$as_me:13923: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15505,11 +15477,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15508: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15480: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15512: \$? = $ac_status" >&5 + echo "$as_me:15484: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15609,11 +15581,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15612: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15584: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15616: \$? = $ac_status" >&5 + echo "$as_me:15588: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17796,11 +17768,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17799: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17771: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17803: \$? = $ac_status" >&5 + echo "$as_me:17775: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -18064,11 +18036,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18067: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18039: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18071: \$? = $ac_status" >&5 + echo "$as_me:18043: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -18168,11 +18140,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18171: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18143: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18175: \$? = $ac_status" >&5 + echo "$as_me:18147: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -22484,12 +22456,12 @@ if test -n "$PKG_CONFIG"; then pkg_cv_GSSAPI_CFLAGS="$GSSAPI_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgssapi >= 0.9\"") >&5 - ($PKG_CONFIG --exists --print-errors "libgssapi >= 0.9") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgssapi >= 0.11\"") >&5 + ($PKG_CONFIG --exists --print-errors "libgssapi >= 0.11") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_GSSAPI_CFLAGS=`$PKG_CONFIG --cflags "libgssapi >= 0.9" 2>/dev/null` + pkg_cv_GSSAPI_CFLAGS=`$PKG_CONFIG --cflags "libgssapi >= 0.11" 2>/dev/null` else pkg_failed=yes fi @@ -22502,12 +22474,12 @@ if test -n "$PKG_CONFIG"; then pkg_cv_GSSAPI_LIBS="$GSSAPI_LIBS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgssapi >= 0.9\"") >&5 - ($PKG_CONFIG --exists --print-errors "libgssapi >= 0.9") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgssapi >= 0.11\"") >&5 + ($PKG_CONFIG --exists --print-errors "libgssapi >= 0.11") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_GSSAPI_LIBS=`$PKG_CONFIG --libs "libgssapi >= 0.9" 2>/dev/null` + pkg_cv_GSSAPI_LIBS=`$PKG_CONFIG --libs "libgssapi >= 0.11" 2>/dev/null` else pkg_failed=yes fi @@ -22526,14 +22498,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GSSAPI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgssapi >= 0.9"` + GSSAPI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgssapi >= 0.11"` else - GSSAPI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgssapi >= 0.9"` + GSSAPI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgssapi >= 0.11"` fi # Put the nasty error message in config.log where it belongs echo "$GSSAPI_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (libgssapi >= 0.9) were not met: + { { echo "$as_me:$LINENO: error: Package requirements (libgssapi >= 0.11) were not met: $GSSAPI_PKG_ERRORS @@ -22544,7 +22516,7 @@ Alternatively, you may set the environment variables GSSAPI_CFLAGS and GSSAPI_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements (libgssapi >= 0.9) were not met: +echo "$as_me: error: Package requirements (libgssapi >= 0.11) were not met: $GSSAPI_PKG_ERRORS @@ -22655,10 +22627,11 @@ if test $ac_cv_lib_bsd_daemon = yes; then fi fi -if test "$use_blkid" = 1; then - { echo "$as_me:$LINENO: checking for blkid_get_cache in -lblkid" >&5 -echo $ECHO_N "checking for blkid_get_cache in -lblkid... $ECHO_C" >&6; } -if test "${ac_cv_lib_blkid_blkid_get_cache+set}" = set; then + +if test "$choose_blkid" != no; then + { echo "$as_me:$LINENO: checking for blkid_get_library_version in -lblkid" >&5 +echo $ECHO_N "checking for blkid_get_library_version in -lblkid... $ECHO_C" >&6; } +if test "${ac_cv_lib_blkid_blkid_get_library_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -22676,11 +22649,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char blkid_get_cache (); +char blkid_get_library_version (); int main () { -return blkid_get_cache (); +return blkid_get_library_version (); ; return 0; } @@ -22703,21 +22676,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_blkid_blkid_get_cache=yes + ac_cv_lib_blkid_blkid_get_library_version=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_blkid_blkid_get_cache=no + ac_cv_lib_blkid_blkid_get_library_version=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_blkid_blkid_get_cache" >&5 -echo "${ECHO_T}$ac_cv_lib_blkid_blkid_get_cache" >&6; } -if test $ac_cv_lib_blkid_blkid_get_cache = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_blkid_blkid_get_library_version" >&5 +echo "${ECHO_T}$ac_cv_lib_blkid_blkid_get_library_version" >&6; } +if test $ac_cv_lib_blkid_blkid_get_library_version = yes; then LIBBLKID="-lblkid" else { { echo "$as_me:$LINENO: error: libblkid needed" >&5 @@ -22858,12 +22831,95 @@ fi if test $ac_cv_header_blkid_blkid_h = yes; then : else - { { echo "$as_me:$LINENO: error: Cannot file libblkid header file blkid/blkid.h" >&5 -echo "$as_me: error: Cannot file libblkid header file blkid/blkid.h" >&2;} + { { echo "$as_me:$LINENO: error: Cannot find libblkid header file blkid/blkid.h" >&5 +echo "$as_me: error: Cannot find libblkid header file blkid/blkid.h" >&2;} { (exit 1); exit 1; }; } fi + + { echo "$as_me:$LINENO: checking for suitable libblkid version" >&5 +echo $ECHO_N "checking for suitable libblkid version... $ECHO_C" >&6; } + if test "${libblkid_is_recent+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + saved_LIBS="$LIBS" + LIBS=-lblkid + if test "$cross_compiling" = yes; then + libblkid_is_recent=unknown +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + int main() + { + int vers = blkid_get_library_version(0, 0); + return vers >= 140 ? 0 : 1; + } + +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + libblkid_is_recent=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +libblkid_is_recent=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + + LIBS="$saved_LIBS" + +fi + { echo "$as_me:$LINENO: result: $libblkid_is_recent" >&5 +echo "${ECHO_T}$libblkid_is_recent" >&6; } + + if test $choose_blkid = yes; then + use_blkid=1 + test $libblkid_is_recent = no && { echo "$as_me:$LINENO: WARNING: libblkid is old and may cause mountd to leak memory" >&5 +echo "$as_me: WARNING: libblkid is old and may cause mountd to leak memory" >&2;} + else + if test $libblkid_is_recent = yes + then use_blkid=1 + else use_blkid=0 + { echo "$as_me:$LINENO: WARNING: uuid support disabled as libblkid is too old" >&5 +echo "$as_me: WARNING: uuid support disabled as libblkid is too old" >&2;} + fi + fi + +cat >>confdefs.h <<_ACEOF +#define USE_BLKID $use_blkid +_ACEOF + fi @@ -23544,6 +23600,150 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_GSS_KRB5_CCACHE_NAME 1 _ACEOF +fi + + + as_ac_Lib=`echo "ac_cv_lib_$gssapi_lib''_krb5_get_error_message" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for krb5_get_error_message in -l$gssapi_lib" >&5 +echo $ECHO_N "checking for krb5_get_error_message in -l$gssapi_lib... $ECHO_C" >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$gssapi_lib $KRBLIBS $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char krb5_get_error_message (); +int +main () +{ +return krb5_get_error_message (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_Lib=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Lib=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +ac_res=`eval echo '${'$as_ac_Lib'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Lib'}'` = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_KRB5_GET_ERROR_MESSAGE 1 +_ACEOF + +fi + + + as_ac_Lib=`echo "ac_cv_lib_$gssapi_lib''_krb5_get_init_creds_opt_set_addressless" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for krb5_get_init_creds_opt_set_addressless in -l$gssapi_lib" >&5 +echo $ECHO_N "checking for krb5_get_init_creds_opt_set_addressless in -l$gssapi_lib... $ECHO_C" >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$gssapi_lib $KRBLIBS $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char krb5_get_init_creds_opt_set_addressless (); +int +main () +{ +return krb5_get_init_creds_opt_set_addressless (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_Lib=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Lib=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +ac_res=`eval echo '${'$as_ac_Lib'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Lib'}'` = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS 1 +_ACEOF + fi @@ -29525,7 +29725,7 @@ AM_CFLAGS="$my_am_cflags" ACLOCAL_AMFLAGS="-I $ac_macro_dir \$(ACLOCAL_FLAGS)" -ac_config_files="$ac_config_files Makefile linux-nfs/Makefile support/Makefile support/export/Makefile support/include/nfs/Makefile support/include/rpcsvc/Makefile support/include/sys/fs/Makefile support/include/sys/Makefile support/include/Makefile support/misc/Makefile support/nfs/Makefile tools/Makefile tools/locktest/Makefile tools/nlmtest/Makefile tools/rpcdebug/Makefile tools/rpcgen/Makefile utils/Makefile utils/exportfs/Makefile utils/gssd/Makefile utils/idmapd/Makefile utils/mount/Makefile utils/mountd/Makefile utils/nfsd/Makefile utils/nfsstat/Makefile utils/rquotad/Makefile utils/showmount/Makefile utils/statd/Makefile" +ac_config_files="$ac_config_files Makefile linux-nfs/Makefile support/Makefile support/export/Makefile support/include/nfs/Makefile support/include/rpcsvc/Makefile support/include/sys/fs/Makefile support/include/sys/Makefile support/include/Makefile support/misc/Makefile support/nfs/Makefile tools/Makefile tools/locktest/Makefile tools/nlmtest/Makefile tools/rpcdebug/Makefile tools/rpcgen/Makefile utils/Makefile utils/exportfs/Makefile utils/gssd/Makefile utils/idmapd/Makefile utils/mount/Makefile utils/mountd/Makefile utils/nfsd/Makefile utils/nfsstat/Makefile utils/showmount/Makefile utils/statd/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -29644,13 +29844,6 @@ echo "$as_me: error: conditional \"CONFIG_GSS\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${CONFIG_RQUOTAD_TRUE}" && test -z "${CONFIG_RQUOTAD_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"CONFIG_RQUOTAD\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"CONFIG_RQUOTAD\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi if test -z "${CONFIG_RPCGEN_TRUE}" && test -z "${CONFIG_RPCGEN_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"CONFIG_RPCGEN\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -29993,7 +30186,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by linux nfs-utils $as_me 1.1.0-rc1, which was +This file was extended by linux nfs-utils $as_me 1.1.0, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -30046,7 +30239,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -linux nfs-utils config.status 1.1.0-rc1 +linux nfs-utils config.status 1.1.0 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -30186,7 +30379,6 @@ do "utils/mountd/Makefile") CONFIG_FILES="$CONFIG_FILES utils/mountd/Makefile" ;; "utils/nfsd/Makefile") CONFIG_FILES="$CONFIG_FILES utils/nfsd/Makefile" ;; "utils/nfsstat/Makefile") CONFIG_FILES="$CONFIG_FILES utils/nfsstat/Makefile" ;; - "utils/rquotad/Makefile") CONFIG_FILES="$CONFIG_FILES utils/rquotad/Makefile" ;; "utils/showmount/Makefile") CONFIG_FILES="$CONFIG_FILES utils/showmount/Makefile" ;; "utils/statd/Makefile") CONFIG_FILES="$CONFIG_FILES utils/statd/Makefile" ;; @@ -30337,8 +30529,6 @@ CONFIG_GSS_TRUE!$CONFIG_GSS_TRUE$ac_delim CONFIG_GSS_FALSE!$CONFIG_GSS_FALSE$ac_delim kprefix!$kprefix$ac_delim secure_statd!$secure_statd$ac_delim -CONFIG_RQUOTAD_TRUE!$CONFIG_RQUOTAD_TRUE$ac_delim -CONFIG_RQUOTAD_FALSE!$CONFIG_RQUOTAD_FALSE$ac_delim RPCGEN_PATH!$RPCGEN_PATH$ac_delim CONFIG_RPCGEN_TRUE!$CONFIG_RPCGEN_TRUE$ac_delim CONFIG_RPCGEN_FALSE!$CONFIG_RPCGEN_FALSE$ac_delim @@ -30348,6 +30538,8 @@ CC!$CC$ac_delim CFLAGS!$CFLAGS$ac_delim LDFLAGS!$LDFLAGS$ac_delim CPPFLAGS!$CPPFLAGS$ac_delim +ac_ct_CC!$ac_ct_CC$ac_delim +EXEEXT!$EXEEXT$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -30389,8 +30581,6 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -ac_ct_CC!$ac_ct_CC$ac_delim -EXEEXT!$EXEEXT$ac_delim OBJEXT!$OBJEXT$ac_delim DEPDIR!$DEPDIR$ac_delim am__include!$am__include$ac_delim @@ -30451,7 +30641,7 @@ ACLOCAL_AMFLAGS!$ACLOCAL_AMFLAGS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 58; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5