X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=configure.ac;h=2091618c685de56421fc843d447758768c8d31f4;hb=345422a2e32b22119054224003655468771b15fc;hp=4da0ef928bc7742198964d012ce8b8be47eaf246;hpb=2842ff15c8c62dce60a7988ad41a1e89316581a0;p=deb_libnfs.git

diff --git a/configure.ac b/configure.ac
index 4da0ef9..2091618 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.2.0], [ronniesahlberg@gmail.com])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign])
 AC_CANONICAL_HOST
@@ -11,41 +11,82 @@ 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
 
+# 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: 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)
-
 #option: examples
 AC_ARG_ENABLE([examples],
               [AC_HELP_STRING([--enable-examples],
                               [Build example programs])],
 	      [ENABLE_EXAMPLES=$enableval],
 	      [ENABLE_EXAMPLES="no"])
-AM_CONDITIONAL(EXAMPLES, [test x$ENABLE_EXAMPLES = xyes])
-AM_COND_IF(EXAMPLES,
-           [MAYBE_EXAMPLES="examples"]
-           [config_examples="examples/Makefile"])
+
+if test x$ENABLE_EXAMPLES = xyes; then
+  MAYBE_EXAMPLES="examples"
+fi
 AC_SUBST(MAYBE_EXAMPLES)
 
+AC_ARG_ENABLE(tirpc,
+  	[AC_HELP_STRING([--enable-tirpc],
+  			[enable use of TI-RPC @<:@default=no@:>@])],
+  	enable_tirpc=$enableval,
+	enable_tirpc='no')
+
+case $host in
+  *darwin*)
+    RPCGENFLAGS=-DU_INT64_PLATTFORM_TYPE="u_int64_t"
+    ;;
+  *cygwin*)
+    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])])
+    fi
+    ;;
+  *)
+    ;;
+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>
+])
+
+LIBNFS_PC_REQ_PRIVATE=
+
+if test "$enable_tirpc" = "yes"; then
+	PKG_CHECK_MODULES(TIRPC, libtirpc, [],
+		AC_MSG_ERROR([unable to locate libtirpc files]))
+	CFLAGS="${CFLAGS} ${TIRPC_CFLAGS}"
+	LIBS="${LIBS} ${TIRPC_LIBS}"
+	LIBNFS_PC_REQ_PRIVATE="${LIBNFS_PC_REQ_PRIVATE} libtirpc"
+fi
+
+AC_SUBST(LIBNFS_PC_REQ_PRIVATE)
+
 #output
 AC_CONFIG_FILES([Makefile]
                 [include/Makefile]
@@ -57,4 +98,4 @@ AC_CONFIG_FILES([Makefile]
                 [examples/Makefile]
                )
 
-AC_OUTPUT
+AC_OUTPUT([libnfs.pc])