Catch up to apr_dbm projects

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@799069 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Apache.dsw b/Apache.dsw
index dc4bbbb73b1263c2187934fc98b52a1558f69204..690e412dc7cf8a10553f6f39e9ee16759d27dc52 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -585,6 +585,42 @@ Package=<4>
 
 ###############################################################################
 
+Project: "apr_dbm_db"=".\srclib\apr-util\dbm\apr_dbm_db.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "apr_dbm_gdbm"=".\srclib\apr-util\dbm\apr_dbm_gdbm.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "apr_ldap"=".\srclib\apr-util\ldap\apr_ldap.dsp" - Package Owner=<4>
 
 Package=<5>

diff --git a/BuildBin.dsp b/BuildBin.dsp
index 6d647f2210f8a26a3b4979a9b7514e2349b22307..2cfb293214f6950c97c6c5f46d7329f0d1f68ea4 100644 (file)
--- a/BuildBin.dsp
+++ b/BuildBin.dsp
@@ -39,7 +39,7 @@ CFG=BuildBin - Win32 Debug
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir ""
 # PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Release _trydbd _trylua _tryssl _tryzlib _dummy"
+# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Release _trydb _trylua _tryssl _tryzlib _dummy"
 # PROP Rebuild_Opt ""
 # PROP Target_File "\Apache2\bin\httpd.exe"
 # PROP Bsc_Name ".\Browse\httpd.bsc"
@@ -58,7 +58,7 @@ CFG=BuildBin - Win32 Debug
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir ""
 # PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Debug _trydbd _trylua _tryssl _tryzlib _dummy"
+# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Debug _trydb _trylua _tryssl _tryzlib _dummy"
 # PROP Rebuild_Opt ""
 # PROP Target_File "\Apache2\bin\httpd.exe"
 # PROP Bsc_Name ".\Browse\httpd.bsc"

diff --git a/Makefile.win b/Makefile.win
index c61decc9b43fa93b7bbf0ce58f6a7421cd078784..b80a60750b176d07c6e6f9f03a976b48f7bf6c0e 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -28,6 +28,12 @@
 #
 #     DBD_LIST="sqlite3 pgsql oracle mysql freetds"
 #
+# Provide a DBM_LIST argument after configuring LIB and INCLUDE with
+# the SDK paths of the corresponding client support libraries.
+# The sdbm driver is always built in.
+#
+#     DBM_LIST="db gdbm"
+#
 # For example;
 #
 #   nmake -f Makefile.win PORT=80 INSTDIR="d:\Program Files\Apache" installr
@@ -167,19 +173,27 @@ _trylua:
 !ENDIF
 
 
-_trydbd:
+_trydb:
 !IF $(USEMAK) == 1
        cd srclib\apr-util\dbd
        for %d in (odbc $(DBD_LIST)) do \
          $(MAKE) $(MAKEOPT) -f apr_dbd_%d.mak CFG="apr_dbd_%d - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+       cd ..\dbm
+       for %d in ($(DBM_LIST)) do \
+         $(MAKE) $(MAKEOPT) -f apr_dbm_%d.mak CFG="apr_dbm_%d - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..\..
 !ELSEIF $(USESLN) == 1
        for %d in (odbc $(DBD_LIST)) do \
          devenv Apache.sln /useenv $(CTARGET) $(LONG) /project apr_dbd_%d
+       for %d in ($(DBM_LIST)) do \
+         devenv Apache.sln /useenv $(CTARGET) $(LONG) /project apr_dbm_%d
 !ELSE
        @for %d in (odbc $(DBD_LIST)) do \
          msdev Apache.dsw /USEENV /MAKE \
                "apr_dbd_%d - Win32 $(LONG)" /NORECURSE $(CTARGET)
+       @for %d in ($(DBM_LIST)) do \
+         msdev Apache.dsw /USEENV /MAKE \
+               "apr_dbm_%d - Win32 $(LONG)" /NORECURSE $(CTARGET)
 !ENDIF
 
 
@@ -296,6 +310,10 @@ _build:
          for %d in (odbc $(DBD_LIST)) do \
            $(MAKE) $(MAKEOPT) -f apr_dbd_%d.mak   CFG="apr_dbd_%d - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..
+       cd dbm
+         for %d in ($(DBM_LIST)) do \
+           $(MAKE) $(MAKEOPT) -f apr_dbm_%d.mak   CFG="apr_dbm_%d - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+       cd ..
        cd ..\..
        cd server
         $(MAKE) $(MAKEOPT) -f gen_test_char.mak   CFG="gen_test_char - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -561,6 +579,9 @@ _copybin:
        for %d in (odbc $(DBD_LIST)) do ( \
          copy srclib\apr-util\dbd\$(LONG)\apr_dbd_%d-1.$(src_dll) "$(inst_dll)" <.y \
        )
+       for %d in ($(DBM_LIST)) do ( \
+         copy srclib\apr-util\dbm\$(LONG)\apr_dbm_%d-1.$(src_dll) "$(inst_dll)" <.y \
+       )
        copy srclib\pcre\pcre.$(src_dll)                        "$(inst_dll)" <.y
        copy modules\aaa\$(LONG)\mod_access_compat.$(src_so)    "$(inst_so)" <.y
        copy modules\aaa\$(LONG)\mod_auth_basic.$(src_so)       "$(inst_so)" <.y