[svn] Merge of fix for bugs 20341 and 20410.

[wget] / configure.bat

diff --git a/configure.bat b/configure.bat
index 7b41b8d658801a36e55f0e77119475c2150669a7..c340b3e0eff4de3cdb43be5f05bc1a048d1f2b69 100755 (executable)
--- a/configure.bat
+++ b/configure.bat
@@ -4,7 +4,7 @@ rem Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
 \r
 rem This program is free software; you can redistribute it and/or modify\r
 rem it under the terms of the GNU General Public License as published by\r
-rem the Free Software Foundation; either version 2 of the License, or\r
+rem the Free Software Foundation; either version 3 of the License, or\r
 rem (at your option) any later version.\r
 \r
 rem This program is distributed in the hope that it will be useful,\r
@@ -13,8 +13,7 @@ rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 rem GNU General Public License for more details.\r
 \r
 rem You should have received a copy of the GNU General Public License\r
-rem along with this program; if not, write to the Free Software\r
-rem Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\r
+rem along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
 \r
 rem In addition, as a special exception, the Free Software Foundation\r
 rem gives permission to link the code of its release of Wget with the\r
@@ -32,7 +31,6 @@ if .%1 == .--msvc goto :msvc
 goto :usage\r
 \r
 :msvc\r
-copy windows\config.h.ms src\config.h > nul\r
 copy windows\Makefile.top Makefile > nul\r
 copy windows\Makefile.src src\Makefile > nul\r
 copy windows\Makefile.doc doc\Makefile > nul\r
@@ -43,7 +41,6 @@ echo and then NMAKE.
 goto :end\r
 \r
 :borland\r
-copy windows\config.h.bor src\config.h > nul\r
 copy windows\Makefile.top.bor Makefile > nul\r
 copy windows\Makefile.src.bor src\Makefile > nul\r
 copy windows\Makefile.doc doc\Makefile > nul\r
@@ -52,7 +49,6 @@ echo Type MAKE to start compiling.
 goto :end\r
 \r
 :mingw\r
-copy windows\config.h.mingw src\config.h > nul\r
 copy windows\Makefile.top.mingw Makefile > nul\r
 copy windows\Makefile.src.mingw src\Makefile > nul\r
 copy windows\Makefile.doc doc\Makefile > nul\r
@@ -63,3 +59,6 @@ goto :end
 :usage\r
 echo "Usage: configure [--borland | --mingw | --msvc]"\r
 :end\r
+\r
+copy windows\config.h src\config.h > nul\r
+copy windows\config-compiler.h src\config-compiler.h > nul\r