richard: server/kolab-webadmin/kolab-webadmin kolab-webadmin.spec.in, 1.14, 1.15 ChangeLog, 1.14, 1.15 configure.ac, 1.21, 1.22

[cvs at intevation.de]

Author: richard

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv12701

Modified Files:
	kolab-webadmin.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.
* kolab-webadmin.spec.in: replaced --enable-dist with --with-dist



Index: kolab-webadmin.spec.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/kolab-webadmin.spec.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- kolab-webadmin.spec.in	11 Jan 2006 06:32:06 -0000	1.14
+++ kolab-webadmin.spec.in	14 Jan 2006 22:16:05 -0000	1.15
@@ -59,7 +59,7 @@
 	www/admin/kolab/versions.php
 
 %build
-    ./configure -prefix=%{l_prefix}
+    ./configure -prefix=%{l_prefix} --with-dist=kolab
 
 %install
     rm -rf $RPM_BUILD_ROOT

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ChangeLog	3 Jan 2006 22:04:37 -0000	1.14
+++ ChangeLog	14 Jan 2006 22:16:05 -0000	1.15
@@ -1,4 +1,12 @@
+2006-01-14 Marcus Hüwe <suse-tux at gmx.de>
+	Patch commited 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.
+	* kolab-webadmin.spec.in: replaced --enable-dist with --with-dist
+
 2006-01-03 Richard Bos <richard at radoeka.nl>
+
 	* Makefile.am: distribute only the files to be distributed
 	  from the dist_conf directory
 	  Added a distclean-local rule to remove the directory autom4te.cache

Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/configure.ac,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- configure.ac	19 Dec 2005 21:57:43 -0000	1.21
+++ configure.ac	14 Jan 2006 22:16:05 -0000	1.22
@@ -8,11 +8,15 @@
 AM_INIT_AUTOMAKE([gnu] [1.7] [dist-bzip2] [no-dist-gzip])
 AC_PREFIX_DEFAULT([/usr])
 
-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)
 
 common=dist_conf/common