X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=configure.ac;h=48595bd32748a2f8d0860dc9ce0a0578450404bb;hb=6916a66546035da5c1c82c3c85e387061a758b74;hp=28d29cd96a1e48074c1d219fcfec1ad0ec5e7c2d;hpb=fc4bdc2269596ad94f92798149d587e38c73712b;p=deb_libnfs.git

diff --git a/configure.ac b/configure.ac
index 28d29cd..48595bd 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.3.0], [ronniesahlberg@gmail.com])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign])
 AC_CANONICAL_HOST
@@ -11,12 +11,16 @@ 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])
@@ -44,8 +48,12 @@ 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])])
@@ -67,21 +75,28 @@ AC_CHECK_MEMBER([struct sockaddr.sa_len],
 #include <sys/socket.h>
 ])
 
-echo "Use TI-RPC: $enable_tirpc"
+LIBNFS_PC_REQ_PRIVATE=
+
 if test "$enable_tirpc" = "yes"; then
-	CFLAGS="${CFLAGS} -I /usr/include/tirpc"
-	LDFLAGS="${LDFLAGS} -ltirpc"
+	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]
                 [lib/Makefile]
                 [mount/Makefile]
                 [nfs/Makefile]
+                [nlm/Makefile]
                 [portmap/Makefile]
                 [rquota/Makefile]
                 [examples/Makefile]
                )
 
-AC_OUTPUT
+AC_OUTPUT([libnfs.pc])