No reason not to build charset_lite anymore on Win32

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

diff --git a/Apache.dsw b/Apache.dsw
index adc6108e16f14b7fef864ef439c3836a083ae9f5..8bf461cfe19345fe478f7954c2d8c362ae745158 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -54,6 +54,9 @@ Package=<4>
     Project_Dep_Name Apache
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name apriconv
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name ApacheMonitor
     End Project Dependency
     Begin Project Dependency
@@ -90,6 +93,9 @@ Package=<4>
     Project_Dep_Name mod_cgi
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_charset_lite
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_dav_fs
     End Project Dependency
     Begin Project Dependency
@@ -732,6 +738,27 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_charset_lite"=".\modules\experimental\mod_charset_lite.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "mod_dav"=".\modules\dav\main\mod_dav.dsp" - Package Owner=<4>
 
 Package=<5>

diff --git a/Makefile.win b/Makefile.win
index 858971295674126a4051b94068b9e83be9da2852..fe13f0196e1f771c7e7804149ad6b523b8db9187 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -218,6 +218,7 @@ _build:
        cd ..\..\..
        cd modules\experimental
         $(MAKE) $(MAKEOPT) -f mod_cache.mak       CFG="mod_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_mem_cache.mak   CFG="mod_mem_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_disk_cache.mak  CFG="mod_disk_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_ext_filter.mak  CFG="mod_ext_filter - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -368,6 +369,7 @@ _install:
        copy modules\dav\fs\$(LONG)\mod_dav_fs.so "$(INSTDIR)\modules" <.y
        copy modules\dav\main\$(LONG)\mod_dav.so "$(INSTDIR)\modules" <.y
        copy modules\experimental\$(LONG)\mod_cache.so "$(INSTDIR)\modules" <.y
+       copy modules\experimental\$(LONG)\mod_charset_lite.so "$(INSTDIR)\modules" <.y
        copy modules\experimental\$(LONG)\mod_mem_cache.so "$(INSTDIR)\modules" <.y
        copy modules\experimental\$(LONG)\mod_disk_cache.so "$(INSTDIR)\modules" <.y
        copy modules\experimental\$(LONG)\mod_ext_filter.so "$(INSTDIR)\modules" <.y
@@ -416,6 +418,7 @@ _install:
        copy modules\dav\fs\$(LONG)\mod_dav_fs.pdb "$(INSTDIR)\modules" <.y
        copy modules\dav\main\$(LONG)\mod_dav.pdb "$(INSTDIR)\modules" <.y
        copy modules\experimental\$(LONG)\mod_cache.pdb "$(INSTDIR)\modules" <.y
+       copy modules\experimental\$(LONG)\mod_charset_lite.pdb "$(INSTDIR)\modules" <.y
        copy modules\experimental\$(LONG)\mod_mem_cache.pdb "$(INSTDIR)\modules" <.y
        copy modules\experimental\$(LONG)\mod_disk_cache.pdb "$(INSTDIR)\modules" <.y
        copy modules\experimental\$(LONG)\mod_ext_filter.pdb "$(INSTDIR)\modules" <.y
@@ -600,6 +603,7 @@ BEGIN {
        xcopy include\*.h "$(INSTDIR)\include" /d < .a
        xcopy docs\icons "$(INSTDIR)\icons" /s /d < .a
        copy srclib\apr\Lib$(SHORT)\apr.lib "$(INSTDIR)\lib" <.y
+       copy srclib\apr-iconv\Lib$(SHORT)\apriconv.lib "$(INSTDIR)\lib" <.y
        copy srclib\apr-util\Lib$(SHORT)\aprutil.lib "$(INSTDIR)\lib" <.y
        copy srclib\pcre\Lib$(SHORT)\pcre.lib "$(INSTDIR)\lib" <.y
        copy srclib\pcre\Lib$(SHORT)\pcreposix.lib "$(INSTDIR)\lib" <.y
@@ -608,6 +612,8 @@ BEGIN {
        copy srclib\apr-util\xml\expat\lib\Lib$(SHORT)\xml.lib "$(INSTDIR)\lib\expat.lib" <.y
        copy srclib\apr\$(LONG)\libapr.lib "$(INSTDIR)\lib" <.y
        copy srclib\apr\$(LONG)\libapr.exp "$(INSTDIR)\lib" <.y
+       copy srclib\apr-iconv\$(LONG)\libapriconv.lib "$(INSTDIR)\lib" <.y
+       copy srclib\apr-iconv\$(LONG)\libapriconv.exp "$(INSTDIR)\lib" <.y
        copy srclib\apr-util\$(LONG)\libaprutil.lib "$(INSTDIR)\lib" <.y
        copy srclib\apr-util\$(LONG)\libaprutil.exp "$(INSTDIR)\lib" <.y
        copy $(LONG)\libhttpd.exp "$(INSTDIR)\lib" <.y

diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref
index 48813ade562769fbe8ada49abef166567915067b..e954eabedf618e5a15edf8322e55caca1a97238a 100644 (file)
--- a/os/win32/BaseAddr.ref
+++ b/os/win32/BaseAddr.ref
@@ -53,3 +53,4 @@ mod_disk_cache       0x6FBD0000    0x00010000
 mod_mem_cache        0x6FBC0000    0x00010000
 mod_deflate          0x6FBA0000    0x00020000
 mod_ext_filter       0x6FB90000    0x00010000
+mod_charset_lite     0x6FB80000    0x00010000