54 lines
2.0 KiB
Diff
54 lines
2.0 KiB
Diff
Patch by Robert Scheck <robert@fedoraproject.org> for zarafa >= 6.40.0, which only
|
|
removes the paths from autoconf/automake related files, that don't exist in the OSS
|
|
version of Zarafa. Having these paths not removed causes autoreconf to fail, but a
|
|
re-run of autoreconf is needed in order to get the rpaths completely out of all the
|
|
libraries and binaries built during the make process.
|
|
|
|
forward patch by Mario Fetka <mario.fetka@gmail.com>
|
|
|
|
diff -uNr zarafa-7.1.3.orig/configure.ac zarafa-7.1.3/configure.ac
|
|
--- zarafa-7.1.3.orig/configure.ac 2013-02-28 16:46:43.297471480 +0100
|
|
+++ zarafa-7.1.3/configure.ac 2013-02-28 16:51:10.269133875 +0100
|
|
@@ -786,19 +786,6 @@
|
|
version
|
|
specialbuild
|
|
])
|
|
-dnl non-oss files
|
|
-if test -d `dirname $0`/licensed; then
|
|
-AC_CONFIG_FILES([
|
|
- liblicense/Makefile
|
|
- licensed/Makefile
|
|
- ECtools/zarafa-backup/Makefile
|
|
- ECtools/zarafa-backup/helpers/Makefile
|
|
- ECtools/zarafa-report/Makefile
|
|
- ECtools/zarafa-msr/Makefile
|
|
- ECtools/zarafa-ocf/Makefile
|
|
- ECtools/za-extra/Makefile
|
|
-])
|
|
-fi
|
|
|
|
AC_OUTPUT
|
|
|
|
diff -uNr zarafa-7.1.3.orig/ECtools/Makefile.am zarafa-7.1.3/ECtools/Makefile.am
|
|
--- zarafa-7.1.3.orig/ECtools/Makefile.am 2013-02-28 16:46:43.114473768 +0100
|
|
+++ zarafa-7.1.3/ECtools/Makefile.am 2013-02-28 16:49:37.728290795 +0100
|
|
@@ -1,5 +1 @@
|
|
-if ! OSS_ONLY
|
|
-PROSUBS = zarafa-backup zarafa-report zarafa-msr za-extra zarafa-ocf
|
|
-endif
|
|
-
|
|
SUBDIRS = $(PROSUBS) zarafa-archiver zarafa-admin zarafa-monitor zarafa-passwd zarafa-fsck zarafa-cfgchecker zarafa-stats zarafa-search zarafa-utils
|
|
diff -uNr zarafa-7.1.3.orig/Makefile.am zarafa-7.1.3/Makefile.am
|
|
--- zarafa-7.1.3.orig/Makefile.am 2013-02-28 16:46:43.051474555 +0100
|
|
+++ zarafa-7.1.3/Makefile.am 2013-02-28 16:50:06.153935425 +0100
|
|
@@ -1,9 +1,5 @@
|
|
ACLOCAL_AMFLAGS = -I autoconf
|
|
|
|
-if ! OSS_ONLY
|
|
-PROSUBS = liblicense licensed
|
|
-endif
|
|
-
|
|
SUBDIRS = common libfreebusy mapi4linux zarafa-libsync $(PROSUBS) provider libicalmapi inetmapi php-ext ECtools spooler gateway caldav installer po doc
|
|
|
|
if WITH_SWIG
|