Attached is a patch which fixes current problem for
--enable-module=most flag (which includes src/modules/proxy) on the
Cygwin platform.
Main problem is that the Makefile of proxy is too OS/2 specific
hardcoded and we have to tweak a bit here for the shared target to get
it compiled cleanly on Cygwin.
Here are the changes:
* src/Configure: changed OS_MODULE_INCLUDE var for the Cygwin
platform block to refer to the (absolute) relative path for the
Makefile.Cygwin file.
* src/modules/proxy/Makefile.tmpl: target libproxy.dll is hardcoded
for OS/2. That's not good. We have the same target on Cygwin, but use
other calls for it, so if construct here.
* src/modules/standard/Makefile.Cygwin: adding a dummy target %.def
: %.c to satisfy OS/2 related dependacies on Cygwin too. Changed the
"run make twice" screen slightly.
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/Configure apache-1.3-cygwin/src/Configure
--- apache-1.3/src/Configure Mon Oct 8 20:59:36 2001
+++ apache-1.3-cygwin/src/Configure Thu Dec 13 21:11:10 2001
@@ -1419,7 +1425,7 @@
LIBS_SHLIB='$(EXTRA_LIBS)'
SHARED_CORE_EP='lib$(TARGET).ep'
SHCORE_IMPLIB='lib$(TARGET).dll'
- OS_MODULE_INCLUDE='Makefile.Cygwin'
+ OS_MODULE_INCLUDE='$(SRCDIR)/modules/standard/Makefile.Cygwin'
;;
*)
## ok, no known explict support for shared objects
diff -ur apache-1.3/src/modules/proxy/Makefile.tmpl
apache-1.3-cygwin/src/modules/proxy/Makefile.tmpl
--- apache-1.3/src/modules/proxy/Makefile.tmpl Thu Jun 22 23:22:36 2000
+++ apache-1.3-cygwin/src/modules/proxy/Makefile.tmpl Sat Nov 10 17:02:58 2001
@@ -21,10 +21,18 @@
rm -f $@
$(LD_SHLIB) $(LDFLAGS_SHLIB) -o $@ $(OBJS_PIC) $(LIBS_SHLIB)
-libproxy.dll: $(OBJS_PIC) mod_proxy.def
- $(LD_SHLIB) $(LDFLAGS_SHLIB) -o $* $(OBJS_PIC) $(LIBS_SHLIB)
- emxbind -b -q -s -h0 -dmod_proxy.def $* && \
- rm $*
+libproxy.dll: $(OBJS_PIC) mod_proxy.def
+ if [ "x$(OS)" = "xCygwin" ]; then \
+ rm -f $@; \
+ if [ -f "$(SRCDIR)/$(SHCORE_IMPLIB)" ]; then \
+ $(LD_SHLIB) $(LDFLAGS_SHLIB) -o $*.dll $(OBJS_PIC) $(LIBS_SHLIB) \
+ $(SRCDIR)/$(SHCORE_IMPLIB) $(LIBS1); \
+ fi \
+ else \
+ $(LD_SHLIB) $(LDFLAGS_SHLIB) -o $* $(OBJS_PIC) $(LIBS_SHLIB); \
+ emxbind -b -q -s -h0 -dmod_proxy.def $* && \
+ rm $*; \
+ fi
.SUFFIXES: .o .lo .dll
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 Fri Sep 28 11:29:02 2001
+++ apache-1.3-cygwin/src/modules/standard/Makefile.Cygwin Sat Nov 10 17:05:50
+2001
@@ -28,23 +28,30 @@
$(SRCDIR)/$(SHCORE_IMPLIB) $(LIBS1)
endef
+%.def : %.c
+ touch $*.def
+
%.lo : %.c
$(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $< && mv $*.o $*.lo
%.dll : %.lo
@if [ -f "$(SRCDIR)/$(SHCORE_IMPLIB)" ]; then \
+ rm -f $(SRCDIR)/$(SHCORE_IMPLIB).$$; \
echo $(shared_dll); \
$(shared_dll); \
else \
- echo "+--------------------------------------------------------+"; \
- echo "| There is no shared core 'libhttpd.dll' available! |"; \
- echo "| |"; \
- echo "| This is obviously your first 'make' run with configure |"; \
- echo "| flag SHARED_CORE enabled and shared modules. |"; \
- echo "| |"; \
- echo "| You will have to re-run 'make' after this run builds |"; \
- echo "| the required shared import library! |"; \
- echo "+--------------------------------------------------------+"; \
- sleep 10; \
+ if [ ! -f "$(SRCDIR)/$(SHCORE_IMPLIB).$$" ]; then \
+ echo "+--------------------------------------------------------+"; \
+ echo "| There is no shared core 'libhttpd.dll' available! |"; \
+ echo "| |"; \
+ echo "| This is obviously your first 'make' run with configure |"; \
+ echo "| flag SHARED_CORE enabled and shared modules. |"; \
+ echo "| |"; \
+ echo "| You will have to re-run 'make' after this run builds |"; \
+ echo "| the required shared import library! |"; \
+ echo "+--------------------------------------------------------+"; \
+ sleep 10; \
+ touch $(SRCDIR)/$(SHCORE_IMPLIB).$$; \
+ fi; \
fi;
