From 752d8ed28a91219de086635d73e0ba45991abb1e Mon Sep 17 00:00:00 2001 From: Trent Nelson Date: Tue, 28 Jun 2011 03:10:25 -0400 Subject: [PATCH] Add back rpcgen uint64 fix for osx --- configure.ac | 10 ++++++++++ mount/Makefile.am | 4 ++-- nfs/Makefile.am | 4 ++-- portmap/Makefile.am | 4 ++-- rquota/Makefile.am | 4 ++-- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 4da0ef9..641635a 100644 --- 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 7e612b2..19cbaee 100644 --- 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 c5d27ef..01310d5 100644 --- 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 6c947fc..6280338 100644 --- 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 4f08798..da22cea 100644 --- 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 -- 2.34.1