X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=configure.bat;h=45ea41dcbd4ea60ea04d4cd97885da9786aeedcd;hp=9864659aec5ea362608c841656cbe2a0b5dcdf85;hb=cb555a94fa5188122569ed3803c463f27ccd0261;hpb=33c0e509e0d7b3e714603e9e90e24c449d48c1d3

diff --git a/configure.bat b/configure.bat
old mode 100644
new mode 100755
index 9864659a..45ea41dc
--- a/configure.bat
+++ b/configure.bat
@@ -1,62 +1,66 @@
-@echo off
-rem Configure batch file for `Wget' utility
-rem Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-
-rem This program is free software; you can redistribute it and/or modify
-rem it under the terms of the GNU General Public License as published by
-rem the Free Software Foundation; either version 2 of the License, or
-rem (at your option) any later version.
-
-rem This program is distributed in the hope that it will be useful,
-rem but WITHOUT ANY WARRANTY; without even the implied warranty of
-rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-rem GNU General Public License for more details.
-
-rem You should have received a copy of the GNU General Public License
-rem along with this program; if not, write to the Free Software
-rem Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-cls
-if .%1 == .--borland goto :borland
-if .%1 == .--msvc goto :msvc
-if .%1 == .--watcom goto :watcom
-if not .%BORPATH% == . goto :borland
-if not .%1 == . goto :usage
-
-:msvc
-copy windows\config.h.ms src\config.h > nul
-copy windows\Makefile.top Makefile > nul
-copy windows\Makefile.src src\Makefile > nul
-copy windows\Makefile.doc doc\Makefile > nul
-
-echo Type NMAKE to start compiling.
-echo If it doesn't work, try executing MSDEV\BIN\VCVARS32.BAT first,
-echo and then NMAKE.
-goto :end
-
-:borland
-copy windows\config.h.bor src\config.h > nul
-copy windows\Makefile.top.bor Makefile > nul
-copy windows\Makefile.src.bor src\Makefile > nul
-copy windows\Makefile.doc doc\Makefile > nul
-
-echo Type MAKE to start compiling.
-goto :end
-
-:watcom
-copy windows\config.h.ms src\config.h > nul
-copy windows\Makefile.watcom src\Makefile > nul
-
-@echo Checking environment vars
-@set INCLUDE | find /I "WATCOM"
-@set LIB     | find /I "WATCOM"
-@echo If WATCOM directories were not displayed, you need to
-@echo SET INCLUDE and SET LIB to the Watcom directories
-@echo.
-cd src
-@echo Type WMAKE to build
-goto :end
-
-:usage
-echo Usage: Configure [--borland | --msvc | --watcom]
-:end
+@echo off
+rem Configure batch file for `Wget' utility
+rem Copyright (C) 1995, 1996, 1997, 2007, 2008, 2009 Free Software
+rem Foundation, Inc.
+
+rem This program is free software; you can redistribute it and/or modify
+rem it under the terms of the GNU General Public License as published by
+rem the Free Software Foundation; either version 3 of the License, or
+rem (at your option) any later version.
+
+rem This program is distributed in the hope that it will be useful,
+rem but WITHOUT ANY WARRANTY; without even the implied warranty of
+rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+rem GNU General Public License for more details.
+
+rem You should have received a copy of the GNU General Public License
+rem along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+rem Additional permission under GNU GPL version 3 section 7
+
+rem If you modify this program, or any covered work, by linking or
+rem combining it with the OpenSSL project's OpenSSL library (or a
+rem modified version of that library), containing parts covered by the
+rem terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+rem grants you additional permission to convey the resulting work.
+rem Corresponding Source for a non-source form of such a combination
+rem shall include the source code for the parts of OpenSSL used as well
+rem as that of the covered work.
+
+if .%1 == .--borland goto :borland
+if .%1 == .--mingw goto :mingw
+if .%1 == .--msvc goto :msvc
+goto :usage
+
+:msvc
+copy windows\Makefile.top Makefile > nul
+copy windows\Makefile.src src\Makefile > nul
+copy windows\Makefile.doc doc\Makefile > nul
+
+echo Type NMAKE to start compiling.
+echo If it doesn't work, try executing MSDEV\BIN\VCVARS32.BAT first,
+echo and then NMAKE.
+goto :end
+
+:borland
+copy windows\Makefile.top.bor Makefile > nul
+copy windows\Makefile.src.bor src\Makefile > nul
+copy windows\Makefile.doc doc\Makefile > nul
+
+echo Type MAKE to start compiling.
+goto :end
+
+:mingw
+copy windows\Makefile.top.mingw Makefile > nul
+copy windows\Makefile.src.mingw src\Makefile > nul
+copy windows\Makefile.doc doc\Makefile > nul
+
+echo Type mingw32-make to start compiling.
+goto :end
+
+:usage
+echo "Usage: configure [--borland | --mingw | --msvc]"
+:end
+
+copy windows\config.h src\config.h > nul
+copy windows\config-compiler.h src\config-compiler.h > nul