Use ol_version.h

diff --git a/clients/tools/ldapcompare.dsp b/clients/tools/ldapcompare.dsp
index ab31707cdc08a276a693a4c5c7d431a6275367b8..a6b9613eb3d60c86830aebe11bceedf57760c84a 100644 (file)
--- a/clients/tools/ldapcompare.dsp
+++ b/clients/tools/ldapcompare.dsp
@@ -148,6 +148,25 @@ SOURCE=.\common.c
 # Begin Source File
 
 SOURCE=.\ldapcompare.c
+
+!IF "$CFG)" == "ldapcompare - Win32 Release"
+
+# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
+
+!ELSEIF "$(CFG)" == "ldapcompare - Win32 Debug"
+
+# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
+
+!ELSEIF "$(CFG)" == "ldapcompare - Win32 Single Debug"
+
+# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
+
+!ELSEIF "$(CFG)" == "ldapcompare - Win32 Single Release"
+
+# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
+
+!ENDIF
+
 # End Source File
 # End Target
 # End Project

diff --git a/clients/tools/ldapdelete.dsp b/clients/tools/ldapdelete.dsp
index c136d67c8a08be01b2ea034e5000c1b87ae01b84..9140cbdbbfb51cc57643c1800c7a47b067053fc6 100644 (file)
--- a/clients/tools/ldapdelete.dsp
+++ b/clients/tools/ldapdelete.dsp
@@ -148,6 +148,25 @@ SOURCE=.\common.c
 # Begin Source File
 
 SOURCE=.\ldapdelete.c
+
+!IF "$CFG)" == "ldapdelete - Win32 Release"
+
+# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
+
+!ELSEIF "$(CFG)" == "ldapdelete - Win32 Debug"
+
+# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
+
+!ELSEIF "$(CFG)" == "ldapdelete - Win32 Single Debug"
+
+# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
+
+!ELSEIF "$(CFG)" == "ldapdelete - Win32 Single Release"
+
+# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
+
+!ENDIF
+
 # End Source File
 # End Target
 # End Project

diff --git a/clients/tools/ldapmodify.dsp b/clients/tools/ldapmodify.dsp
index ffa4e68df826bf48d4ab0091b99a58d5206b3444..459110a98741f43fac5610aa89b4145e694deea0 100644 (file)
--- a/clients/tools/ldapmodify.dsp
+++ b/clients/tools/ldapmodify.dsp
@@ -148,6 +148,25 @@ SOURCE=.\common.c
 # Begin Source File
 
 SOURCE=.\ldapmodify.c
+
+!IF "$CFG)" == "ldapmodify - Win32 Release"
+
+# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
+
+!ELSEIF "$(CFG)" == "ldapmodify - Win32 Debug"
+
+# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
+
+!ELSEIF "$(CFG)" == "ldapmodify - Win32 Single Debug"
+
+# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
+
+!ELSEIF "$(CFG)" == "ldapmodify - Win32 Single Release"
+
+# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
+
+!ENDIF
+
 # End Source File
 # End Target
 # End Project

diff --git a/clients/tools/ldapmodrdn.dsp b/clients/tools/ldapmodrdn.dsp
index d1304ce84cad6127c3781bae6e0cb3e1af1b1459..9ffe8882333e895da1bb1b485b140f4d74a20ef5 100644 (file)
--- a/clients/tools/ldapmodrdn.dsp
+++ b/clients/tools/ldapmodrdn.dsp
@@ -148,6 +148,25 @@ SOURCE=.\common.c
 # Begin Source File
 
 SOURCE=.\ldapmodrdn.c
+
+!IF "$CFG)" == "ldapmodrdn - Win32 Release"
+
+# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
+
+!ELSEIF "$(CFG)" == "ldapmodrdn - Win32 Debug"
+
+# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
+
+!ELSEIF "$(CFG)" == "ldapmodrdn - Win32 Single Debug"
+
+# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
+
+!ELSEIF "$(CFG)" == "ldapmodrdn - Win32 Single Release"
+
+# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
+
+!ENDIF
+
 # End Source File
 # End Target
 # End Project

diff --git a/clients/tools/ldappasswd.dsp b/clients/tools/ldappasswd.dsp
index 7aa142c7d4dd224d1743db149348ff92e13fe6aa..5f6a18605624177f2a1a5389bdf9cad3913e327a 100644 (file)
--- a/clients/tools/ldappasswd.dsp
+++ b/clients/tools/ldappasswd.dsp
@@ -144,6 +144,25 @@ SOURCE=.\common.c
 # Begin Source File
 
 SOURCE=.\ldappasswd.c
+
+!IF "$CFG)" == "ldappasswd - Win32 Release"
+
+# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
+
+!ELSEIF "$(CFG)" == "ldappasswd - Win32 Debug"
+
+# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
+
+!ELSEIF "$(CFG)" == "ldappasswd - Win32 Single Debug"
+
+# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
+
+!ELSEIF "$(CFG)" == "ldappasswd - Win32 Single Release"
+
+# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
+
+!ENDIF
+
 # End Source File
 # End Target
 # End Project

diff --git a/clients/tools/ldapsearch.dsp b/clients/tools/ldapsearch.dsp
index de7f3e97234e4b8a859477450dc54ec60fa2d9a2..2b2d2f7000b0ccce7efd3523fa5ff027befda80e 100644 (file)
--- a/clients/tools/ldapsearch.dsp
+++ b/clients/tools/ldapsearch.dsp
@@ -148,6 +148,25 @@ SOURCE=.\common.c
 # Begin Source File
 
 SOURCE=.\ldapsearch.c
+
+!IF "$CFG)" == "ldapsearch - Win32 Release"
+
+# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
+
+!ELSEIF "$(CFG)" == "ldapsearch - Win32 Debug"
+
+# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
+
+!ELSEIF "$(CFG)" == "ldapsearch - Win32 Single Debug"
+
+# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
+
+!ELSEIF "$(CFG)" == "ldapsearch - Win32 Single Release"
+
+# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
+
+!ENDIF
+
 # End Source File
 # End Target
 # End Project

diff --git a/clients/tools/ldapwhoami.dsp b/clients/tools/ldapwhoami.dsp
index c4bdaa014a9db5b18059ec48115808238347932b..daf953b7fda89a60683a1c6c2f71051418ba3f72 100644 (file)
--- a/clients/tools/ldapwhoami.dsp
+++ b/clients/tools/ldapwhoami.dsp
@@ -144,6 +144,25 @@ SOURCE=.\common.c
 # Begin Source File
 
 SOURCE=.\ldapwhoami.c
+
+!IF "$CFG)" == "ldapwhoami - Win32 Release"
+
+# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
+
+!ELSEIF "$(CFG)" == "ldapwhoami - Win32 Debug"
+
+# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
+
+!ELSEIF "$(CFG)" == "ldapwhoami - Win32 Single Debug"
+
+# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
+
+!ELSEIF "$(CFG)" == "ldapwhoami - Win32 Single Release"
+
+# ADD CPP /D _OLV_CWD=\"$(OutDir)\"
+
+!ENDIF
+
 # End Source File
 # End Target
 # End Project

diff --git a/include/setup.mak b/include/setup.mak
index 1a4c8de9167995430b1ae2c3f1e60415649bb071..116cc0136bd9495944a522fc5f9f4c8771ca13d6 100644 (file)
--- a/include/setup.mak
+++ b/include/setup.mak
@@ -9,7 +9,7 @@
 .nt.h:
        copy $*.nt $*.h
 
-all: setup.txt
+all: setup.txt ol_version0.h
 
 setup.txt: lber_types.h ldap_config.h ldap_features.h portable.h setup.mak
        copy setup.mak setup.txt
@@ -18,3 +18,6 @@ lber_types.h: lber_types.nt
 ldap_config.h: ldap_config.nt
 ldap_features.h: ldap_features.nt
 portable.h: portable.nt
+
+ol_version0.h: ../build/version.h
+       $(CPP) /EP /D_OLV_PKG=\"OpenLDAP\" /D_OLV_VER=\"2.1.16\" -D_OLV_WHO=\"$(USERNAME)@$(COMPUTERNAME)\" $? > $@