dnl version number
MAJOR_VERSION=3
MINOR_VERSION=7
-MICRO_VERSION=9
+MICRO_VERSION=10
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=17
+EXTRA_VERSION=31
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
AC_PROG_YACC
AC_LIB_PREFIX
AC_LIBTOOL_WIN32_DLL
+LT_INIT
LT_AC_PROG_RC
AC_LIBTOOL_RC
AC_PROG_LIBTOOL
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_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 -Wall"
#if test $USE_MAINTAINER_MODE = yes; then
-# CFLAGS="-g -Wall -Wno-pointer-sign -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES"
+# CFLAGS="-g -Wall -Wno-pointer-sign -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_DEPRECATED -DGSEAL_ENABLE"
#fi
pthread_name=
AC_MSG_RESULT($ac_cv_enable_gnutls)
if test "x$ac_cv_enable_gnutls" != "xno"; then
- OCPPFLAGS="$CPPFLAGS"
- OLDFLAGS="$LDFLAGS"
- GNUTLS_LIBS=""
- PKG_CHECK_MODULES(GNUTLS, gnutls >= 2.0.3,
- [ac_cv_enable_gnutls=yes],
- [ac_cv_enable_gnutls=no
- echo "GnuTLS version >= 2.0.3 not found"])
- 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
- if test x"$platform_win32" = "xyes"; then
- GNUTLS_LIBS="-lgnutls -lgcrypt ${GCRYPT_LIBS}"
- else
- GNUTLS_LIBS="-lgnutls -lgcrypt -lz ${GCRYPT_LIBS}"
- fi
- fi
-else
- CPPFLAGS="$OCPPFLAGS"
- LDFLAGS="$OLDFLAGS"
+ PKG_CHECK_MODULES(GNUTLS, gnutls >= 2.2,
+ [
+ AC_DEFINE(USE_GNUTLS, 1, gnutls)
+ echo "Building with GnuTLS"
+ ],
+ [
+ echo "Building without gnutls"
+ ])
+ PKG_CHECK_MODULES(GNUTLS, gnutls >= 2.11,
+ [
+ dnl No linking against libgcrypt needed
+ ],
+ [
+ dnl linking against libgcrypt *is* needed
+ GNUTLS_LIBS="$GNUTLS_LIBS -lgcrypt"
+ ])
+ AC_SUBST(GNUTLS_LIBS)
+ AC_SUBST(GNUTLS_CFLAGS)
fi
-if test "x$ac_cv_enable_gnutls" = "xyes"; then
- AC_DEFINE([USE_GNUTLS],1, [Define to use GnuTLS])
-else
- GNUTLS_LIBS=""
-fi
-AC_SUBST(GNUTLS_LIBS)
-
dnl password encryption
OLDLIBS=$LIBS
LIBS=
dnl ************************
dnl Checks for GTK
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10)
+AC_ARG_ENABLE(gtk3,
+ AS_HELP_STRING([--enable-gtk3],
+ [Determines whether to use Gtk+ 3.0.]),
+ [ac_cv_enable_gtk3=$enableval],[ac_cv_enable_gtk3=no])
+AM_CONDITIONAL(GTK3, false)
+AM_CONDITIONAL(GTK2, true)
+if test x"$ac_cv_enable_gtk3" = x"yes"; then
+ PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0 cairo)
+ AM_CONDITIONAL(GTK3, true)
+ AM_CONDITIONAL(GTK2, false)
+else
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10)
-dnl --disable-deprecated switch for GTK2 purification
-AC_ARG_ENABLE(deprecated, [ --disable-deprecated disable deprecated GTK functions. ],
+ dnl --disable-deprecated switch for GTK2 purification
+ AC_ARG_ENABLE(deprecated, [ --disable-deprecated disable deprecated GTK functions. ],
[GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"], [])
-
+fi
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)