zarafa/net-mail/zarafa/files/7.1.13.51032/zarafa-01-oss-configure.patch

67 lines
2.3 KiB
Diff

diff -uNr zarafa-7.1.12.orig/doc/Makefile.am zarafa-7.1.12/doc/Makefile.am
--- zarafa-7.1.12.orig/doc/Makefile.am 2015-06-25 16:32:25.293104280 +0200
+++ zarafa-7.1.12/doc/Makefile.am 2015-06-25 16:33:06.344305789 +0200
@@ -10,10 +10,6 @@
zarafa-msr.1 zarafa-msr.cfg.5 zarafa-msr-verify.1 za-aclsync.1 za-aclset.1 zarafa-backup.cfg.5 za-restore.1 \
zarafa-set-oof.1 zarafa-mailbox-permissions.1 zarafa-autorespond.1
-if ! OSS_ONLY
-allpages += zarafa-ws.1 zarafa-ws.cfg.5
-endif
-
CLEANFILES = zarafa-cfgchecker.1
man_MANS=$(BUILT_SOURCES) $(allpages)
diff -uNr zarafa-7.1.12.orig/ECtools/Makefile.am zarafa-7.1.12/ECtools/Makefile.am
--- zarafa-7.1.12.orig/ECtools/Makefile.am 2015-06-25 16:32:25.282103958 +0200
+++ zarafa-7.1.12/ECtools/Makefile.am 2015-06-25 16:33:06.345305818 +0200
@@ -1,5 +1,4 @@
if ! OSS_ONLY
-PROSUBS = zarafa-backup zarafa-report zarafa-msr za-extra zarafa-ocf zarafa-ws
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.12.orig/Makefile.am zarafa-7.1.12/Makefile.am
--- zarafa-7.1.12.orig/Makefile.am 2015-06-25 16:32:25.170100679 +0200
+++ zarafa-7.1.12/Makefile.am 2015-06-25 16:34:50.198343769 +0200
@@ -1,9 +1,5 @@
ACLOCAL_AMFLAGS = -I autoconf
-if ! OSS_ONLY
-PROSUBS = liblicense licensed libtimezone libcalendar
-endif
-
SUBDIRS = external common libfreebusy mapi4linux zarafa-libsync $(PROSUBS) provider libicalmapi inetmapi
if WITH_PHP
SUBDIRS += php-ext
diff -uNr zarafa-7.1.12.orig/configure.ac zarafa-7.1.12/configure.ac
--- zarafa-7.1.12.orig/configure.ac 2015-06-25 16:32:25.288104133 +0200
+++ zarafa-7.1.12/configure.ac 2015-06-25 16:34:27.790688479 +0200
@@ -832,26 +832,6 @@
version
specialbuild
])
-dnl non-oss files
-if test -d `dirname $0`/licensed; then
-AC_CONFIG_FILES([
- liblicense/Makefile
- licensed/Makefile
- libtimezone/Makefile
- libcalendar/Makefile
- libcalendar/src/Makefile
- libcalendar/include/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
- ECtools/zarafa-ws/Makefile
- ECtools/zarafa-ws/etc/Makefile
- testunit/Makefile
-])
-fi
AC_OUTPUT