X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=configure.in;h=aaffb2d7f1fc561ec6bde8871e4cdd2f1adc3f21;hp=496219781eb9b00cf89417e208c47e51f2fa8379;hb=bc700ac52d47969d873499e3050d028335eda14d;hpb=f1bfe0916c04d93de7a4fae5315fff6e4ccac23f

diff --git a/configure.in b/configure.in
index 4962197..aaffb2d 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ AC_INIT(rules.mk)
 AC_PREFIX_DEFAULT(/usr)
 
 # The nfs-utils version
-VERSION="1.0.6"
+VERSION="1.0.7"
 AC_SUBST(VERSION)
 
 dnl *************************************************************
@@ -117,10 +117,10 @@ AC_CHECK_LIB(socket, main, [LIBSOCKET="-lnsl"])
 AC_CHECK_LIB(nsl, main,	[LIBNSL="-lnsl"])
 AC_CHECK_LIB(crypt, crypt, [LIBCRYPT="-lcrypt"])
 if test "$enable_nfsv4" = yes; then
-    AC_CHECK_LIB(event, event_dispatch)
-    AC_CHECK_LIB(nfsidmap, nfs4_uid_to_name)
-    AC_CHECK_HEADERS(event.h)
-    AC_CHECK_HEADERS(nfsidmap.h)
+    AC_CHECK_LIB(event, event_dispatch, , [AC_MSG_ERROR(libevent needed for nfsv4 support)])
+    AC_CHECK_LIB(nfsidmap, nfs4_init_name_mapping, ,[AC_MSG_ERROR(libnfsidmap needed for nfsv4 support)])
+    AC_CHECK_HEADERS(event.h, ,[AC_MSG_ERROR(libevent needed for nfsv4 support)])
+    AC_CHECK_HEADERS(nfsidmap.h, ,[AC_MSG_ERROR(libnfsidmap needed for nfsv4 support)])
 fi
 if test "$knfsd_cv_glibc2" = no; then
     AC_CHECK_LIB(bsd, daemon, [LIBBSD="-lbsd"])
@@ -134,6 +134,9 @@ AC_TCP_WRAPPER
 AC_SUBST(LIBWRAP)
 
 if test "$enable_gss" = yes; then
+  dnl 'gss' also depends on nfsidmap.h - at least for svcgssd_proc.c
+  AC_CHECK_HEADERS(nfsidmap.h, ,[AC_MSG_ERROR(libnfsidmap needed for gss support)])
+  
   dnl Checks for Kerberos
   dnl NOTE: while we intend to do generic gss-api, currently we
   dnl have a requirement to get an initial Kerberos machine
@@ -199,13 +202,14 @@ if test "$enable_gss" = yes; then
            AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME),,$KRBLIB)
         break
       fi
-      CFLAGS=$CFLAGS `K5CONFIG --cflags`
+      CFLAGS=$CFLAGS `$K5CONFIG --cflags`
     fi
   done
   dnl We didn't find a usable Kerberos environment
   if test "x$KRBDIR" = "x"; then
+    AC_MSG_RESULT("no")
     if test "x$krb5_with" = "x"; then
-      AC_MSG_ERROR(Kerberos v5 with GSS support not found)
+      AC_MSG_ERROR(Kerberos v5 with GSS support not found: consider --disable-gss or --with-krb5=)
     else
       AC_MSG_ERROR(Kerberos v5 with GSS support not found at $krb5_with)
     fi
@@ -239,4 +243,4 @@ AC_DEFINE_UNQUOTED(NFS_STATEDIR, "$statedir")
 AC_SUBST(LDFLAGS)
 AC_SUBST(CXXFLAGS)
 AC_SUBST(CFLAGS)
-AC_OUTPUT(config.mk nfs-utils.spec utils/Makefile)
+AC_OUTPUT(config.mk utils/Makefile)