Reenable apr-iconv for ongoing development effort. Sorry that we had

  to defer this, but building with the patch [which will be placed in
  patches] will allow anyone to build an xlate-enabled aprutil for ongoing
  svn and other development.

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

diff --git a/Apache.dsw b/Apache.dsw
index 16c9cd021fd81036104d05b15ef24ee176f42f7b..c7616ec2ec6d27fe9b284778c1289b9d767d2741 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -90,6 +90,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
@@ -261,6 +264,18 @@ Package=<4>
 
 ###############################################################################
 
+Project: "apriconv"=".\srclib\apr-iconv\apriconv.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "aprutil"=".\srclib\apr-util\aprutil.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -269,6 +284,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name apriconv
+    End Project Dependency
     Begin Project Dependency
     Project_Dep_Name gen_uri_delims
     End Project Dependency
@@ -384,6 +402,21 @@ Package=<4>
 
 ###############################################################################
 
+Project: "libapriconv"=".\srclib\apr-iconv\libapriconv.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "libaprutil"=".\srclib\apr-util\libaprutil.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -396,6 +429,9 @@ Package=<4>
     Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name libapriconv
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name gen_uri_delims
     End Project Dependency
     Begin Project Dependency
@@ -417,6 +453,9 @@ Package=<4>
     Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name libapriconv
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name libaprutil
     End Project Dependency
     Begin Project Dependency
@@ -699,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 b98dc8f2589483e1aa09b1f73e8e73857c24dd25..e8617c3b21457c9584953937fb6b7431109d309b 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -31,13 +31,12 @@ default: _apacher
 CTARGET=/build
 !ENDIF
 
-!IF !EXIST("srclib\apr") || !EXIST("srclib\apr-util") 
-## || !EXIST("srclib\apr-iconv")
+!IF !EXIST("srclib\apr") || !EXIST("srclib\apr-util") || !EXIST("srclib\apr-iconv")
 !MESSAGE Please check out or download and unpack the Apache Portability Runtime
-!MESSAGE sources (apr and apr-util) into your $(INSTDIR)\srclib dir.
+!MESSAGE sources (apr, apr-iconv and apr-util) into your $(INSTDIR)\srclib dir.
 !MESSAGE Apache cannot build without these libraries!
 !MESSAGE 
-!ERROR Need $(INSTDIR)\srclib\  apr and apr-util
+!ERROR Need $(INSTDIR)\srclib\  apr, apr-iconv and apr-util
 !ENDIF
 
 # Note; _tryssl: is only used by the msvc developer studio environment to 'fix up'
@@ -175,6 +174,10 @@ _build:
         $(MAKE) $(MAKEOPT) -f apr.mak             CFG="apr - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f libapr.mak          CFG="libapr - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
+       cd srclib\apr-iconv
+        $(MAKE) $(MAKEOPT) -f apriconv.mak  CFG="apriconv - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f libapriconv.mak  CFG="libapriconv - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+       cd ..\..
        cd srclib\apr-util\uri
         $(MAKE) $(MAKEOPT) -f gen_uri_delims.mak  CFG="gen_uri_delims - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..\..
@@ -215,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)
@@ -353,6 +357,7 @@ _install:
        copy $(LONG)\Apache.exe "$(INSTDIR)\bin" <.y
        copy $(LONG)\libhttpd.dll "$(INSTDIR)\bin" <.y
        copy srclib\apr\$(LONG)\libapr.dll "$(INSTDIR)\bin" <.y
+       copy srclib\apr-iconv\$(LONG)\libapriconv.dll "$(INSTDIR)\bin" <.y
        copy srclib\apr-util\$(LONG)\libaprutil.dll "$(INSTDIR)\bin" <.y
        copy modules\aaa\$(LONG)\mod_access.so "$(INSTDIR)\modules" <.y
        copy modules\aaa\$(LONG)\mod_auth.so "$(INSTDIR)\modules" <.y
@@ -364,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
@@ -400,6 +406,7 @@ _install:
        copy $(LONG)\Apache.pdb "$(INSTDIR)\bin" <.y
        copy $(LONG)\libhttpd.pdb "$(INSTDIR)\bin" <.y
        copy srclib\apr\$(LONG)\libapr.pdb "$(INSTDIR)\bin" <.y
+       copy srclib\apr-iconv\$(LONG)\libapriconv.pdb "$(INSTDIR)\bin" <.y
        copy srclib\apr-util\$(LONG)\libaprutil.pdb "$(INSTDIR)\bin" <.y
        copy modules\aaa\$(LONG)\mod_access.pdb "$(INSTDIR)\modules" <.y
        copy modules\aaa\$(LONG)\mod_auth.pdb "$(INSTDIR)\modules" <.y
@@ -411,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
@@ -603,6 +611,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