talons

commit 0d2e06c831f51ef7e7dd58b497897855a2cd2108
parent 8fc842726b8462070a2a7075bce5ff2f320db618
Author: Paul Mangan <paul@claws-mail.org>
Date:   Wed,  3 Dec 2008 10:25:56 +0000

2008-12-03 [paul]	3.6.1cvs58

	* configure.ac
		eradicate gcc4's signedness warnings
		fix building with gnuTLS on (Open)Solaris

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
42
++++++++++++++++++++++++++++++++++--------

3 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-03 [paul]	3.6.1cvs58
+
+	* configure.ac
+		eradicate gcc4's signedness warnings
+		fix building with gnuTLS on (Open)Solaris
+
 2008-12-01 [colin]	3.6.1cvs57
 
 	* src/gtk/gtkcmclist.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3639,3 +3639,4 @@
 ( cvs diff -u -r 1.1.2.52 -r 1.1.2.53 manual/advanced.xml;  cvs diff -u -r 1.1.2.22 -r 1.1.2.23 manual/plugins.xml;  cvs diff -u -r 1.30.2.53 -r 1.30.2.54 src/prefs_toolbar.c;  ) > 3.6.1cvs55.patchset
 ( cvs diff -u -r 1.1.2.39 -r 1.1.2.40 src/plugins/pgpinline/pgpinline.c;  ) > 3.6.1cvs56.patchset
 ( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/gtk/gtkcmclist.c;  ) > 3.6.1cvs57.patchset
+( cvs diff -u -r 1.654.2.3704 -r 1.654.2.3705 configure.ac;  ) > 3.6.1cvs58.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=57
+EXTRA_VERSION=58
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -141,6 +141,16 @@ then
 	CFLAGS="$CFLAGS -Wno-unused-function"
 fi
 
+AC_MSG_CHECKING([if gcc supports -Wno-pointer-sign])
+_gcc_cflags_save=$CFLAGS
+CFLAGS="-Wno-pointer-sign"
+AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]),_gcc_psign=yes,_gcc_psign=no)
+AC_MSG_RESULT($_gcc_psign)
+CFLAGS=$_gcc_cflags_save;
+if test x"$_gcc_psign" = xyes ; then
+	CFLAGS="$CFLAGS -Wno-pointer-sign"
+fi
+
 CFLAGS="$CFLAGS -Wall"
 
 if test $USE_MAINTAINER_MODE = yes; then
@@ -367,6 +377,7 @@ else
 fi
 
 dnl GNUTLS
+AC_MSG_CHECKING([whether to use GnuTLS])
 AC_ARG_ENABLE(openssl,    [ --enable-openssl      enable GnuTLS support],
             [ac_cv_enable_openssl=$enableval], [ac_cv_enable_openssl=no])
 AC_ARG_ENABLE(gnutls,    [ --enable-gnutls      enable GnuTLS support],
@@ -377,24 +388,38 @@ if test "x$ac_cv_enable_gnutls" != "xyes"; then
 		AC_MSG_ERROR(*** Use GnuTLS instead of OpenSSL due to licensing ***)
 	fi
 fi
-AC_MSG_CHECKING([whether to use GnuTLS])
+AC_MSG_RESULT($ac_cv_enable_gnutls)
 if test "x$ac_cv_enable_gnutls" != "xno"; then
   OCPPFLAGS="$CPPFLAGS"
   OLDFLAGS="$LDFLAGS"
   GNUTLS_LIBS=""
   AC_CHECK_HEADER(gnutls/gnutls.h, [
-	AC_CHECK_LIB(gnutls, gnutls_global_deinit, 
-		[AC_DEFINE(USE_GNUTLS, 1, Define to use GnuTLS.)],
+	AC_CHECK_LIB(gnutls, gnutls_global_deinit,,
 		[ac_cv_enable_gnutls=no])
   ],[ac_cv_enable_gnutls=no])
-  if test "x$ac_cv_enable_gnutls" != "xyes"; then
+  if test "x$ac_cv_enable_gnutls" = "xyes"; then
+   AC_CHECK_HEADER(gpg-error.h,
+   	[AC_CHECK_LIB(gpg-error, gpg_strerror,,
+		[ac_cv_enable_gnutls=no])
+  	],[ac_cv_enable_gnutls=no])
+  fi
+  if test "x$ac_cv_enable_gnutls" = "xyes"; then
+   GCRYPT_LIBS="-lgpg-error"
+   AC_CHECK_HEADER(gcrypt.h,
+     	[AC_CHECK_LIB(gcrypt, gcry_control,,
+		[ac_cv_enable_gnutls=no])
+  	],[ac_cv_enable_gnutls=no])
+  fi
+  if test "x$ac_cv_enable_gnutls" = "xyes"; then
+	GNUTLS_LIBS="-lgnutls -lgcrypt -lz ${GCRYPT_LIBS}"
+  fi
+else
    CPPFLAGS="$OCPPFLAGS"
    LDFLAGS="$OLDFLAGS"
-  fi
 fi
+
 if test "x$ac_cv_enable_gnutls" = "xyes"; then
   AC_DEFINE([USE_GNUTLS],1, [Define to use GnuTLS])
-  GNUTLS_LIBS="-lgnutls"
 else
   GNUTLS_LIBS=""
 fi
@@ -442,10 +467,11 @@ AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
 dnl enchant is used for spell checking
+AC_MSG_CHECKING([whether to use enchant])
 AC_ARG_ENABLE(enchant,
 	[  --disable-enchant         disable enchant support],
 	[ac_cv_enable_enchant=$enableval], [ac_cv_enable_enchant=yes])
-AC_MSG_CHECKING([whether to use enchant])
+AC_MSG_RESULT($ac_cv_enable_enchant)
 if test $ac_cv_enable_enchant = yes; then
 	PKG_CHECK_MODULES(ENCHANT, enchant >= 1.0.0,
 	[