Remove rpcgen check as it is not needed anymore

[deb_libnfs.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c9cfd6416aa090fd483e6a6b89825d7899f899ce..a06405c8071134c94eb39c3f0bd19cd7bd3b550d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.50)
-AC_INIT([libnfs], [1.1.0], [ronniesahlberg@gmail.com])
+AC_INIT([libnfs], [1.5.0], [ronniesahlberg@gmail.com])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign])
 AC_CANONICAL_HOST
@@ -21,11 +21,6 @@ fi
 # We always want 64 bit file offsets
 CFLAGS="${CFLAGS} -D_FILE_OFFSET_BITS=64"
 
-AC_CHECK_PROG([HAVE_RPCGEN], [rpcgen], [yes], [no])
-if test x$HAVE_RPCGEN != xyes; then
-  AC_MSG_ERROR([Can not find required program])
-fi
-
 #option: examples
 AC_ARG_ENABLE([examples],
               [AC_HELP_STRING([--enable-examples],
@@ -33,11 +28,46 @@ AC_ARG_ENABLE([examples],
              [ENABLE_EXAMPLES=$enableval],
              [ENABLE_EXAMPLES="no"])
 
+# We need popt to compile the examples
 if test x$ENABLE_EXAMPLES = xyes; then
+AC_MSG_CHECKING(whether libpopt is available)
+ac_save_CFLAGS="$CFLAGS"
+ac_save_LIBS="$LIBS"
+CFLAGS="$CFLAGS $GLIB_CFLAGS"
+LIBS="$GLIB_LIBS $LIBS -lpopt"
+AC_TRY_RUN([
+/*
+ * Just see if we can compile/link with popt
+ */
+#include <popt.h>
+
+int main(int argc, const char *argv[])
+{
+       struct poptOption popt_options[] = {
+               POPT_TABLEEND
+       };
+       poptGetContext(argv[0], argc, argv, popt_options, POPT_CONTEXT_KEEP_FIRST);
+
+       return 0;
+}
+], ac_cv_have_popt=yes, ac_cv_have_popt=no,
+   [echo $ac_n "compile with POPT. Assuming OK... $ac_c"
+    ac_cv_have_popt=yes])
+CFLAGS="$ac_save_CFLAGS"
+LIBS="$ac_save_LIBS"
+if test "$ac_cv_have_popt" = yes ; then
+  AC_MSG_RESULT(yes)
   MAYBE_EXAMPLES="examples"
+else
+  AC_MSG_RESULT(no)
+  AC_MSG_NOTICE(You need libpopt to compile the sample libnfs clients.)
+  AC_MSG_NOTICE(Only the library will be compiled and installed.)
+fi
 fi
+
 AC_SUBST(MAYBE_EXAMPLES)
 
+
 AC_ARG_ENABLE(tirpc,
        [AC_HELP_STRING([--enable-tirpc],
                        [enable use of TI-RPC @<:@default=no@:>@])],
@@ -93,6 +123,7 @@ AC_CONFIG_FILES([Makefile]
                 [lib/Makefile]
                 [mount/Makefile]
                 [nfs/Makefile]
+                [nlm/Makefile]
                 [portmap/Makefile]
                 [rquota/Makefile]
                 [examples/Makefile]