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

  Ok... for _today_ ...

  This patch conditionally builds against openssl 0.9.6b _if_ openssl is
  unpacked and properly built (using pretty much the defaults) in the
  srclib/openssl/ directory.  Someday soon this needs to be more exhaustive,
  but this should solve the 80% problem :)


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

Makefile.win

+41 −2
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
# so the server root should be given in forward slashes (quoted),

# preferably with the drive designation!



default:        _apacher



!IF !EXIST("srclib\apr")

!MESSAGE Please check out or download and unpack the Apache Portability Runtime

!MESSAGE sources (apr and apr-util) into your $(INSTDIR)\srclib directory.
@@ -35,6 +37,29 @@ 
!ERROR Need $(INSTDIR)\srclib\apr-util

!ENDIF



# Note; tryssl: is only used by the msvc developer studio environment to 'fix up'

#	the build, since conditional dependencies aren't supported

#

!IF EXIST("srclib\openssl")

!IF "$(LONG)" == "Debug"

SSLBIN=out32dll.dbg

!ELSE

SSLBIN=out32dll

!ENDIF

tryssl:

	cd modules\ssl

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

	cd ..\..

	cd modules\tls

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

	cd ..\..

!ELSE

tryssl:

	echo mod_ssl and mod_tls will not build without openssl installed

	echo in $(INSTDIR)\srclib\openssl.  They must be precompiled using

	echo the ms/ntdll.mak file.  See INSTALL.W32 for details.

!ENDIF



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

INSTDIR=\Apache2

!MESSAGE Using default install directory $(INSTDIR)
@@ -51,8 +76,6 @@ MAKEOPT=-s -N 
!ENDIF

!ENDIF



default:        _apacher



_apacher: 

	$(MAKE) $(MAKEOPT) -f Makefile.win SHORT=R LONG=Release _build
@@ -132,6 +155,14 @@ _build: 
#	cd modules\proxy

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

#       cd ..\..

!IF EXIST("srclib\openssl")

	cd modules\ssl

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

	cd ..\..

	cd modules\tls

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

	cd ..\..

!ENDIF

	cd support

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

         $(MAKE) $(MAKEOPT) -f htpasswd.mak CFG="htpasswd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -175,6 +206,14 @@ _install: 
	copy modules\metadata\$(LONG)\mod_headers.so "$(INSTDIR)\modules"

	copy modules\metadata\$(LONG)\mod_usertrack.so "$(INSTDIR)\modules"

#       copy modules\proxy\$(LONG)\mod_proxy.so "$(INSTDIR)\modules"

!IF EXIST("srclib\openssl")

	-copy modules\ssl\$(LONG)\mod_ssl.so "$(INSTDIR)\modules"

	-copy modules\tls\$(LONG)\mod_tls.so "$(INSTDIR)\modules"

	-copy srclib\openssl\$(SSLBIN)\openssl.exe "$(INSTDIR)\bin"

	-copy srclib\openssl\$(SSLBIN)\libeay32.dll "$(INSTDIR)\bin"

	-copy srclib\openssl\$(SSLBIN)\ssleay32.dll "$(INSTDIR)\bin"

!ENDIF

        copy support\$(LONG)\ "$(INSTDIR)\bin"

        copy support\$(LONG)\ab.exe "$(INSTDIR)\bin"

        copy support\$(LONG)\htpasswd.exe "$(INSTDIR)\bin"

	copy support\$(LONG)\htdigest.exe "$(INSTDIR)\bin"

modules/ssl/mod_ssl.mak

+1132 −3

File changed.

Preview size limit exceeded, changes collapsed.

modules/tls/mod_tls.mak

+47 −3
Original line number Diff line number Diff line
@@ -164,10 +164,10 @@ CLEAN : 
    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"



CPP=cl.exe

CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../os/win32" /I\

CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "../../include" /I "../../os/win32" /I\

 "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I\

 "../../srclib/openssl/inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS"\

 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_tls" /FD /c 

 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_tls" /FD /ZI /c 

CPP_OBJS=.\Debug/

CPP_SBRS=.
@@ -212,7 +212,7 @@ LINK32=link.exe 
LINK32_FLAGS=kernel32.lib ssleay32.lib libeay32.lib /nologo /subsystem:windows\

 /dll /incremental:no /pdb:"$(OUTDIR)\mod_tls.pdb" /map:"$(INTDIR)\mod_tls.map"\

 /debug /machine:I386 /out:"$(OUTDIR)\mod_tls.so"\

 /implib:"$(OUTDIR)\mod_tls.lib" /libpath:"../../srclib/openssl/out32dll"\

 /implib:"$(OUTDIR)\mod_tls.lib" /libpath:"../../srclib/openssl/out32dll.dbg"\

 /base:@..\..\os\win32\BaseAddr.ref,mod_tls 

LINK32_OBJS= \

	"$(INTDIR)\mod_tls.obj" \
@@ -368,6 +368,50 @@ NODEP_CPP_MOD_T=\ 
SOURCE=.\openssl_state_machine.c

DEP_CPP_OPENS=\

	"..\..\srclib\apr\include\apr.h"\

	"..\..\srclib\openssl\inc32\openssl\asn1.h"\

	"..\..\srclib\openssl\inc32\openssl\bio.h"\

	"..\..\srclib\openssl\inc32\openssl\blowfish.h"\

	"..\..\srclib\openssl\inc32\openssl\bn.h"\

	"..\..\srclib\openssl\inc32\openssl\buffer.h"\

	"..\..\srclib\openssl\inc32\openssl\cast.h"\

	"..\..\srclib\openssl\inc32\openssl\comp.h"\

	"..\..\srclib\openssl\inc32\openssl\crypto.h"\

	"..\..\srclib\openssl\inc32\openssl\des.h"\

	"..\..\srclib\openssl\inc32\openssl\dh.h"\

	"..\..\srclib\openssl\inc32\openssl\dsa.h"\

	"..\..\srclib\openssl\inc32\openssl\e_os2.h"\

	"..\..\srclib\openssl\inc32\openssl\ebcdic.h"\

	"..\..\srclib\openssl\inc32\openssl\err.h"\

	"..\..\srclib\openssl\inc32\openssl\evp.h"\

	"..\..\srclib\openssl\inc32\openssl\idea.h"\

	"..\..\srclib\openssl\inc32\openssl\lhash.h"\

	"..\..\srclib\openssl\inc32\openssl\md2.h"\

	"..\..\srclib\openssl\inc32\openssl\md4.h"\

	"..\..\srclib\openssl\inc32\openssl\md5.h"\

	"..\..\srclib\openssl\inc32\openssl\mdc2.h"\

	"..\..\srclib\openssl\inc32\openssl\obj_mac.h"\

	"..\..\srclib\openssl\inc32\openssl\objects.h"\

	"..\..\srclib\openssl\inc32\openssl\opensslconf.h"\

	"..\..\srclib\openssl\inc32\openssl\opensslv.h"\

	"..\..\srclib\openssl\inc32\openssl\pem.h"\

	"..\..\srclib\openssl\inc32\openssl\pem2.h"\

	"..\..\srclib\openssl\inc32\openssl\pkcs7.h"\

	"..\..\srclib\openssl\inc32\openssl\rc2.h"\

	"..\..\srclib\openssl\inc32\openssl\rc4.h"\

	"..\..\srclib\openssl\inc32\openssl\rc5.h"\

	"..\..\srclib\openssl\inc32\openssl\ripemd.h"\

	"..\..\srclib\openssl\inc32\openssl\rsa.h"\

	"..\..\srclib\openssl\inc32\openssl\safestack.h"\

	"..\..\srclib\openssl\inc32\openssl\sha.h"\

	"..\..\srclib\openssl\inc32\openssl\ssl.h"\

	"..\..\srclib\openssl\inc32\openssl\ssl2.h"\

	"..\..\srclib\openssl\inc32\openssl\ssl23.h"\

	"..\..\srclib\openssl\inc32\openssl\ssl3.h"\

	"..\..\srclib\openssl\inc32\openssl\stack.h"\

	"..\..\srclib\openssl\inc32\openssl\symhacks.h"\

	"..\..\srclib\openssl\inc32\openssl\tls1.h"\

	"..\..\srclib\openssl\inc32\openssl\x509.h"\

	"..\..\srclib\openssl\inc32\openssl\x509_vfy.h"\

	".\openssl_state_machine.h"\