X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=configure.in;h=757ebb80d07d95bd5711d42a80238f0929badf04;hp=80ee58a4ffa4c56ccbc889a3e2394d23ccfd3ef5;hb=1ab6d3b82e9d36051cf5d80c33cdec9cb638bb20;hpb=6fccc04c2569e54c16f9b0992aa1f5a3fbd907b4 diff --git a/configure.in b/configure.in index 80ee58a..757ebb8 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -AC_INIT([linux nfs-utils],[1.0.9],[nfs@lists.sf.net],[nfs-utils]) +AC_INIT([linux nfs-utils],[1.0.10],[nfs@lists.sf.net],[nfs-utils]) AC_CANONICAL_BUILD([]) AC_CANONICAL_HOST([]) AC_CONFIG_SRCDIR(tools/getiversion/getiversion.c) @@ -147,8 +147,13 @@ AC_BSD_SIGNALS dnl ************************************************************* dnl * Check for required libraries dnl ************************************************************* -AC_CHECK_LIB(socket, main, [LIBSOCKET="-lnsl"]) -AC_CHECK_LIB(nsl, main, [LIBNSL="-lnsl"]) +AC_CHECK_FUNC(gethostbyname, , [AC_CHECK_LIB(nsl, gethostbyname, [LIBNSL="-lnsl"])]) +AC_SUBST(LIBNSL) + +AC_CHECK_FUNC(connect, , + AC_CHECK_LIB(socket, connect, [LIBSOCKET="-lsocket"], + AC_MSG_ERROR(Function 'socket' not found.), $LIBNSL)) + AC_CHECK_LIB(crypt, crypt, [LIBCRYPT="-lcrypt"]) if test "$enable_nfsv4" = yes; then AC_CHECK_LIB(event, event_dispatch, [libevent=1], AC_MSG_ERROR([libevent needed for nfsv4 support])) @@ -159,9 +164,7 @@ if test "$enable_nfsv4" = yes; then dnl but we need to make sure we get the right version if test "$enable_gss" = yes; then PKG_CHECK_MODULES(RPCSECGSS, librpcsecgss >= 0.10, , - [AC_MSG_ERROR([Unable to locate information required to use librpcsecgss.]) - AC_MSG_ERROR([If you have pkgconfig installed, you might try setting environment]) - AC_MSG_ERROR([variable PKG_CONFIG_PATH to /usr/local/lib/pkgconfig]) + [AC_MSG_ERROR([Unable to locate information required to use librpcsecgss. If you have pkgconfig installed, you might try setting environment variable PKG_CONFIG_PATH to /usr/local/lib/pkgconfig]) ] ) PKG_CHECK_MODULES(GSSAPI, libgssapi >= 0.9) @@ -172,7 +175,6 @@ if test "$knfsd_cv_glibc2" = no; then AC_CHECK_LIB(bsd, daemon, [LIBBSD="-lbsd"]) fi AC_SUBST(LIBSOCKET) -AC_SUBST(LIBNSL) AC_SUBST(LIBCRYPT) AC_SUBST(LIBBSD) @@ -317,7 +319,6 @@ AC_CONFIG_FILES([ support/nfs/Makefile tools/Makefile tools/getiversion/Makefile - tools/getkversion/Makefile tools/locktest/Makefile tools/nlmtest/Makefile tools/rpcdebug/Makefile @@ -331,7 +332,6 @@ AC_CONFIG_FILES([ utils/mountd/Makefile utils/nfsd/Makefile utils/nfsstat/Makefile - utils/nhfsstone/Makefile utils/rquotad/Makefile utils/showmount/Makefile utils/statd/Makefile])