The code in this distribution is Copyright 1999-2007 by Hiroyuki Yamamoto
and the Claws Mail team.
-As a special exception, the Claws Mail team gives permission to link
-the code of its release of Claws Mail 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 obliged to do so. If
-you do not wish to do so, delete this exception statement from your version.
-
-------------------------------------------------------------------------------
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
+2008-10-09 [colin] 3.6.0cvs21
+
+ * configure.ac
+ * COPYING
+ * src/crash.c
+ * src/main.c
+ * src/gtk/about.c
+ Disable OpenSSL due to requirement of
+ OpenSSL exception. Code not removed yet,
+ just in case, but disabled.
+
2008-10-09 [colin] 3.6.0cvs20
* configure.ac
( cvs diff -u -r 1.654.2.3637 -r 1.654.2.3638 configure.ac; ) > 3.6.0cvs18.patchset
( cvs diff -u -r 1.654.2.3638 -r 1.654.2.3639 configure.ac; cvs diff -u -r 1.155.2.91 -r 1.155.2.92 src/Makefile.am; cvs diff -u -r 1.23.2.30 -r 1.23.2.31 src/crash.c; cvs diff -u -r -1.1.2.11 -r -1.1.2.12 src/gedit-print.c; cvs diff -u -r -1.1.2.4 -r -1.1.2.5 src/gedit-print.h; cvs diff -u -r 1.115.2.210 -r 1.115.2.211 src/main.c; cvs diff -u -r 1.274.2.282 -r 1.274.2.283 src/mainwindow.c; cvs diff -u -r 1.94.2.189 -r 1.94.2.190 src/messageview.c; cvs diff -u -r 1.3.2.21 -r 1.3.2.22 src/prefs_ext_prog.c; cvs diff -u -r 1.4.2.22 -r 1.4.2.23 src/prefs_fonts.c; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/prefs_image_viewer.c; cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/printing.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/printing.h; cvs diff -u -r 1.395.2.395 -r 1.395.2.396 src/summaryview.c; cvs diff -u -r 1.20.2.18 -r 1.20.2.19 src/gtk/Makefile.am; cvs diff -u -r 1.4.2.67 -r 1.4.2.68 src/gtk/about.c; cvs diff -u -r -1.1.2.9 -r -1.1.2.10 src/gtk/gtksourceprintjob.c; cvs diff -u -r -1.1.2.3 -r -1.1.2.4 src/gtk/gtksourceprintjob.h; ) > 3.6.0cvs19.patchset
( cvs diff -u -r 1.654.2.3639 -r 1.654.2.3640 configure.ac; cvs diff -u -r 1.155.2.92 -r 1.155.2.93 src/Makefile.am; cvs diff -u -r 1.23.2.31 -r 1.23.2.32 src/crash.c; diff -u /dev/null src/gedit-print.c; diff -u /dev/null src/gedit-print.h; cvs diff -u -r 1.115.2.211 -r 1.115.2.212 src/main.c; cvs diff -u -r 1.274.2.283 -r 1.274.2.284 src/mainwindow.c; cvs diff -u -r 1.94.2.190 -r 1.94.2.191 src/messageview.c; cvs diff -u -r 1.3.2.22 -r 1.3.2.23 src/prefs_ext_prog.c; cvs diff -u -r 1.4.2.23 -r 1.4.2.24 src/prefs_fonts.c; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/prefs_image_viewer.c; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/printing.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/printing.h; cvs diff -u -r 1.395.2.396 -r 1.395.2.397 src/summaryview.c; cvs diff -u -r 1.20.2.19 -r 1.20.2.20 src/gtk/Makefile.am; cvs diff -u -r 1.4.2.68 -r 1.4.2.69 src/gtk/about.c; diff -u /dev/null src/gtk/gtksourceprintjob.c; diff -u /dev/null src/gtk/gtksourceprintjob.h; ) > 3.6.0cvs20.patchset
+( cvs diff -u -r 1.654.2.3640 -r 1.654.2.3641 configure.ac; cvs diff -u -r 1.5.10.7 -r 1.5.10.8 COPYING; cvs diff -u -r 1.23.2.32 -r 1.23.2.33 src/crash.c; cvs diff -u -r 1.115.2.212 -r 1.115.2.213 src/main.c; cvs diff -u -r 1.4.2.69 -r 1.4.2.70 src/gtk/about.c; ) > 3.6.0cvs21.patchset
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=20
+EXTRA_VERSION=21
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
AC_MSG_RESULT(no)
fi
-dnl Check for OpenSSL
-AC_ARG_ENABLE(openssl,
- [ --disable-openssl disable OpenSSL support.],
- [ac_cv_enable_openssl=$enableval], [ac_cv_enable_openssl=yes])
dnl GNUTLS
+AC_ARG_ENABLE(openssl, [ --enable-openssl enable GnuTLS support],
+ [ac_cv_enable_openssl=$enableval], [ac_cv_enable_openssl=yes])
AC_ARG_ENABLE(gnutls, [ --enable-gnutls enable GnuTLS support],
- [ac_cv_enable_gnutls=$enableval], [ac_cv_enable_gnutls=no])
-if test x$ac_cv_enable_openssl = xyes && test x$ac_cv_enable_gnutls != xyes; then
- ac_cv_enable_gnutls="no"
-fi
-if test x$ac_cv_enable_gnutls = xyes; then
- ac_cv_enable_openssl="no"
-fi
+ [ac_cv_enable_gnutls=$enableval], [ac_cv_enable_gnutls=yes])
-AC_MSG_CHECKING([whether to use OpenSSL])
-if test x"$ac_cv_enable_openssl" = xyes; then
- AC_MSG_RESULT(yes)
- PKG_CHECK_MODULES(OPENSSL, openssl >= 0.9.7, :, ac_cv_enable_openssl=no)
- if test x$ac_cv_enable_openssl = xyes; then
- AC_DEFINE(USE_OPENSSL, 1, Define if you want OpenSSL support)
- else
- AC_MSG_RESULT(not found)
- AC_MSG_WARN([*** OpenSSL will not be supported ***])
+if test "x$ac_cv_enable_gnutls" != "xyes"; then
+ if test "x$ac_cv_enable_openssl" = "xyes"; then
+ AC_MSG_WARN(*** Using GnuTLS instead of OpenSSL due to licensing ***)
+ ac_cv_enable_gnutls="yes"
fi
-else
- AC_MSG_RESULT(no)
fi
-AC_SUBST(OPENSSL_CFLAGS)
-AC_SUBST(OPENSSL_LIBS)
-
AC_MSG_CHECKING([whether to use GnuTLS])
if test "x$ac_cv_enable_gnutls" != "xno"; then
OCPPFLAGS="$CPPFLAGS"
echo ""
echo "JPilot : $ac_cv_enable_jpilot"
echo "LDAP : $ac_cv_enable_ldap"
-echo "OpenSSL : $ac_cv_enable_openssl"
echo "gnuTLS : $ac_cv_enable_gnutls"
echo "iconv : $am_cv_func_iconv"
echo "compface : $ac_cv_enable_compface"
#if HAVE_LIBCOMPFACE
" compface"
#endif
-#if USE_OPENSSL
- " OpenSSL"
-#endif
#if USE_GNUTLS
" GnuTLS"
#endif
gtk_text_buffer_insert(buffer, &iter,
(gchar *)Q_("NetworkManager|adds support for detection of network connection changes\n"), -1);
-#if USE_OPENSSL
- gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
-#else
- gtk_text_buffer_insert_pixbuf(buffer, &iter, inactive_pixbuf);
-#endif
- gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" OpenSSL "), -1,
- "bold", NULL);
- gtk_text_buffer_insert(buffer, &iter,
- (gchar *)Q_("OpenSSL|adds support for encrypted connections to servers\n"), -1);
-
return scrolledwin;
}
else
g_print(" NetworkManager\n");
#endif
-#if USE_OPENSSL
- if (show_debug_only)
- debug_print(" openssl\n");
- else
- g_print(" openssl\n");
-#endif
}
#ifdef HAVE_DBUS_GLIB
projects / claws.git / commitdiff