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

  Modify Makefile.win to install the ssl-enabled abs.exe binary
  as 'bin/ab.exe' if srclib/openssl exists.  Adds abs to the Apache.dsw
  IDE workspace.


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

Apache.dsw

+18 −0
Original line number Diff line number Diff line
@@ -129,6 +129,24 @@ Package=<4> 


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



Project: "abs"=".\support\abs.dsp" - Package Owner=<4>



Package=<5>

{{{

}}}



Package=<4>

{{{

    Begin Project Dependency

    Project_Dep_Name apr

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name aprutil

    End Project Dependency

}}}



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



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



Package=<5>

Makefile.win

+16 −6
Original line number Diff line number Diff line
@@ -54,17 +54,21 @@ tryssl: 
	cd modules\tls

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

	cd ..\..

	cd support

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

	cd ..\..

!ELSE

	msdev Apache.dsw /MAKE\

		"mod_ssl - Win32 $(LONG)"\

		"mod_tls - Win32 $(LONG)" /NORECURSE $(CTARGET)

		"mod_tls - Win32 $(LONG)"\

		"abs - Win32 $(LONG)" /NORECURSE $(CTARGET)

!ENDIF



!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.

	echo mod_ssl, mod_tls and ab/ssl will not build without openssl 

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

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

!ENDIF



!IF "$(INSTDIR)" == ""
@@ -169,6 +173,9 @@ _build: 
	cd modules\tls

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

	cd ..\..

	cd support

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

	cd ..

!ENDIF

	cd support

         $(MAKE) $(MAKEOPT) -f ab.mak CFG="ab - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -230,7 +237,8 @@ _build: 
!IF EXIST("srclib\openssl")

	msdev Apache.dsw /MAKE\

		"mod_ssl - Win32 $(LONG)"\

		"mod_tls - Win32 $(LONG)" /NORECURSE $(CTARGET)

		"mod_tls - Win32 $(LONG)"\

		"abs - Win32 $(LONG)" /NORECURSE $(CTARGET)

!ENDIF



!ENDIF
@@ -337,8 +345,10 @@ _install: 


--------------------------------------------------------------------------------

<<

!ENDIF

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

!ELSE

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

!ENDIF

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

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

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