richard: server/kolabd/kolabd ChangeLog, 1.11, 1.12 Makefile.am, 1.7, 1.8 configure.ac, 1.3, 1.4

[cvs at intevation.de]

Author: richard

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv5393

Modified Files:
	ChangeLog Makefile.am configure.ac 
Log Message:
* configure.ac: added --enable/--disable-openpkg configure options,
  by default openpkg is enabled.  When disabled, the files kolab,
  namespace/kolab and rc.kolabd are not distributed as they are
  openpkg specific.
* Makefile.am: added support for --enable/--disable-openpkg option

Nice milestone: this looks like the first change that actually adds
new functionality using autotools to kolab



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ChangeLog	17 Dec 2005 11:10:31 -0000	1.11
+++ ChangeLog	17 Dec 2005 13:22:46 -0000	1.12
@@ -1,3 +1,10 @@
+2005-12-17 Richard Bos <richard at radoeka.nl> and Marcus Hüwe <suse-tux at gmx.de>
+	* configure.ac: added --enable/--disable-openpkg configure options,
+	  by default openpkg is enabled.  When disabled, the files kolab,
+	  namespace/kolab and rc.kolabd are not distributed as they are
+	  openpkg specific.
+	* Makefile.am: added support for --enable/--disable-openpkg option
+
 2005-12-17 Richard Bos <richard at radoeka.nl>
 	* dist_conf/common: replaced resmgr_filter with resmgr_filterdir and
 	  freebusy_cachefile with freebusy_cachedir

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.am	14 Dec 2005 19:35:46 -0000	1.7
+++ Makefile.am	17 Dec 2005 13:22:46 -0000	1.8
@@ -10,10 +10,15 @@
 kolabconfdir = $(sysconfdir)/kolab
 
 kolabdir = $(sysconfdir)/kolab
-dist_kolab_SCRIPTS = \
+
+if OPENPKG
+  KOLAB_SCRIPTS_FILES = kolab
+endif
+
+dist_kolab_SCRIPTS = $(KOLAB_SCRIPTS_FILES) \
 	kolab_sslcert.sh \
 	kolab_ca.sh \
-	kolab kolab_bootstrap \
+	kolab_bootstrap \
 	workaround.sh \
 	kolabquotawarn \
 	kolab_upgrade \
@@ -133,14 +138,19 @@
 EXTRA_DIST += kolabcheckperm
 
 
-kolabbin_FILE = namespace/kolab \
-	kolabpasswd
-
 kolabbindir = $(bindir)
-dist_kolabbin_DATA = $(kolabbin_FILE)
 
-kolabrcdir = $(kolab_rcdir)
-dist_kolabrc_DATA = rc.kolabd
+if OPENPKG
+  KOLABBIN_FILES = namespace/kolab
+endif
+
+dist_kolabbin_DATA = kolabpasswd $(KOLABBIN_FILES)
+
+
+if OPENPKG
+  kolabrcdir = $(kolab_rcdir)
+  dist_kolabrc_DATA = rc.kolabd
+endif
 
 #srcdir = .
 
@@ -531,6 +541,8 @@
 	chmod +744 $(DESTDIR)$(sbindir)/kolabconf
 	chmod +744 $(DESTDIR)$(sbindir)/kolabcheckperm
 	chmod +755 $(DESTDIR)$(kolabrcdir)/$(kolabrc_FILE)
+if OPENPKG
 	chmod +744 $(DESTDIR)$(bindir)/kolab
 	chmod +755 $(DESTDIR)$(bindir)/kolabpasswd
+endif
 

Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/configure.ac,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- configure.ac	22 Nov 2005 14:21:58 -0000	1.3
+++ configure.ac	17 Dec 2005 13:22:46 -0000	1.4
@@ -18,6 +18,16 @@
    [distribution=$srcdir/dist_conf/kolab])
 AC_SUBST_FILE(distribution)
 
+AC_ARG_ENABLE([openpkg],
+  [AC_HELP_STRING([--enable-openpkg],
+    [Special Files for the openpkg platform])],
+  [case "${enableval}" in
+    yes) openpkg=true ;;
+	 no)  openpkg=false ;;
+	 *)   AC_MSG_ERROR(bad value ${enableval} for --enable-openpkg) ;;
+  esac],[openpkg=true])
+AM_CONDITIONAL(OPENPKG, test x$openpkg = xtrue)
+
 # Checks for libraries.
 
 # Checks for header files.