Fix Win32 imap->imagemap transformation

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

diff --git a/Apache.dsw b/Apache.dsw
index ef114183794a891a09b612b9f3a4822d319e48fb..eeb51c49df2ce055c315c101a16f787a702595df 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -153,7 +153,7 @@ Package=<4>
     Project_Dep_Name mod_ident
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name mod_imap
+    Project_Dep_Name mod_imagemap
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name mod_include
@@ -1323,7 +1323,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_imap"=.\modules\mappers\mod_imap.dsp - Package Owner=<4>
+Project: "mod_imagemap"=.\modules\mappers\mod_imagemap.dsp - Package Owner=<4>
 
 Package=<5>
 {{{

diff --git a/Makefile.win b/Makefile.win
index 582e4e27831198830f80aa5fff931953e12f45b3..deaf595e64172e04b69988b5ee9453ee36c9448f 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -274,7 +274,7 @@ _build:
         $(MAKE) $(MAKEOPT) -f mod_actions.mak     CFG="mod_actions - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_alias.mak       CFG="mod_alias - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_dir.mak         CFG="mod_dir - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        $(MAKE) $(MAKEOPT) -f mod_imap.mak        CFG="mod_imap - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_imagemap.mak    CFG="mod_imagemap - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_negotiation.mak CFG="mod_negotiation - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_rewrite.mak     CFG="mod_rewrite - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_speling.mak     CFG="mod_speling - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -421,7 +421,7 @@ _copybin:
        copy modules\mappers\$(LONG)\mod_actions.$(src_so)      "$(inst_so)" <.y
        copy modules\mappers\$(LONG)\mod_alias.$(src_so)        "$(inst_so)" <.y
        copy modules\mappers\$(LONG)\mod_dir.$(src_so)          "$(inst_so)" <.y
-       copy modules\mappers\$(LONG)\mod_imap.$(src_so)         "$(inst_so)" <.y
+       copy modules\mappers\$(LONG)\mod_imagemap.$(src_so)     "$(inst_so)" <.y
        copy modules\mappers\$(LONG)\mod_negotiation.$(src_so)  "$(inst_so)" <.y
        copy modules\mappers\$(LONG)\mod_rewrite.$(src_so)      "$(inst_so)" <.y
        copy modules\mappers\$(LONG)\mod_speling.$(src_so)      "$(inst_so)" <.y

diff --git a/modules/mappers/mod_imagemap.dsp b/modules/mappers/mod_imagemap.dsp
index fdc563902bcbdb6c407d046ae3e726b7420a3bee..5c317279b2876a84d2a31c25e654a9d930314821 100644 (file)
--- a/modules/mappers/mod_imagemap.dsp
+++ b/modules/mappers/mod_imagemap.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="mod_imap" - Package Owner=<4>\r
+# Microsoft Developer Studio Project File - Name="mod_imagemap" - Package Owner=<4>\r
 # Microsoft Developer Studio Generated Build File, Format Version 6.00\r
 # ** DO NOT EDIT **\r
 \r
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
 \r
-CFG=mod_imap - Win32 Release\r
+CFG=mod_imagemap - Win32 Release\r
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
 !MESSAGE use the Export Makefile command and run\r
 !MESSAGE \r
-!MESSAGE NMAKE /f "mod_imap.mak".\r
+!MESSAGE NMAKE /f "mod_imagemap.mak".\r
 !MESSAGE \r
 !MESSAGE You can specify a configuration when running NMAKE\r
 !MESSAGE by defining the macro CFG on the command line. For example:\r
 !MESSAGE \r
-!MESSAGE NMAKE /f "mod_imap.mak" CFG="mod_imap - Win32 Release"\r
+!MESSAGE NMAKE /f "mod_imagemap.mak" CFG="mod_imagemap - Win32 Release"\r
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
-!MESSAGE "mod_imap - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "mod_imap - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "mod_imagemap - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "mod_imagemap - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE \r
 \r
 # Begin Project\r
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe\r
 RSC=rc.exe\r
 \r
-!IF  "$(CFG)" == "mod_imap - Win32 Release"\r
+!IF  "$(CFG)" == "mod_imagemap - Win32 Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\r
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c\r
-# ADD CPP /nologo /MD /W3 /Zi /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_imap_src" /FD /c\r
+# ADD CPP /nologo /MD /W3 /Zi /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_imagemap_src" /FD /c\r
 # ADD BASE MTL /nologo /D "NDEBUG" /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
@@ -52,10 +52,10 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Release/mod_imap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_imap.so\r
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_imap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_imap.so /opt:ref\r
+# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Release/mod_imagemap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_imagemap.so\r
+# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/mod_imagemap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_imagemap.so /opt:ref\r
 \r
-!ELSEIF  "$(CFG)" == "mod_imap - Win32 Debug"\r
+!ELSEIF  "$(CFG)" == "mod_imagemap - Win32 Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c\r
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_imap_src" /FD /c\r
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_imagemap_src" /FD /c\r
 # ADD BASE MTL /nologo /D "_DEBUG" /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
@@ -78,46 +78,46 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_imap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_imap.so\r
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_imap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_imap.so\r
+# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_imagemap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_imagemap.so\r
+# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/mod_imagemap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_imagemap.so\r
 \r
 !ENDIF \r
 \r
 # Begin Target\r
 \r
-# Name "mod_imap - Win32 Release"\r
-# Name "mod_imap - Win32 Debug"\r
+# Name "mod_imagemap - Win32 Release"\r
+# Name "mod_imagemap - Win32 Debug"\r
 # Begin Source File\r
 \r
-SOURCE=.\mod_imap.c\r
+SOURCE=.\mod_imagemap.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\mod_imap.rc\r
+SOURCE=.\mod_imagemap.rc\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\build\win32\win32ver.awk\r
 \r
-!IF  "$(CFG)" == "mod_imap - Win32 Release"\r
+!IF  "$(CFG)" == "mod_imagemap - Win32 Release"\r
 \r
 # PROP Ignore_Default_Tool 1\r
 # Begin Custom Build - Creating Version Resource\r
 InputPath=..\..\build\win32\win32ver.awk\r
 \r
-".\mod_imap.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       awk -f ../../build/win32/win32ver.awk mod_imap.so "imap_module for Apache" ../../include/ap_release.h > .\mod_imap.rc\r
+".\mod_imagemap.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       awk -f ../../build/win32/win32ver.awk mod_imagemap.so "imagemap_module for Apache" ../../include/ap_release.h > .\mod_imagemap.rc\r
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "mod_imap - Win32 Debug"\r
+!ELSEIF  "$(CFG)" == "mod_imagemap - Win32 Debug"\r
 \r
 # PROP Ignore_Default_Tool 1\r
 # Begin Custom Build - Creating Version Resource\r
 InputPath=..\..\build\win32\win32ver.awk\r
 \r
-".\mod_imap.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       awk -f ../../build/win32/win32ver.awk mod_imap.so "imap_module for Apache" ../../include/ap_release.h > .\mod_imap.rc\r
+".\mod_imagemap.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       awk -f ../../build/win32/win32ver.awk mod_imagemap.so "imagemap_module for Apache" ../../include/ap_release.h > .\mod_imagemap.rc\r
 \r
 # End Custom Build\r
 \r