Add back rpcgen uint64 fix for osx

diff --git a/configure.ac b/configure.ac
index 4da0ef928bc7742198964d012ce8b8be47eaf246..641635ab96e493d57ea2c8fbb51eb9aaacb1c10e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,6 +4,16 @@ AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign])
 AC_CANONICAL_HOST
 
+case $host in
+  *darwin*)
+    RPCGENFLAGS=-DU_INT64_PLATTFORM_TYPE="u_int64_t"
+    ;;
+  *)
+    ;;
+esac
+
+AC_SUBST(RPCGENFLAGS)
+
 # Work around stupid autoconf default cflags. pt 1
 SAVE_CFLAGS="x${CFLAGS}"
 

diff --git a/mount/Makefile.am b/mount/Makefile.am
index 7e612b2dbf0c043af8d6acc8b64e014c2279b5dd..19cbaee7eb3b483ccf00daa26e291b2671a7edde 100644 (file)
--- a/mount/Makefile.am
+++ b/mount/Makefile.am
@@ -14,7 +14,7 @@ libmount_la_SOURCES = \
 $(mount_GENERATED) : mount-stamp
 mount-stamp : mount.x
        rm -f $(mount_GENERATED)
-       rpcgen -h $< > libnfs-raw-mount.h
-       rpcgen -c $< | sed -e "s/#include \".*mount.h\"/#include \"libnfs-raw-mount.h\"/" > libnfs-raw-mount.c
+       rpcgen -h @RPCGENFLAGS@ $< > libnfs-raw-mount.h
+       rpcgen -c @RPCGENFLAGS@ $< | sed -e "s/#include \".*mount.h\"/#include \"libnfs-raw-mount.h\"/" > libnfs-raw-mount.c
        touch mount-stamp
        

diff --git a/nfs/Makefile.am b/nfs/Makefile.am
index c5d27efe5dce9f04e782c671ec41d8c860e452c9..01310d5a7a22c6919006bfa7b63dc5cde566fff2 100644 (file)
--- a/nfs/Makefile.am
+++ b/nfs/Makefile.am
@@ -14,7 +14,7 @@ libnfs_la_SOURCES = \
 $(nfs_GENERATED) : nfs-stamp
 nfs-stamp : nfs.x
        rm -f $(nfs_GENERATED)
-       rpcgen -h $< > libnfs-raw-nfs.h
-       rpcgen -c $< | sed -e "s/#include \".*nfs.h\"/#include \"libnfs-raw-nfs.h\"/" > libnfs-raw-nfs.c
+       rpcgen -h @RPCGENFLAGS@ $< > libnfs-raw-nfs.h
+       rpcgen -c @RPCGENFLAGS@ $< | sed -e "s/#include \".*nfs.h\"/#include \"libnfs-raw-nfs.h\"/" > libnfs-raw-nfs.c
        touch nfs-stamp
        

diff --git a/portmap/Makefile.am b/portmap/Makefile.am
index 6c947fc8ba657b94280998387ad7643ae4c93512..6280338558850be933fd03c3384323184ff6fa52 100644 (file)
--- a/portmap/Makefile.am
+++ b/portmap/Makefile.am
@@ -14,7 +14,7 @@ libportmap_la_SOURCES = \
 $(portmap_GENERATED) : portmap-stamp
 portmap-stamp : portmap.x
        rm -f $(portmap_GENERATED)
-       rpcgen -h $< > libnfs-raw-portmap.h
-       rpcgen -c $< | sed -e "s/#include \".*portmap.h\"/#include \"libnfs-raw-portmap.h\"/" > libnfs-raw-portmap.c
+       rpcgen -h @RPCGENFLAGS@ $< > libnfs-raw-portmap.h
+       rpcgen -c @RPCGENFLAGS@ $< | sed -e "s/#include \".*portmap.h\"/#include \"libnfs-raw-portmap.h\"/" > libnfs-raw-portmap.c
        touch portmap-stamp
        

diff --git a/rquota/Makefile.am b/rquota/Makefile.am
index 4f08798339167c48f3dce45f6047c100030c89d0..da22cea0e4b46e7211e0ac65ba3fc85553c10bfb 100644 (file)
--- a/rquota/Makefile.am
+++ b/rquota/Makefile.am
@@ -14,7 +14,7 @@ librquota_la_SOURCES = \
 $(rquota_GENERATED) : rquota-stamp
 rquota-stamp : rquota.x
        rm -f $(rquota_GENERATED)
-       rpcgen -h $< > libnfs-raw-rquota.h
-       rpcgen -c $< | sed -e "s/#include \".*rquota.h\"/#include \"libnfs-raw-rquota.h\"/" > libnfs-raw-rquota.c
+       rpcgen -h @RPCGENFLAGS@ $< > libnfs-raw-rquota.h
+       rpcgen -c @RPCGENFLAGS@ $< | sed -e "s/#include \".*rquota.h\"/#include \"libnfs-raw-rquota.h\"/" > libnfs-raw-rquota.c
        touch rquota-stamp