103 lines
4.8 KiB
Diff
103 lines
4.8 KiB
Diff
diff -uNr zarafa-7.1.10.orig/common/Makefile.am zarafa-7.1.10/common/Makefile.am
|
|
--- zarafa-7.1.10.orig/common/Makefile.am 2014-06-28 03:18:12.316839074 +0200
|
|
+++ zarafa-7.1.10/common/Makefile.am 2014-06-28 03:18:21.703838676 +0200
|
|
@@ -34,7 +34,7 @@
|
|
-I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/common \
|
|
-I${top_srcdir}/libfreebusy $(MYSQL_INCLUDES)
|
|
|
|
-libcommon_mapi_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION}
|
|
+libcommon_mapi_la_LDFLAGS = ${AM_LDFLAGS} -release ${PACKAGE_VERSION}
|
|
libcommon_mapi_la_SOURCES = CommonUtil.cpp \
|
|
rtfutil.cpp \
|
|
codepage.cpp \
|
|
@@ -60,7 +60,7 @@
|
|
MAPIErrors.cpp
|
|
libcommon_mapi_la_LIBADD = -lpthread ${ICU_LIBS}
|
|
|
|
-libcommon_util_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION}
|
|
+libcommon_util_la_LDFLAGS = ${AM_LDFLAGS} -release ${PACKAGE_VERSION}
|
|
libcommon_util_la_SOURCES = platform.cpp \
|
|
platform.linux.cpp \
|
|
md5.cpp \
|
|
@@ -101,14 +101,14 @@
|
|
libcommon_util_la_LIBADD += ${ICU_LIBS}
|
|
endif
|
|
|
|
-libcommon_ssl_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION}
|
|
+libcommon_ssl_la_LDFLAGS = ${AM_LDFLAGS} -release ${PACKAGE_VERSION}
|
|
libcommon_ssl_la_SOURCES = \
|
|
SSLUtil.cpp \
|
|
ECChannelClient.cpp \
|
|
ECChannel.cpp
|
|
libcommon_ssl_la_LIBADD = -lpthread ${SSL_LIBS}
|
|
|
|
-libcommon_service_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION}
|
|
+libcommon_service_la_LDFLAGS = ${AM_LDFLAGS} -release ${PACKAGE_VERSION}
|
|
libcommon_service_la_SOURCES = ECDatabaseMySQL.cpp
|
|
libcommon_service_la_LIBADD = ${MYSQL_LIBS}
|
|
|
|
diff -uNr zarafa-7.1.10.orig/ECtools/zarafa-search/Makefile.am zarafa-7.1.10/ECtools/zarafa-search/Makefile.am
|
|
--- zarafa-7.1.10.orig/ECtools/zarafa-search/Makefile.am 2014-06-28 03:18:12.288839075 +0200
|
|
+++ zarafa-7.1.10/ECtools/zarafa-search/Makefile.am 2014-06-28 03:19:03.032836925 +0200
|
|
@@ -12,8 +12,8 @@
|
|
${top_builddir}/common/libcommon_mapi.la \
|
|
${top_builddir}/common/libcommon_util.la \
|
|
${top_builddir}/common/libcommon_ssl.la \
|
|
- ${top_builddir}/common/libcommon_service.la \
|
|
- ${top_builddir}/ECtools/zarafa-archiver/libarchiver.la \
|
|
+ ${top_builddir}/common/libcommon_service.la \
|
|
+ ${top_builddir}/ECtools/zarafa-archiver/libarchiver.la \
|
|
$(PROG_LIBS) $(SSL_LIBS) $(KYOTOCABINET_LIBS) $(CLUCENE_LIBS) \
|
|
$(BOOST_SYSTEM_LIBS) $(BOOST_FILESYSTEM_LIBS)
|
|
|
|
diff -uNr zarafa-7.1.10.orig/libfreebusy/Makefile.am zarafa-7.1.10/libfreebusy/Makefile.am
|
|
--- zarafa-7.1.10.orig/libfreebusy/Makefile.am 2014-06-28 03:18:12.207839078 +0200
|
|
+++ zarafa-7.1.10/libfreebusy/Makefile.am 2014-06-28 03:18:21.704838676 +0200
|
|
@@ -6,7 +6,7 @@
|
|
|
|
libfreebusy_la_includedir = $(includedir)/libfreebusy
|
|
|
|
-libfreebusy_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION}
|
|
+libfreebusy_la_LDFLAGS = ${AM_LDFLAGS} -release ${PACKAGE_VERSION}
|
|
|
|
libfreebusy_la_include_HEADERS = ECEnumFBBlock.h ECFBBlockList.h \
|
|
ECFreeBusyData.h ECFreeBusySupport.h ECFreeBusyUpdate.h freebusy.h \
|
|
diff -uNr zarafa-7.1.10.orig/provider/common/Makefile.am zarafa-7.1.10/provider/common/Makefile.am
|
|
--- zarafa-7.1.10.orig/provider/common/Makefile.am 2014-06-28 03:18:12.229839077 +0200
|
|
+++ zarafa-7.1.10/provider/common/Makefile.am 2014-06-28 03:18:21.704838676 +0200
|
|
@@ -1,4 +1,4 @@
|
|
-noinst_LTLIBRARIES = libzarafacommon.la
|
|
+pkglib_LTLIBRARIES = libzarafacommon.la
|
|
|
|
AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS) $(GSOAP_CFLAGS) \
|
|
$(BOOST_CPPFLAGS) \
|
|
diff -uNr zarafa-7.1.10.orig/provider/libserver/Makefile.am zarafa-7.1.10/provider/libserver/Makefile.am
|
|
--- zarafa-7.1.10.orig/provider/libserver/Makefile.am 2014-06-28 03:18:12.223839078 +0200
|
|
+++ zarafa-7.1.10/provider/libserver/Makefile.am 2014-06-28 03:18:21.704838676 +0200
|
|
@@ -1,4 +1,4 @@
|
|
-noinst_LTLIBRARIES = libserver.la
|
|
+pkglib_LTLIBRARIES = libserver.la
|
|
|
|
AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS) $(BOOST_CPPFLAGS) \
|
|
-I${top_srcdir}/mapi4linux/include \
|
|
diff -uNr zarafa-7.1.10.orig/provider/server/Makefile.am zarafa-7.1.10/provider/server/Makefile.am
|
|
--- zarafa-7.1.10.orig/provider/server/Makefile.am 2014-06-28 03:18:12.219839078 +0200
|
|
+++ zarafa-7.1.10/provider/server/Makefile.am 2014-06-28 03:18:21.704838676 +0200
|
|
@@ -18,6 +18,7 @@
|
|
${top_builddir}/common/libcommon_util.la \
|
|
${top_builddir}/common/libcommon_mapi.la \
|
|
${top_builddir}/common/libcommon_ssl.la \
|
|
+ ${top_builddir}/mapi4linux/src/libmapi.la \
|
|
$(PROG_LIBS) \
|
|
$(BOOST_FILESYSTEM_LIBS) $(BOOST_SYSTEM_LIBS) $(ICU_LIBS) $(DL_LIBS) \
|
|
$(SSL_LIBS) $(TCMALLOC_LIBS) -lrt
|
|
diff -uNr zarafa-7.1.10.orig/provider/soap/Makefile.am zarafa-7.1.10/provider/soap/Makefile.am
|
|
--- zarafa-7.1.10.orig/provider/soap/Makefile.am 2014-06-28 03:18:12.219839078 +0200
|
|
+++ zarafa-7.1.10/provider/soap/Makefile.am 2014-06-28 03:19:39.184835393 +0200
|
|
@@ -1,4 +1,4 @@
|
|
-noinst_LTLIBRARIES = libsoapserver.la libsoapclient.la
|
|
+pkglib_LTLIBRARIES = libsoapserver.la libsoapclient.la
|
|
|
|
AM_CPPFLAGS = ${ZCPPFLAGS}
|
|
|