from Chris Cowan

patches to smnotify to make it compile under AIX.

On AIX, we need to specify $(POPT_OBJ) explicitely

On AIX we can not use the -C flag to rpcgen since it is not implemented

On AIX we must explicitely force an #include of rpc/rpc.h in the idl
file since rpcgen does not automatically add it to the generated files

(This used to be ctdb commit 8c3e7ce645ec829bc465302831cc6b23452525d6)

diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in
index e1ddcd527a0eb6ee260c2ceef506800d98451a32..3634a4c2a451dad62b919f2fe70cb58725bbc307 100644 (file)
--- a/ctdb/Makefile.in
+++ b/ctdb/Makefile.in
@@ -89,19 +89,19 @@ bin/ctdb: $(CTDB_CLIENT_OBJ) tools/ctdb.o
 
 bin/smnotify: utils/smnotify/gen_xdr.o utils/smnotify/gen_smnotify.o utils/smnotify/smnotify.o 
        @echo Linking $@
-       @$(CC) $(CFLAGS) -o $@ utils/smnotify/smnotify.o utils/smnotify/gen_xdr.o utils/smnotify/gen_smnotify.o $(LIB_FLAGS)
+       @$(CC) $(CFLAGS) -o $@ utils/smnotify/smnotify.o utils/smnotify/gen_xdr.o utils/smnotify/gen_smnotify.o $(POPT_OBJ) $(LIB_FLAGS)
 
 utils/smnotify/smnotify.h:  utils/smnotify/smnotify.x
        @echo Generating $@
-       rpcgen -C -h utils/smnotify/smnotify.x > utils/smnotify/smnotify.h
+       rpcgen -h utils/smnotify/smnotify.x > utils/smnotify/smnotify.h
 
 utils/smnotify/gen_xdr.c: utils/smnotify/smnotify.x utils/smnotify/smnotify.h
        @echo Generating $@
-       rpcgen -C -c utils/smnotify/smnotify.x > utils/smnotify/gen_xdr.c 
+       rpcgen -c utils/smnotify/smnotify.x > utils/smnotify/gen_xdr.c 
 
 utils/smnotify/gen_smnotify.c: utils/smnotify/smnotify.x utils/smnotify/smnotify.h
        @echo Generating $@
-       rpcgen -C -l utils/smnotify/smnotify.x > utils/smnotify/gen_smnotify.c 
+       rpcgen -l utils/smnotify/smnotify.x > utils/smnotify/gen_smnotify.c 
 
 bin/rb_test: $(CTDB_CLIENT_OBJ) tests/rb_test.o 
        @echo Linking $@

diff --git a/ctdb/utils/smnotify/smnotify.x b/ctdb/utils/smnotify/smnotify.x
index 0d2c69799ad983b22b52b64324caaa37c6804f90..94239f8baf2ef6e5bd19aae421fd8f35045415f3 100644 (file)
--- a/ctdb/utils/smnotify/smnotify.x
+++ b/ctdb/utils/smnotify/smnotify.x
@@ -1,3 +1,8 @@
+#ifdef RPC_HDR
+%#ifdef _AIX
+%#include <rpc/rpc.h>
+%#endif /* _AIX */
+#endif /* RPC_HDR */
 
 const SM_MAXSTRLEN = 1024;