sync with HEAD
[claws.git] / configure.ac
index ca851dbb1d286adc1100452417902375cdb7ca9b..583697013055d341464db61491acd975774f02a0 100644 (file)
@@ -11,9 +11,9 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=46
+EXTRA_VERSION=50
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.2
+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}
@@ -284,7 +284,9 @@ AC_ARG_ENABLE(openssl,
        [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)
-       AC_DEFINE(USE_OPENSSL, 1, Define if you want OpenSSL support)
+       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)