summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Wilde <wilde@intevation.de>2008-03-14 11:16:30 (GMT)
committerSascha Wilde <wilde@intevation.de>2008-03-14 11:16:30 (GMT)
commit80ac4e0503de41fbab4d95e849d20852a2bf7157 (patch)
treed38a4a51c515a922f0be10559181f4108e91294f
parentee0252a52fc2336366b0da180842c765edfbb168 (diff)
downloadkolab-webadmin-80ac4e0503de41fbab4d95e849d20852a2bf7157.tar.gz
Fixed issue2543 (Compiling kolab packages leaves ldap.class.php)
and removed unneeded AC_CONFIG_SRCDIR line.
-rw-r--r--ChangeLog7
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac1
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c6885ff..383eccd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-14 Sascha Wilde <wilde@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@intevation.de>
* php/admin/locale/fr/LC_MESSAGES/messages.po: Updated french
diff --git a/Makefile.am b/Makefile.am
index 5f778e4..614dfe0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -109,7 +109,6 @@ php_includes_config_DATA = php/admin/include/config.php
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 @@ PHP_INCLUDES = php/admin/include/menu.php \
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)
diff --git a/configure.ac b/configure.ac
index 28fcf34..9d10cb5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,6 @@ AC_PREREQ(2.57)
m4_define(_VERSION,2.1.99)
AC_INIT([kolab-webadmin],[_VERSION],[kolab-devel@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])