[svn] Update the license to include the OpenSSL exception.

[wget] / src / config.h.in

diff --git a/src/config.h.in b/src/config.h.in
index 24655b0706c4b7a6b9448b26241a7197e8cfe12c..dc5f37cb46040707413fb877038b394c4e98abd8 100644 (file)
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -16,7 +16,17 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Wget; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+In addition, as a special exception, the Free Software Foundation
+gives permission to link the code of its release of Wget with the
+OpenSSL project's "OpenSSL" library (or with modified versions of it
+that use the same license as the "OpenSSL" library), and distribute
+the linked executables.  You must obey the GNU General Public License
+in all respects for all of the code used other than "OpenSSL".  If you
+modify this file, you may extend this exception to your version of the
+file, but you are not obligated to do so.  If you do not wish to do
+so, delete this exception statement from your version.  */
 
 #ifndef CONFIG_H
 #define CONFIG_H
@@ -165,6 +175,12 @@ char *alloca ();
 /* Define if you have the signal function.  */
 #undef HAVE_SIGNAL
 
+/* Define if you have the sigsetjmp function.  */
+#undef HAVE_SIGSETJMP
+
+/* Define if you have the sigblock function.  */
+#undef HAVE_SIGBLOCK
+
 /* Define if you have the gettext function.  */
 #undef HAVE_GETTEXT
 
@@ -201,6 +217,9 @@ char *alloca ();
 /* Define if you have the <signal.h> header file.  */
 #undef HAVE_SIGNAL_H
 
+/* Define if you have the <setjmp.h> header file.  */
+#undef HAVE_SETJMP_H
+
 /* Define if you have the <libintl.h> header file.  */
 #undef HAVE_LIBINTL_H
 
@@ -248,6 +267,11 @@ char *alloca ();
 
 #ifdef solaris
 # define NAMESPACE_TWEAKS
+# ifdef __GNUC__
+/* Prevent stdio.h from declaring va_list and thus tripping gcc's
+   stdarg.h. */
+#  define _VA_LIST
+# endif
 #endif
 
 #ifdef __linux__