richard: server/kolabd/kolabd kolabd.spec.in, 1.3, 1.4 ChangeLog, 1.41, 1.42 configure.ac, 1.7, 1.8

[cvs at intevation.de]

Author: richard

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

Modified Files:
	kolabd.spec.in ChangeLog configure.ac 
Log Message:
* configure.ac: replaced --enable-dist with --with-dist
  Added dist_conf file check.  If dist_conf file specified with
  --with-dist is not present fail configure.
* kolabd.spec.in: replaced --enable-dist with --with-dist



Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolabd.spec.in	21 Dec 2005 14:31:01 -0000	1.3
+++ kolabd.spec.in	14 Jan 2006 22:16:20 -0000	1.4
@@ -89,7 +89,7 @@
     %setup -q
 
 %build
-    ./configure --prefix=%{l_prefix} --enable-dist=kolab
+    ./configure --prefix=%{l_prefix} --with-dist=kolab
     %{l_make} %{l_mflags}
 
 %install

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- ChangeLog	9 Jan 2006 22:09:08 -0000	1.41
+++ ChangeLog	14 Jan 2006 22:16:20 -0000	1.42
@@ -1,3 +1,10 @@
+2006-01-14 Marcus Hüwe <suse-tux at gmx.de>
+	Patch committed by Richard Bos
+	* configure.ac: replaced --enable-dist with --with-dist
+	  Added dist_conf file check.  If dist_conf file specified with
+	  --with-dist is not present fail configure.
+	* kolabd.spec.in: replaced --enable-dist with --with-dist
+
 2006-01-09 Richard Bos <richard at radoeka.nl>
 	* Makefile.am: install templates/rc.conf.template only on openpkg
 	  installations.

Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/configure.ac,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- configure.ac	4 Jan 2006 22:03:59 -0000	1.7
+++ configure.ac	14 Jan 2006 22:16:20 -0000	1.8
@@ -11,11 +11,15 @@
 common=dist_conf/common
 AC_SUBST_FILE(common)
 
-AC_ARG_ENABLE([dist],
-  [AC_HELP_STRING([--enable-dist=DIST],
+AC_ARG_WITH([dist],
+  [AC_HELP_STRING([--with-dist=DIST],
      [distribution target (default: openpkg)])],
-     [distribution=$srcdir/dist_conf/$enable_dist],
+     [distribution=$srcdir/dist_conf/$withval],
    [distribution=$srcdir/dist_conf/kolab])
+
+AS_IF([test -f $distribution],,
+	AC_MSG_ERROR([incorrect value for --with-dist: $withval])
+)
 AC_SUBST_FILE(distribution)
 
 AC_ARG_WITH([openpkg],