62 lines
1.7 KiB
Diff
62 lines
1.7 KiB
Diff
From: Jan Engelhardt <jengelh@inai.de>
|
|
Upstream: never?
|
|
|
|
build: make autoreconf functional
|
|
|
|
Make autoreconf functional with the OSS edition.
|
|
|
|
---
|
|
ECtools/Makefile.am | 1 -
|
|
Makefile.am | 4 ----
|
|
configure.ac | 13 -------------
|
|
3 files changed, 18 deletions(-)
|
|
|
|
Index: zarafa-7.1.1/ECtools/Makefile.am
|
|
===================================================================
|
|
--- zarafa-7.1.1.orig/ECtools/Makefile.am
|
|
+++ zarafa-7.1.1/ECtools/Makefile.am
|
|
@@ -1,5 +1,4 @@
|
|
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
|
|
Index: zarafa-7.1.1/Makefile.am
|
|
===================================================================
|
|
--- zarafa-7.1.1.orig/Makefile.am
|
|
+++ zarafa-7.1.1/Makefile.am
|
|
@@ -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
|
|
Index: zarafa-7.1.1/configure.ac
|
|
===================================================================
|
|
--- zarafa-7.1.1.orig/configure.ac
|
|
+++ zarafa-7.1.1/configure.ac
|
|
@@ -786,19 +786,6 @@ AC_CONFIG_FILES([Makefile
|
|
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
|
|
|