1 --- glusterfs-3.3.1/rpc/Makefile.am.orig 2012-12-17 22:48:54.435191720 +0100
2 +++ glusterfs-3.3.1/rpc/Makefile.am 2012-12-17 22:56:20.508515756 +0100
4 -SUBDIRS = rpc-lib rpc-transport xdr
5 +SUBDIRS = xdr rpc-lib rpc-transport
6 --- glusterfs-3.3.1/rpc/rpc-lib/src/Makefile.am.orig 2012-12-17 22:16:10.205232660 +0100
7 +++ glusterfs-3.3.1/rpc/rpc-lib/src/Makefile.am 2012-12-17 22:48:22.138525726 +0100
9 libgfrpc_la_SOURCES = auth-unix.c rpcsvc-auth.c rpcsvc.c auth-null.c \
10 rpc-transport.c xdr-rpc.c xdr-rpcclnt.c rpc-clnt.c auth-glusterfs.c
12 -libgfrpc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
13 +libgfrpc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(top_builddir)/rpc/xdr/src/libgfxdr.la
15 noinst_HEADERS = rpcsvc.h rpc-transport.h xdr-common.h xdr-rpc.h xdr-rpcclnt.h \
16 rpc-clnt.h rpcsvc-common.h protocol-common.h
17 --- glusterfs-3.3.1/rpc/xdr/src/Makefile.am.orig 2012-12-17 22:56:45.071848577 +0100
18 +++ glusterfs-3.3.1/rpc/xdr/src/Makefile.am 2012-12-17 23:12:22.731829033 +0100
20 -D_GNU_SOURCE -D$(GF_HOST_OS) \
21 -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/rpc-lib/src
23 -libgfxdr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
24 - $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la
25 +libgfxdr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
27 libgfxdr_la_SOURCES = xdr-generic.c rpc-common-xdr.c \
29 --- glusterfs-3.5.1/xlators/features/compress/src/Makefile.am.orig 2014-06-29 11:36:20.398339217 +0200
30 +++ glusterfs-3.5.1/xlators/features/compress/src/Makefile.am 2014-06-29 11:47:06.574992416 +0200
33 noinst_HEADERS = cdc.h cdc-mem-types.h
35 -cdc_la_LDFLAGS = -module -avoid-version $(LIBZ_LIBS)
36 +cdc_la_LDFLAGS = -module -avoid-version
38 cdc_la_SOURCES = cdc.c cdc-helper.c
39 -cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
40 +cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBZ_LIBS)
42 AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS) \
43 -shared -nostartfiles $(LIBZ_CFLAGS)
44 --- glusterfs-3.5.0/configure.ac.orig 2014-05-18 15:51:39.493655451 +0200
45 +++ glusterfs-3.5.0/configure.ac 2014-05-18 16:29:11.676941834 +0200
47 # CDC xlator - check if libz is present if so enable HAVE_LIB_Z
48 echo -n "checking if libz is present... "
50 -PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0],
51 +PKG_CHECK_MODULES([LIBZ], [zlib >= 1.2.0],
52 [echo "yes (features requiring zlib enabled)" AC_DEFINE(HAVE_LIB_Z, 1, [define if zlib is present])],