richard: server/kolab-resource-handlers/kolab-resource-handlers kolab-resource-handlers.spec.in, 1.3, 1.4 ChangeLog, 1.9, 1.10 configure.ac, 1.3, 1.4

cvs at intevation.de cvs at intevation.de
Sat Jan 14 23:16:58 CET 2006


Author: richard

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers
In directory doto:/tmp/cvs-serv12762

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



Index: kolab-resource-handlers.spec.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/kolab-resource-handlers.spec.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolab-resource-handlers.spec.in	20 Dec 2005 17:57:13 -0000	1.3
+++ kolab-resource-handlers.spec.in	14 Jan 2006 22:16:56 -0000	1.4
@@ -32,7 +32,7 @@
 %setup -q
 
 %build
-%configure --prefix=/kolab
+%configure --prefix=/kolab --with-dist=kolab
 
 %install
 %__make DESTDIR=%{buildroot} install

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ChangeLog	3 Jan 2006 22:06:57 -0000	1.9
+++ ChangeLog	14 Jan 2006 22:16:56 -0000	1.10
@@ -1,3 +1,11 @@
+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-resource-handlers.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

Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/configure.ac,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- configure.ac	19 Dec 2005 21:58:18 -0000	1.3
+++ configure.ac	14 Jan 2006 22:16:56 -0000	1.4
@@ -10,11 +10,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)
 
 # Checks for libraries.





More information about the commits mailing list