Commit 2c621051 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

Catch up to apr-util-1.3.0, build apr_ldap always, and 

conditionally build DBD_LIST members.

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

Apache.dsw

+129 −0
Changes for Apache.dsw: 129 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -96,6 +96,9 @@ Package=<4> 
    Project_Dep_Name ApacheMonitor

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name apr_ldap

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name libapriconv_ces_modules

    End Project Dependency

    Begin Project Dependency
@@ -438,6 +441,132 @@ Package=<4> 


###############################################################################



Project: "apr_dbd_freetds"=".\srclib\apr-util\dbd\apr_dbd_freetds.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_dbd_mysql"=".\srclib\apr-util\dbd\apr_dbd_mysql.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_dbd_oracle"=".\srclib\apr-util\dbd\apr_dbd_oracle.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_dbd_pgsql"=".\srclib\apr-util\dbd\apr_dbd_pgsql.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_dbd_sqlite2"=".\srclib\apr-util\dbd\apr_dbd_sqlite2.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_dbd_sqlite3"=".\srclib\apr-util\dbd\apr_dbd_sqlite3.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>

{{{

}}}



Package=<4>

{{{

    Begin Project Dependency

    Project_Dep_Name libapr

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name libaprutil

    End Project Dependency

}}}



###############################################################################



Project: "dftables"=.\srclib\pcre\dftables.dsp - Package Owner=<4>



Package=<5>

BuildBin.dsp

+2 −2
Changes for BuildBin.dsp: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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 _tryssl _tryzlib _dummy"

# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Release _trydbd _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 _tryssl _tryzlib _dummy"

# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Debug _trydbd _tryssl _tryzlib _dummy"

# PROP Rebuild_Opt ""

# PROP Target_File "\Apache2\bin\httpd.exe"

# PROP Bsc_Name ".\Browse\httpd.bsc"

Makefile.win

+45 −1
Changes for Makefile.win: 45 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -22,6 +22,12 @@ 
#

#   ALL         (unset)     Includes additional modules for build testing

#

# Provide a DBD_LIST argument after configuring LIB and INCLUDE with

# the SDK paths of the corresponding client support libraries.

# Note that at this time, none of these are supported on win32, per say.

#

#     DBD_LIST="sqlite3 pgsql oracle mysql freetds"

#

# For example;

#

#   nmake -f Makefile.win PORT=80 INSTDIR="d:\Program Files\Apache" installr
@@ -123,6 +129,36 @@ _tryzlib: 


!ENDIF





!IFDEF DBD_LIST



_trydbd:

!IF $(USEMAK) == 1

        cd srclib\apr-util\dbd & \

	  for %d in ($(DBD_LIST)) do \

	    $(MAKE) $(MAKEOPT) -f apr_dbd_%d.mak CFG="apr_dbd_%d - $(LONG)" RECURSE=0 $(CTARGET)

        cd ..



!ELSEIF $(USESLN) == 1

	for %d in ($(DBD_LIST)) do \

	  devenv Apache.sln /useenv $(CTARGET) $(LONG) /project apr_dbd_%d

!ELSE

	@for %d in ($(DBD_LIST)) do \

	  msdev Apache.dsw /USEENV /MAKE \

		"apr_dbd_%d - Win32 $(LONG)" /NORECURSE $(CTARGET)

!ENDIF



!ELSE

#     no DBD_LIST



_trydbd:

	@echo -----

	@echo apr_dbd drivers will not build unless DBD_LIST is set to the list

	@echo of all the client modules available in the LIB and INCLUDE path.



!ENDIF





!IF "$(INSTDIR)" == ""

INSTDIR=\Apache2x

!ENDIF
@@ -229,7 +265,9 @@ _build: 
	cd ..\..\..

	 $(MAKE) $(MAKEOPT) -f aprutil.mak         CFG="aprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)

	 $(MAKE) $(MAKEOPT) -f libaprutil.mak      CFG="libaprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)

	cd ..\..

        cd ldap

	 $(MAKE) $(MAKEOPT) -f apr_ldap.mak    CFG="apr_ldap - $(ARCH)" RECURSE=0 $(CTARGET)

        cd ..\..\..

	cd srclib\pcre

	 $(MAKE) $(MAKEOPT) -f dftables.mak        CFG="dftables - Win32 $(LONG)" RECURSE=0 $(CTARGET)

	 $(MAKE) $(MAKEOPT) -f pcre.mak            CFG="pcre - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -470,6 +508,12 @@ _copybin: 
	copy srclib\apr\$(LONG)\libapr-1.$(src_dll) 		"$(inst_dll)" <.y

	copy srclib\apr-iconv\$(LONG)\libapriconv-1.$(src_dll) 	"$(inst_dll)" <.y

	copy srclib\apr-util\$(LONG)\libaprutil-1.$(src_dll) 	"$(inst_dll)" <.y

	copy srclib\apr-util\ldap\$(LONG)\apr_ldap-1.$(src_dll) "$(inst_dll)" <.y

!IFDEF DBD_LIST

	for %d in ($(DBD_LIST)) do ( \

	  copy srclib\apr-util\dbd\$(LONG)\apr_dbd_%d-1.$(src_dll) "$(inst_dll)" <.y && \

	)

!ENDIF

	copy modules\aaa\$(LONG)\mod_access_compat.$(src_so) 	"$(inst_so)" <.y

	copy modules\aaa\$(LONG)\mod_auth_basic.$(src_so) 	"$(inst_so)" <.y

	copy modules\aaa\$(LONG)\mod_auth_digest.$(src_so) 	"$(inst_so)" <.y