New makefile and README from Craig Huckabee
PR:
Obtained from:
Submitted by:
Reviewed by:
diff --git a/win32/README.mingw32 b/win32/README.mingw32
index d0c716f..fca828b 100644
--- a/win32/README.mingw32
+++ b/win32/README.mingw32
@@ -1,40 +1,5 @@
-Steps for building mod_dtcl under NT for Apache with MingW32
-(http://www.mingw.org/).
+Steps for building mod_dtcl under NT for Apache with MingW32 (http://www.mingw.org/). 1) Get Apache for NT/2000, I used version 1.3.X. You can use the binary release or build it from source. I built from source because I needed to also includemod_ssl. Note that I used VC++ to build Apache - they don't support MingW32 yet AFAIK.2) Edit the win32\makefile in the mod_dtcl source tree to reflect your environment, i.e. where is Tcl installed, where is Apache installed, whereare your Apache sources and object files, etc.3) Apply the diffs for Apache. The diff for Apache wraps a few declarations and one #include directive in the os.h file that aren't needed or used with the MingW32 compiler. I used GNU patch to do this with : patch -c -b < os.h.diff
-1) Get Apache for NT, I used version 1.3.X. You can use the binary release
-or build it from source. I built from source because I needed to also include
-mod_ssl. Note that I used VC++ to build Apache - they don't support MingW32
-yet AFAIK.
-
-2) Edit the win32\makefile in the mod_dtcl source tree to reflect
-your environment, i.e. where is Tcl installed, where is Apache installed, where
-are your Apache sources and object files, etc.
-
-3) Apply the diffs for Apache. The diff for Apache wraps a few
-declarations and one #include directive in the os.h file that aren't needed or
-used with the MingW32 compiler. I used GNU patch to do this with :
-
- patch -c -b < os.h.diff
-
-4) Run make. There will be some warnings about a redefinition -
-you can ignore it. You should be left with a file called ApacheModuleDtcl.dll.
-If you are using Apache 1.3.17 or newer that uses .so files for modules, you can
-run 'make so_style' to get a mod_dtcl.so. Or you can simply rename the dll :)
-
-5) Run make install. Make the changes to your Apache configuration as
-described on the mod_dtcl documentation, and you are off.
-
-Notes :
-
- -- Tcl needs to be in the path of the web server
- -- These instructions assume you have the MingW32 gcc setup as well
- as a good collection of GNU tools on your NT machine (sed, grep, etc).
- They also assume you have Tcl setup.
- -- You will need a fairly recent version of the MingW32 toolset and the
- associated win32api fileset - see http://www.mingw.org for details on
- obtaining new releases.
- -- I've tried my best to make these instructions error free but
- mistakes are possible.
-
-Good Luck,
-Craig
+ NOTE: This patch may not apply cleanly as this file has changed in each revision of
+ Apache. What the patch does is pretty obvious so it can be applied by hand if
+ needed.4) Run make. There will be some warnings about a redefinition - you can ignore it. You should be left with a file called ApacheModuleDtcl.dll.If you are using Apache 1.3.17 or newer that uses .so files for modules, you canrun 'make so_style' to get a mod_dtcl.so. Or you can simply rename the dll :) 5) Run make install. Make the changes to your Apache configuration as described on the mod_dtcl documentation, and you are off.Notes : -- Tcl needs to be in the path of the web server -- These instructions assume you have the MingW32 gcc setup as well as a good collection of GNU tools on your NT machine (sed, grep, etc). They also assume you have Tcl setup. -- You will need a fairly recent version of the MingW32 toolset and the associated win32api fileset - see http://www.mingw.org for details on obtaining new releases. -- I've tried my best to make these instructions error free but mistakes are possible. Good Luck,Craig
\ No newline at end of file
diff --git a/win32/makefile b/win32/makefile
index 4e103ac..ec71801 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -13,12 +13,13 @@
#
# Set this to your TCL version
#
-TCL_VERSION = 83
+# TCL_VERSION = 83
+TCL_VERSION = 84
#
# Set TCL_HOME to where you have installed Tcl
#
-TCL_HOME = C:\\Progra~1\\Tcl
+TCL_HOME = C:\\"Program Files\\Tcl"
TCL_INC = $(TCL_HOME)\\include
TCL_LIB = $(TCL_HOME)\\lib
@@ -32,7 +33,7 @@
# NOTE: You must apply the diff to the os.h file as described in the
# readme, and this directory must contain built sources, e.g. object files
#
-APACHE_SRC = ..\\apache
+APACHE_SRC = ..\\..\\apache
#
# Set APACHE_INC to where the APACHE source include files live. This default
@@ -53,8 +54,8 @@
# Set APACHE_STYLE to "OLD" for versions before 1.3.17, or "NEW" for the newer
# versions of Apache (i.e. 1.3.17 or newer). Some file locations changed
# between versions and this affects the build process
-APACHE_STYLE = OLD
-#APACHE_STYLE = NEW
+#APACHE_STYLE = OLD
+APACHE_STYLE = NEW
#
@@ -138,11 +139,6 @@
-@rm $(APACHE_DEF)
echo EXPORTS > $(APACHE_DEF)
nm $(APACHE_EXP) |grep " U _" | sed "s/.* U _//" >> $(APACHE_DEF)
- sed -e "s/ap_log_error$$/ap_log_error@0/g" \
- -e "s/ap_log_rerror$$/ap_log_rerror@0/g" \
- -e "s/ap_table_do$$/ap_table_do@0/g" \
- $(APACHE_DEF) > $(APACHE_DEF).new
- mv $(APACHE_DEF).new $(APACHE_DEF)
dlltool --def $(APACHE_DEF) --dllname ApacheCore.dll \
--output-lib $(TEMP_LIBS)\libapachecore.a -k
