git-svn-id: svn://svn.debian.org/svn/modvhostldap@8 4dd36cbf-e3fd-0310-983d-db0e06859cf4

diff --git a/Makefile b/Makefile
index 6c1dbb3118cc133a283430566c2005cf2dd9f50e..e08557c036f5f3264c30d9387eabdfe7fd971521 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,12 +17,13 @@ clean:
        rm -rf mod_vhost_ldap-$(VERSION).tar.gz
 
 mod_vhost_ldap.o: mod_vhost_ldap.c
-       $(APXS) -Wc,-Wall -Wc,-Werror -Wc,-g -Wc,-DDEBUG -c -lldap_r mod_vhost_ldap.c
+       $(APXS) -Wc,-Wall -Wc,-Werror -Wc,-g -Wc,-DDEBUG -Wc,-DMOD_VHOST_LDAP_VERSION=\\\"mod_vhost_ldap/$(VERSION)\\\" -c -lldap_r mod_vhost_ldap.c
 
-archive: clean
-       mkdir mod_vhost_ldap-$(VERSION)
-       cp $(DISTFILES) mod_vhost_ldap-$(VERSION)
-       tar czf mod_vhost_ldap-$(VERSION).tar.gz mod_vhost_ldap-$(VERSION)
+archive:
+       svn export svn+ssh://ondrej@svn.debian.org/svn/modvhostldap mod-vhost-ldap-`cat VERSION`;
+       tar czf ../mod-vhost-ldap-$(VERSION).tar.gz mod-vhost-ldap-$(VERSION);
+       tar cjf ../mod-vhost-ldap-$(VERSION).tar.bz2 mod-vhost-ldap-$(VERSION);
+       rm -rf mod-vhost-ldap-$(VERSION);
 
 format:
        indent *.c

diff --git a/VERSION b/VERSION
index 0c62199f16ac1e2d7f7ae75b420c1231325dff4e..abd410582dea1b6dcb53bcfd93921df71212b778 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2.1
+0.2.4

diff --git a/mod_vhost_ldap.c b/mod_vhost_ldap.c
index 13a41956e606d6a1f740b0ca0125e81422531eae..a66e069ae43a108f53dead7d342530cc5c1f3795 100644 (file)
--- a/mod_vhost_ldap.c
+++ b/mod_vhost_ldap.c
@@ -21,7 +21,6 @@
  */
 
 #define CORE_PRIVATE
-#define MOD_VHOST_LDAP_VERSION "mod_vhost_ldap/0.2.4"
 
 #include <unistd.h>
 
@@ -54,9 +53,6 @@ module AP_MODULE_DECLARE_DATA vhost_ldap_module;
 
 typedef struct mod_vhost_ldap_config_t {
     apr_pool_t *pool;                  /* Pool that this config is allocated from */
-#if APR_HAS_THREADS
-    apr_thread_mutex_t *lock;           /* Lock for this config */
-#endif
     int enabled;                       /* Is vhost_ldap enabled? */
 
     /* These parameters are all derived from the VhostLDAPURL directive */
@@ -114,10 +110,6 @@ mod_vhost_ldap_create_server_config (apr_pool_t *p, server_rec *s)
 
     cfg->pool = p;
 
-#if APR_HAS_THREADS
-    apr_thread_mutex_create(&cfg->lock, APR_THREAD_MUTEX_DEFAULT, p);
-#endif
-
     cfg->enabled = 0;
     cfg->have_ldap_url = 0;
     cfg->url = "";