X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=configure.bat;h=45ea41dcbd4ea60ea04d4cd97885da9786aeedcd;hp=7b41b8d658801a36e55f0e77119475c2150669a7;hb=cb555a94fa5188122569ed3803c463f27ccd0261;hpb=00dabd4bac7ad013a1933243e92f930f411b8427

diff --git a/configure.bat b/configure.bat
index 7b41b8d6..45ea41dc 100755
--- a/configure.bat
+++ b/configure.bat
@@ -1,10 +1,11 @@
 @echo off
 rem Configure batch file for `Wget' utility
-rem Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+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 2 of the License, or
+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,
@@ -13,18 +14,18 @@ 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.
+rem along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-rem In addition, as a special exception, the Free Software Foundation
-rem gives permission to link the code of its release of Wget with the
-rem OpenSSL project's "OpenSSL" library (or with modified versions of it
-rem that use the same license as the "OpenSSL" library), and distribute
-rem the linked executables.  You must obey the GNU General Public License
-rem in all respects for all of the code used other than "OpenSSL".  If you
-rem modify this file, you may extend this exception to your version of the
-rem file, but you are not obligated to do so.  If you do not wish to do
-rem so, delete this exception statement from your version.
+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
@@ -32,7 +33,6 @@ if .%1 == .--msvc goto :msvc
 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
@@ -43,7 +43,6 @@ 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
@@ -52,7 +51,6 @@ echo Type MAKE to start compiling.
 goto :end
 
 :mingw
-copy windows\config.h.mingw src\config.h > nul
 copy windows\Makefile.top.mingw Makefile > nul
 copy windows\Makefile.src.mingw src\Makefile > nul
 copy windows\Makefile.doc doc\Makefile > nul
@@ -63,3 +61,6 @@ 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