From: Andres Mejia <mcitadel@gmail.com>
Date: Sun, 24 Jul 2011 18:15:59 +0000 (-0400)
Subject: Imported Upstream version 0.0~git20110724.48593f5
X-Git-Tag: upstream/0.0_git20110724.48593f5
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=125a80c9f40f5ebe636416b4434c3e909fea87e5;p=deb_libnfs.git

Imported Upstream version 0.0~git20110724.48593f5
---

diff --git a/README b/README
index edfd8e1..cab6aa6 100644
--- a/README
+++ b/README
@@ -35,10 +35,18 @@ ports from connecting.
 These servers require you use the "insecure" export option in /etc/exports
 in order to allow libnfs clients to be able to connect.
 
-PLATTFORM support
+PLATFORM support
 =================
 As of now this is tested with linux, MacOSX and Apple iOS.
 
 Linux:  - tested with Ubuntu 10.04 - should work with others aswell
+Cygwin: - tested under 64bit win2k8.
 MacOSX: - tested with SDK 10.4 (under Snow Leopard) - should also work with later SDKs and 64Bit
 iOS:    - tested with iOS SDK 4.2 - running on iOS 4.3.x
+FreeBSD:- tested with 8.2
+
+
+Cygwin
+------
+Configure with './configure --enable-tirpc' since cygwin only supports ti-rpc and not classic rpc.
+
diff --git a/configure b/configure
index 63d9564..efa3b78 100755
--- a/configure
+++ b/configure
@@ -734,6 +734,7 @@ with_gnu_ld
 with_sysroot
 enable_libtool_lock
 enable_examples
+enable_tirpc
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1372,6 +1373,7 @@ Optional Features:
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-examples       Build example programs
+  --enable-tirpc          enable use of TI-RPC [default=no]
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -11450,10 +11452,21 @@ if test x$ENABLE_EXAMPLES = xyes; then
 fi
 
 
+# Check whether --enable-tirpc was given.
+if test "${enable_tirpc+set}" = set; then :
+  enableval=$enable_tirpc; enable_tirpc=$enableval
+else
+  enable_tirpc='no'
+fi
+
+
 case $host in
   *darwin*)
     RPCGENFLAGS=-DU_INT64_PLATTFORM_TYPE="u_int64_t"
     ;;
+  *cygwin*)
+    RPCGENFLAGS=-DU_INT64_PLATTFORM_TYPE="u_int64_t"
+    ;;
   *solaris*)
     for ac_header in sys/filio.h
 do :
@@ -11571,6 +11584,12 @@ $as_echo "#define HAVE_SOCKADDR_LEN 1" >>confdefs.h
 fi
 
 
+echo "Use TI-RPC: $enable_tirpc"
+if test "$enable_tirpc" = "yes"; then
+	CFLAGS="${CFLAGS} -I /usr/include/tirpc"
+	LDFLAGS="${LDFLAGS} -ltirpc"
+fi
+
 #output
 ac_config_files="$ac_config_files Makefile include/Makefile lib/Makefile mount/Makefile nfs/Makefile portmap/Makefile rquota/Makefile examples/Makefile"
 
diff --git a/configure.ac b/configure.ac
index 70203ee..309f73f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,10 +34,19 @@ if test x$ENABLE_EXAMPLES = xyes; then
 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])
     if test x$ENABLE_EXAMPLES = xyes; then
@@ -61,6 +70,12 @@ AC_CHECK_MEMBER([struct sockaddr.sa_len],
 #include <sys/socket.h>
 ])
 
+echo "Use TI-RPC: $enable_tirpc"
+if test "$enable_tirpc" = "yes"; then
+	CFLAGS="${CFLAGS} -I /usr/include/tirpc"
+	LDFLAGS="${LDFLAGS} -ltirpc"
+fi
+
 #output
 AC_CONFIG_FILES([Makefile]
                 [include/Makefile]
diff --git a/include/Makefile.am b/include/Makefile.am
index 31fc37a..6efb8f5 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -3,4 +3,8 @@ dist_nfsc_HEADERS = \
 	libnfs.h \
 	libnfs-private.h \
 	libnfs-raw.h \
-	slist.h
+	slist.h \
+	${abs_top_srcdir}/mount/libnfs-raw-mount.h \
+	${abs_top_srcdir}/portmap/libnfs-raw-portmap.h \
+	${abs_top_srcdir}/nfs/libnfs-raw-nfs.h \
+	${abs_top_srcdir}/rquota/libnfs-raw-rquota.h
diff --git a/include/Makefile.in b/include/Makefile.in
index 774be6b..87157ca 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -194,7 +194,11 @@ dist_nfsc_HEADERS = \
 	libnfs.h \
 	libnfs-private.h \
 	libnfs-raw.h \
-	slist.h
+	slist.h \
+	${abs_top_srcdir}/mount/libnfs-raw-mount.h \
+	${abs_top_srcdir}/portmap/libnfs-raw-portmap.h \
+	${abs_top_srcdir}/nfs/libnfs-raw-nfs.h \
+	${abs_top_srcdir}/rquota/libnfs-raw-rquota.h
 
 all: all-am