From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 10 Feb 2011 01:04:36 +0000 (+1100)
Subject: ldb: added a include/ldb_version.h
X-Git-Tag: tevent-0.9.11~801
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7fac3258f7ec52e44998276e848a27c03d7fe0b6;p=thirdparty%2Fsamba.git

ldb: added a include/ldb_version.h

this fixes a problem with the installed ldb_modules.h header, which
depended on LDB_VERSION being defined.

Thanks to Simo for noticing this!

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h
index 4b1a5fb7088..ff0ebe7c092 100644
--- a/source4/lib/ldb/include/ldb.h
+++ b/source4/lib/ldb/include/ldb.h
@@ -49,6 +49,7 @@
 #include <stdbool.h>
 #include <talloc.h>
 #include <tevent.h>
+#include "ldb_version.h"
 #include "ldb_errors.h"
 
 /*
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index 81d2adcfd39..24d541b78ca 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -56,8 +56,6 @@ def configure(conf):
         if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
             conf.env.ENABLE_LDAP_BACKEND = True
 
-    conf.DEFINE('LDB_VERSION', VERSION, quote=True)
-
     conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True)
 
     # we don't want any libraries or modules to rely on runtime
@@ -135,6 +133,15 @@ def build(bld):
                           abi_directory = 'ABI',
                           abi_match = abi_match)
 
+        # generate a include/ldb_version.h
+        t = bld.SAMBA_GENERATOR('ldb_version.h',
+                                rule='echo "#define LDB_VERSION \\"${LDB_VERSION}\\"" > ${TGT}',
+                                target='include/ldb_version.h',
+                                public_headers='include/ldb_version.h')
+        t.env.LDB_VERSION = VERSION
+        bld.add_manual_dependency(bld.path.find_or_declare('include/ldb_version.h'), VERSION)
+
+
 
         bld.SAMBA_PYTHON('pyldb', 'pyldb.c',
                          deps='ldb pyldb-util',