70 lines
2.2 KiB
Diff
70 lines
2.2 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-6.40.10.orig//ECtools/Makefile.am zarafa-6.40.10/ECtools/Makefile.am
|
|
--- zarafa-6.40.10.orig//ECtools/Makefile.am 2011-07-25 20:03:46.527000045 +0200
|
|
+++ zarafa-6.40.10/ECtools/Makefile.am 2011-07-25 20:04:37.900000042 +0200
|
|
@@ -1,10 +1,3 @@
|
|
-if ! OSS_ONLY
|
|
-PROSUBS = zarafa-backup zarafa-report
|
|
-if WITH_PYTHON
|
|
-PROSUBS += za-extra
|
|
-endif
|
|
-endif
|
|
-
|
|
if WITH_TESTTOOLS
|
|
TESTSUBS = ECTestTools
|
|
endif
|
|
diff -uNr zarafa-6.40.10.orig//Makefile.am zarafa-6.40.10/Makefile.am
|
|
--- zarafa-6.40.10.orig//Makefile.am 2011-07-25 20:03:46.610000045 +0200
|
|
+++ zarafa-6.40.10/Makefile.am 2011-07-25 20:05:12.960000054 +0200
|
|
@@ -1,10 +1,6 @@
|
|
AUTOMAKE_OPTIONS = 1.9 foreign
|
|
ACLOCAL_AMFLAGS = -Iautoconf
|
|
|
|
-if ! OSS_ONLY
|
|
-PROSUBS = liblicense licensed
|
|
-endif
|
|
-
|
|
SUBDIRS = common libfreebusy zarafa-libsync mapi4linux $(PROSUBS) provider libicalmapi inetmapi php-ext ECtools spooler gateway caldav installer po doc
|
|
|
|
if WITH_SWIG
|
|
@@ -26,10 +22,6 @@
|
|
common/ecversion.h: versionheader.sh
|
|
sh ${top_srcdir}/versionheader.sh > common/ecversion.h
|
|
|
|
-if ! OSS_ONLY
|
|
-CLEANFILES=common/ecversion.h
|
|
-endif
|
|
-
|
|
dist-hook:
|
|
find $(distdir) -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true
|
|
if OSS_ONLY
|
|
diff -uNr zarafa-6.40.10.orig//configure.ac zarafa-6.40.10/configure.ac
|
|
--- zarafa-6.40.10.orig//configure.ac 2011-07-25 20:03:46.747000046 +0200
|
|
+++ zarafa-6.40.10/configure.ac 2011-07-25 20:06:33.002000046 +0200
|
|
@@ -819,18 +819,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
|
|
- debian/zarafa.install
|
|
- ECtools/za-extra/Makefile
|
|
-])
|
|
-fi
|
|
|
|
AC_OUTPUT
|
|
|