Simplify the upgrade path handling from PPA.

[deb_libnfs.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 67004e7b58003e751a9a37d98f3a125793589359..2e64295be8b37d782639bc579ac25a5dbc9f6eaa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.50)
-AC_INIT([libnfs], [1.6.0], [ronniesahlberg@gmail.com])
+AC_INIT([libnfs], [1.9.6], [ronniesahlberg@gmail.com])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign])
 AC_CANONICAL_HOST
@@ -72,10 +72,8 @@ case $host in
   *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
+    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])])
     ;;
   *)
     ;;
@@ -101,6 +99,10 @@ AC_CHECK_HEADERS([utime.h])
 dnl Check for net/if.h
 AC_CHECK_HEADERS([net/if.h])
 
+# check for sys/time.h
+dnl Check for sys/time.h
+AC_CHECK_HEADERS([sys/time.h])
+
 # check for sys/ioctl.h
 dnl Check for sys/ioctl.h
 AC_CHECK_HEADERS([sys/ioctl.h])
@@ -117,10 +119,18 @@ AC_CHECK_HEADERS([sys/statvfs.h])
 dnl Check for sys/socket.h
 AC_CHECK_HEADERS([sys/socket.h])
 
+# check for netinet/tcp.h
+dnl Check for netinet/tcp.h
+AC_CHECK_HEADERS([netinet/tcp.h])
+
 # check for netinet/in.h
 dnl Check for netinet/in.h
 AC_CHECK_HEADERS([netinet/in.h])
 
+# check for arpa/inet.h
+dnl Check for arpa/inet.h
+AC_CHECK_HEADERS([arpa/inet.h])
+
 # check for SA_LEN
 dnl Check if sockaddr data structure includes a "sa_len"
 AC_CHECK_MEMBER([struct sockaddr.sa_len],
@@ -141,15 +151,23 @@ AC_CHECK_MEMBER([struct sockaddr_storage.ss_family],
 #include <sys/socket.h>
 ])
 
+AC_CHECK_MEMBERS([struct stat.st_mtim.tv_nsec])
+
+# check where makedev is defined
+AC_HEADER_MAJOR
+
 #output
 AC_CONFIG_FILES([Makefile]
+                [doc/Makefile]
                 [include/Makefile]
                 [lib/Makefile]
                 [mount/Makefile]
                 [nfs/Makefile]
                 [nlm/Makefile]
+                [nsm/Makefile]
                 [portmap/Makefile]
                 [rquota/Makefile]
+                [utils/Makefile]
                 [examples/Makefile]
                )