diff options
| author | Richard Bos <richard@radoeka.nl> | 2006-01-14 22:16:05 (GMT) |
|---|---|---|
| committer | Richard Bos <richard@radoeka.nl> | 2006-01-14 22:16:05 (GMT) |
| commit | 8dac76052598a4075c5841bc60e432f5f8d8b583 (patch) | |
| tree | e28c06d08cf667eeaf59d770eb205189ecf9b94d | |
| parent | 1c07b360b3c5ada6d96cd0a2b66fca2b5d631402 (diff) | |
| download | kolab-webadmin-8dac76052598a4075c5841bc60e432f5f8d8b583.tar.gz | |
* 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
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | kolab-webadmin.spec.in | 2 |
3 files changed, 16 insertions, 4 deletions
@@ -1,4 +1,12 @@ +2006-01-14 Marcus Hüwe <suse-tux@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@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 diff --git a/configure.ac b/configure.ac index 58f59aa..84a4181 100644 --- a/configure.ac +++ b/configure.ac @@ -8,11 +8,15 @@ AC_CONFIG_AUX_DIR(.) 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 diff --git a/kolab-webadmin.spec.in b/kolab-webadmin.spec.in index 6526389..2570e66 100644 --- a/kolab-webadmin.spec.in +++ b/kolab-webadmin.spec.in @@ -59,7 +59,7 @@ AutoReqProv: no www/admin/kolab/versions.php %build - ./configure -prefix=%{l_prefix} + ./configure -prefix=%{l_prefix} --with-dist=kolab %install rm -rf $RPM_BUILD_ROOT |