X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=configure.ac;h=1183bd25038d43fdf43472899ad0cf84f78becf2;hb=ec70621f42e2074b454637813c1985b35552b2b3;hp=5b8f1fa994f3aae70125e80b5da93c128c7831be;hpb=4a75cfa21496112df81d290fca2a8e0ec245c802;p=deb_libnfs.git

diff --git a/configure.ac b/configure.ac
index 5b8f1fa..1183bd2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.50)
-AC_INIT([libnfs], [0.0.0])
+AC_INIT([libnfs], [1.5.0], [ronniesahlberg@gmail.com])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign])
 AC_CANONICAL_HOST
@@ -11,28 +11,15 @@ AC_PROG_CC
 AC_PROG_LIBTOOL
 
 AM_PROG_CC_C_O
+PKG_PROG_PKG_CONFIG
 
 # Work around stupid autoconf default cflags. pt 2
 if test "$SAVE_CFLAGS" = "x"; then
   CFLAGS=""
 fi
 
-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: logdir
-AC_ARG_WITH([logdir],
-	    [AC_HELP_STRING([--with-logdir=DIR],
-                            [path to log directory [[LOCALSTATEDIR/log]]])],
-            [LOGDIR=$withval],
-            [LOGDIR='${localstatedir}/log'])
-
-#if test ! -d "$LOGDIR"; then
-#  AC_MSG_ERROR([--with-logdir must specify a path])
-#fi
-AC_SUBST(LOGDIR)
+# We always want 64 bit file offsets
+CFLAGS="${CFLAGS} -D_FILE_OFFSET_BITS=64"
 
 #option: examples
 AC_ARG_ENABLE([examples],
@@ -41,17 +28,50 @@ 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)
 
+
 case $host in
-  *darwin*)
-    RPCGENFLAGS=-DU_INT64_PLATTFORM_TYPE="u_int64_t"
-    ;;
   *solaris*)
     AC_CHECK_HEADERS([sys/filio.h])
+    AC_CHECK_HEADERS([sys/sockio.h])
     if test x$ENABLE_EXAMPLES = xyes; then
       AC_CHECK_LIB([socket], [main], , [AC_MSG_ERROR([Can not find required library])])
       AC_CHECK_LIB([nsl],    [main], , [AC_MSG_ERROR([Can not find required library])])
@@ -61,7 +81,15 @@ case $host in
     ;;
 esac
 
-AC_SUBST(RPCGENFLAGS)
+# check for SA_LEN
+dnl Check if sockaddr data structure includes a "sa_len"
+AC_CHECK_MEMBER([struct sockaddr.sa_len],
+                [ AC_DEFINE(HAVE_SOCKADDR_LEN,1,[Whether sockaddr struct has sa_len]) ],
+                [],
+                [
+#include <sys/types.h>
+#include <sys/socket.h>
+])
 
 #output
 AC_CONFIG_FILES([Makefile]
@@ -69,9 +97,10 @@ AC_CONFIG_FILES([Makefile]
                 [lib/Makefile]
                 [mount/Makefile]
                 [nfs/Makefile]
+                [nlm/Makefile]
                 [portmap/Makefile]
                 [rquota/Makefile]
                 [examples/Makefile]
                )
 
-AC_OUTPUT
+AC_OUTPUT([libnfs.pc])