Check for idna.h in /usr/include/idn.

[wget] / configure.bat

diff --git a/configure.bat b/configure.bat
old mode 100644 (file)
new mode 100755 (executable)
index 7b41b8d..45ea41d
--- a/configure.bat
+++ b/configure.bat
@@ -1,10 +1,11 @@
 @echo off\r
 rem Configure batch file for `Wget' utility\r
 @echo off\r
 rem Configure batch file for `Wget' utility\r

-rem Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.\r
+rem Copyright (C) 1995, 1996, 1997, 2007, 2008, 2009 Free Software\r
+rem Foundation, Inc.\r

 \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
 \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
 rem (at your option) any later version.\r
 \r
 rem This program is distributed in the hope that it will be useful,\r


@@ -13,18 +14,18 @@ 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 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
 \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
-rem OpenSSL project's "OpenSSL" library (or with modified versions of it\r
-rem that use the same license as the "OpenSSL" library), and distribute\r
-rem the linked executables.  You must obey the GNU General Public License\r
-rem in all respects for all of the code used other than "OpenSSL".  If you\r
-rem modify this file, you may extend this exception to your version of the\r
-rem file, but you are not obligated to do so.  If you do not wish to do\r
-rem so, delete this exception statement from your version.\r
+rem Additional permission under GNU GPL version 3 section 7\r
+\r
+rem If you modify this program, or any covered work, by linking or\r
+rem combining it with the OpenSSL project's OpenSSL library (or a\r
+rem modified version of that library), containing parts covered by the\r
+rem terms of the OpenSSL or SSLeay licenses, the Free Software Foundation\r
+rem grants you additional permission to convey the resulting work.\r
+rem Corresponding Source for a non-source form of such a combination\r
+rem shall include the source code for the parts of OpenSSL used as well\r
+rem as that of the covered work.\r

 \r
 if .%1 == .--borland goto :borland\r
 if .%1 == .--mingw goto :mingw\r
 \r
 if .%1 == .--borland goto :borland\r
 if .%1 == .--mingw goto :mingw\r


@@ -32,7 +33,6 @@ if .%1 == .--msvc goto :msvc
 goto :usage\r
 \r
 :msvc\r
 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
 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 +43,6 @@ echo and then NMAKE.
 goto :end\r
 \r
 :borland\r
 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
 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 +51,6 @@ echo Type MAKE to start compiling.
 goto :end\r
 \r
 :mingw\r
 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
 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 +61,6 @@ goto :end
 :usage\r
 echo "Usage: configure [--borland | --mingw | --msvc]"\r
 :end\r
 :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