Attached is a patch against cvs of 2002-05-28 with changes for the Cygwin platform build process. Again, everything is designed not to hurt other platforms.
The changes are: * src/helpers/binbuild.sh: adding a MAKERERUN variable to run "make" twice on Cygwin platforms while binbuild.sh is executed. This is necessary because the we need to link shared modules against the shared core library, which is not present throughout the first make run, so we need to run it twice. Cygwin now has the same configure flags in binbuild.sh as other unix flavors. * src/helpers/install.sh: this is a long standing issue. The patch fixes the "make install" problem we still see with .exe files. I hope this is suitable to all for commitment. * src/modules/standard/Makefile.Cygwin: minor text changes to indicate we use the filename "cyghttpd.dll" instead of "libhttpd.dll" as shared core lib. Stipe [EMAIL PROTECTED] ------------------------------------------------------------------- Wapme Systems AG M�nsterstr. 248 40470 D�sseldorf Tel: +49-211-74845-0 Fax: +49-211-74845-299 E-Mail: [EMAIL PROTECTED] Internet: http://www.wapme-systems.de ------------------------------------------------------------------- wapme.net - wherever you are
diff -ur apache-1.3/src/helpers/binbuild.sh apache-1.3-cygwin/src/helpers/binbuild.sh --- apache-1.3/src/helpers/binbuild.sh Wed May 15 15:27:55 2002 +++ apache-1.3-cygwin/src/helpers/binbuild.sh Tue May 28 11:15:10 2002 @@ -7,10 +7,11 @@ # See http://www.apache.org/docs/LICENSE OS=`src/helpers/GuessOS` +MAKERERUN="no" case "x$OS" in x*OS390*) CONFIGPARAM="--with-layout=BinaryDistribution --enable-module=most";; - *cygwin*) CONFIGPARAM="--with-layout=BinaryDistribution --enable-module=most \ - --enable-rule=SHARED_CORE --libexecdir=bin";; + *cygwin*) CONFIGPARAM="--with-layout=BinaryDistribution --enable-module=most +--enable-shared=max" + MAKERERUN="yes";; *) CONFIGPARAM="--with-layout=BinaryDistribution --enable-module=most --enable-shared=max";; esac APDIR=`pwd` @@ -55,6 +56,7 @@ rm -rf bindist install-bindist.sh *.bindist echo "----------------------------------------------------------------------" && \ make && \ + if [ "x$MAKERERUN" = "xyes" ]; then make; fi && \ echo "----------------------------------------------------------------------" && \ make install-quiet root="bindist/" && \ echo "----------------------------------------------------------------------" && \ diff -ur apache-1.3/src/helpers/install.sh apache-1.3-cygwin/src/helpers/install.sh --- apache-1.3/src/helpers/install.sh Tue Jun 12 10:24:53 2001 +++ apache-1.3-cygwin/src/helpers/install.sh Tue May 28 11:15:10 2002 @@ -89,12 +89,8 @@ # Check if we need to add an executable extension (such as ".exe") # on specific OS to src and dst -if [ -f "$src.exe" ]; then - if [ -f "$src" ]; then - : # Cygwin [ test ] is too stupid to do [ -f "$src.exe" ] && [ ! -f "$src" ] - else - ext=".exe" - fi +if [ -f "$src.exe" ] && [ ! -f "$src." ]; then + ext=".exe" fi src="$src$ext" dst="$dst$ext" diff -ur apache-1.3/src/modules/standard/Makefile.Cygwin apache-1.3-cygwin/src/modules/standard/Makefile.Cygwin --- apache-1.3/src/modules/standard/Makefile.Cygwin Thu Jan 17 12:20:51 2002 +++ apache-1.3-cygwin/src/modules/standard/Makefile.Cygwin Tue May 28 11:15:10 +2002 @@ -4,7 +4,7 @@ # On Cygwin OS the user needs to run twice "make" if shared modules have # been requested using the --enable-shared=<module> configure flag. # This is because when we pass the module mod_foo.c we have no import -# library, usually src/libhttpd.dll to link against in this case. So the +# library, usually src/cyghttpd.dll to link against in this case. So the # two "make" runs do the following: # # 1st run: builds all static modules and links everything to the @@ -42,7 +42,7 @@ else \ if [ ! -f "$(SRCDIR)/$(SHCORE_IMPLIB).$$" ]; then \ echo "+--------------------------------------------------------+"; \ - echo "| There is no shared core 'libhttpd.dll' available! |"; \ + echo "| There is no shared core 'cyghttpd.dll' available! |"; \ echo "| |"; \ echo "| This is obviously your first 'make' run with configure |"; \ echo "| flag SHARED_CORE enabled and shared modules. |"; \
