Deal with the license-incompatibility problem.

svn path=/trunk/; revision=3463

diff --git a/COPYING b/COPYING
index e93e3f3fb971f42222dbb89a1fc93c8b4dc9670b..4407773cb712035054909072975725286a9e0be2 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
 The code in the fetchmail distribution is Copyright 1997 by Eric S. Raymond.
 Portions are also copyrighted by Carl Harris, 1993 and 1995.  Copyright
-retained for the purpose of protecting free redistribution of source.
+retained for the purpose of protecting open-source redistribution.
 
 The MD5 support is copyright by RSA Data Security, Inc.  See the header
 comment of the md5.c module for license terms.

diff --git a/Makefile.in b/Makefile.in
index 02ee3d1e5f7f0dc0b8ae82b17f9106aa44af403e..128dcba9b695020e95deb0a4e45093e85a57f38a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -49,7 +49,7 @@ extras = @LIBOBJS@
 
 # Extra sources/objects for library functions not provided on the host system.
 EXTRASRC = @EXTRASRC@
-# EXTRASRC = $(srcdir)/strcasecmp.c $(srcdir)/getopt.c $(srcdir)/getopt1.c $(srcdir)/alloca.c  # QNX
+# EXTRASRC = $(srcdir)/strcasecmp.c $(srcdir)/alloca.c # QNX
 EXTRAOBJ = @EXTRAOBJ@ @INTLOBJS@
 # EXTRAOBJ = strcasecmp.o getopt.o getopt1.o alloca.o
 

diff --git a/NEWS b/NEWS
index 9ac542c6df9d07a0fb3326511f6c03d8df0c22a4..8477020d27056152085f25650e63896de8b79ba2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@
 * Make sure IMAP capability checks are caseblind.
 * Make sure suffix checks on akalists are properly caseblinded.
 * All warning mail now has a generated date stamp.
+* getopt.c and getopt1.c removed due to license incompatibility with OpenSSL.
 
 fetchmail-5.9.0 (Sun Aug 12 23:52:16 EDT 2001), 21062 lines:
 

diff --git a/configure.in b/configure.in
index 43f2fbfb01012267cea96b4644c2ff584e32c9d2..e893585bc0c9604971ba0d514908fc8d9bc70168 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -107,10 +107,6 @@ AC_CHECK_FUNC(memmove, AC_DEFINE(HAVE_MEMMOVE),
               [EXTRASRC="$EXTRASRC \$(srcdir)/memmove.c"
                EXTRAOBJ="$EXTRAOBJ memmove.o"])
              
-AC_CHECK_FUNC(getopt_long, AC_DEFINE(HAVE_GETOPTLONG),
-              [EXTRASRC="$EXTRASRC \$(srcdir)/getopt.c \$(srcdir)/getopt1.c"
-               EXTRAOBJ="$EXTRAOBJ getopt.o getopt1.o"])
-
 AC_CHECK_FUNC(MD5Init, AC_DEFINE(HAVE_MD5),
               [EXTRASRC="$EXTRASRC \$(srcdir)/md5c.c"
                EXTRAOBJ="$EXTRAOBJ md5c.o"])