MICRO_VERSION=12
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=18
+EXTRA_VERSION=51
EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.10
+EXTRA_GTK2_VERSION=.1
if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
fi
dnl Check for OpenSSL
-AM_PATH_OPENSSL
+AC_ARG_ENABLE(openssl,
+ [ --enable-openssl Attempt to use OpenSSL for SSL support.],
+ [ac_cv_enable_openssl=$enableval], [ac_cv_enable_openssl=yes])
+if test x"$ac_cv_enable_openssl" = xyes; then
+ 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)
+ fi
+fi
+AC_SUBST(OPENSSL_CFLAGS)
+AC_SUBST(OPENSSL_LIBS)
dnl password encryption
OLDLIBS=$LIBS
AM_PATH_GTK_2_0(2.4.0,,
AC_MSG_ERROR(Test for GTK failed. See the file 'INSTALL' for help.))
-dnl check if gdk / gtk was compiled with USE_XIM
-AC_MSG_CHECKING([whether GTK was compiled with XIM support])
-CFLAGS_SAVE="$CFLAGS"
-LDFLAGS_SAVE="$LDFLAGS"
-CFLAGS="$CFLAGS `$GTK_CONFIG --cflags`"
-LDFLAGS="$LDFLAGS `$GTK_CONFIG --libs`"
-AC_CACHE_VAL(ac_cv_use_xim, [
- AC_TRY_LINK_FUNC([gdk_ic_attr_new],
- ac_cv_use_xim=yes, ac_cv_use_xim=no)
-])
-AC_MSG_RESULT($ac_cv_use_xim)
-if test $ac_cv_use_xim = yes; then
- AC_DEFINE(USE_XIM, 1, Whether GTK was compiled with XIM support or not)
-fi
-CFLAGS="$CFLAGS_SAVE"
-LDFLAGS="$LDFLAGS_SAVE"
-
dnl GNU/Aspell is used for spell checking
AC_ARG_ENABLE(aspell,
[ --enable-aspell Enable GNU/aspell support [default=no]],
PKG_CHECK_MODULES(GTK_MATH_VIEW, gtkmathview >= 0.5, :, ac_cv_enable_mathml_viewer_plugin=no)
if test x"$ac_cv_enable_mathml_viewer_plugin" = xyes; then
- AC_SUBST(GTK_MATH_VIEW_CFLAGS)
- AC_SUBST(GTK_MATH_VIEW_LIBS)
PLUGINS="mathml-viewer $PLUGINS"
fi
fi
+AC_SUBST(GTK_MATH_VIEW_CFLAGS)
+AC_SUBST(GTK_MATH_VIEW_LIBS)
AM_CONDITIONAL(BUILD_MATHML_VIEWER_PLUGIN, test x"$ac_cv_enable_mathml_viewer_plugin" = xyes)
dnl --- Image Viewer ---
AC_CHECK_HEADERS(clamav.h, :, ac_cv_enable_clamav_plugin=no)
if test x"$ac_cv_enable_clamav_plugin" = xyes; then
CLAMAV_LIBS="${clamav_lib}"
- AC_SUBST(CLAMAV_LIBS)
PLUGINS="clamav $PLUGINS"
else
AC_MSG_NOTICE([clamav library not found, will not build clamav plugin])
fi
fi
+AC_SUBST(CLAMAV_LIBS)
AM_CONDITIONAL(BUILD_CLAMAV_PLUGIN, test x"$ac_cv_enable_clamav_plugin" = xyes)
dnl ****************************