wilde: server/kolab-webadmin/kolab-webadmin configure.ac, 1.27, 1.28 Makefile.am, 1.49, 1.50 ChangeLog, 1.94, 1.95
cvs at kolab.org
cvs at kolab.org
Fri Mar 14 12:16:32 CET 2008
Author: wilde
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv11117/kolab-webadmin/kolab-webadmin
Modified Files:
configure.ac Makefile.am ChangeLog
Log Message:
Fixed issue2543 (Compiling kolab packages leaves ldap.class.php)
and removed unneeded AC_CONFIG_SRCDIR line.
Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/configure.ac,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- configure.ac 6 Mar 2008 12:13:12 -0000 1.27
+++ configure.ac 14 Mar 2008 11:16:30 -0000 1.28
@@ -2,7 +2,6 @@
m4_define(_VERSION,2.1.99)
AC_INIT([kolab-webadmin],[_VERSION],[kolab-devel at kolab.org])
-AC_CONFIG_SRCDIR(php/admin/include/ldap.class.php.in)
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([gnu] [1.7] [dist-bzip2] [no-dist-gzip])
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- Makefile.am 6 Mar 2008 11:46:29 -0000 1.49
+++ Makefile.am 14 Mar 2008 11:16:30 -0000 1.50
@@ -109,7 +109,6 @@
PHP_INCLUDES = php/admin/include/menu.php \
php/admin/include/debug.php \
php/admin/include/form.class.php \
- php/admin/include/ldap.class.php \
php/admin/include/sieveutils.class.php \
php/admin/include/authenticate.php \
php/admin/include/locale.php \
@@ -119,6 +118,7 @@
phpincludesdir = $(phpkolabdir)/include
phpincludes_DATA = $(PHP_INCLUDES) \
php/admin/include/auth.class.php \
+ php/admin/include/ldap.class.php \
php/admin/include/headers.php \
php/admin/include/mysmarty.php
EXTRA_DIST += $(PHP_INCLUDES)
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- ChangeLog 13 Mar 2008 18:00:26 -0000 1.94
+++ ChangeLog 14 Mar 2008 11:16:30 -0000 1.95
@@ -1,3 +1,10 @@
+2008-03-14 Sascha Wilde <wilde at intevation.de>
+
+ * Makefile.am (phpincludesdir): Moved
+ php/admin/include/ldap.class.php to phpincludesdir_DATA
+ (Fixes issue2543).
+ * configure.ac: Removed unneeded AC_CONFIG_SRCDIR line.
+
2008-03-13 Thomas Arendsen Hein <thomas at intevation.de>
* php/admin/locale/fr/LC_MESSAGES/messages.po: Updated french
More information about the commits
mailing list