richard: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.17, 1.18 Makefile.am, 1.31, 1.32 configure.ac, 1.22, 1.23

[cvs at intevation.de]

Author: richard

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

Modified Files:
	ChangeLog Makefile.am configure.ac 
Log Message:
php/admin/templates/versions.tpl.in: show openpkg information when
installed on an openpkg system only.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ChangeLog	17 Jan 2006 19:20:20 -0000	1.17
+++ ChangeLog	17 Jan 2006 22:06:42 -0000	1.18
@@ -2,6 +2,12 @@
 	Patch committed by Richard Bos
 	* www/admin/kolab/versions.php.in: use rpm package name variables for
 	  the software package version query's
+	* php/admin/templates/versions.tpl: moved to
+	  php/admin/templates/versions.tpl.in
+	* php/admin/templates/versions.tpl.in: show openpkg information when
+	  installed on an openpkg system only.
+	* Makefile.am: process php/admin/templates/versions.tpl.in
+	* configure.ac: add --with-openpkg cmdline argument
 
 2006-01-15 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- Makefile.am	15 Jan 2006 21:05:54 -0000	1.31
+++ Makefile.am	17 Jan 2006 22:06:42 -0000	1.32
@@ -132,7 +132,6 @@
 	php/admin/templates/maintainerlistall.tpl \
 	php/admin/templates/domainmaintainerlistall.tpl \
 	php/admin/templates/kolab.tpl \
-	php/admin/templates/versions.tpl \
 	php/admin/templates/addrlistall.tpl \
 	php/admin/templates/forward.tpl \
 	php/admin/templates/deliver.tpl \
@@ -149,7 +148,9 @@
 	php/admin/templates/admindeleted.tpl
 
 phptemplatesdir = $(phpkolabdir)/templates
-dist_phptemplates_DATA = $(PHP_TEMPLATES)
+phptemplates_DATA = $(PHP_TEMPLATES) \
+	php/admin/templates/versions.tpl
+EXTRA_DIST += $(PHP_TEMPLATES)
 
 
 ### i18n stuff
@@ -218,6 +219,16 @@
 	$(do_subst) <$(srcdir)/php/admin/templates/page.tpl.in >$@
 CLEANFILES += php/admin/templates/page.tpl
 EXTRA_DIST += php/admin/templates/page.tpl.in
+
+php/admin/templates/versions.tpl:
+	@$(mkinstalldirs) php/admin/templates
+if OPENPKG
+	sed 's/^@OPENPKG@//' <$(srcdir)/php/admin/templates/versions.tpl.in >$@
+else
+	sed 's/^@OPENPKG at .*//' <$(srcdir)/php/admin/templates/versions.tpl.in >$@
+endif
+CLEANFILES += php/admin/templates/versions.tpl
+EXTRA_DIST += php/admin/templates/versions.tpl.in
 
 www/admin/logout.php:
 	@$(mkinstalldirs) www/admin

Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/configure.ac,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- configure.ac	14 Jan 2006 22:16:05 -0000	1.22
+++ configure.ac	17 Jan 2006 22:06:42 -0000	1.23
@@ -22,6 +22,16 @@
 common=dist_conf/common
 AC_SUBST_FILE(common)
 
+AC_ARG_WITH([openpkg],
+  [AC_HELP_STRING([--with-openpkg],
+    [Special Files for the openpkg platform])],
+  [case "${withval}" in
+    yes) openpkg=true ;;
+	 no)  openpkg=false ;;
+	 *)   AC_MSG_ERROR(bad value ${withval} for --with-openpkg) ;;
+  esac],[openpkg=true])
+AM_CONDITIONAL(OPENPKG, test x$openpkg = xtrue)
+
 # Checks for libraries.
 
 # Checks for header files.