Revert "Revert "Upstream merge""

[framework/uifw/ecore.git] / m4 / ecore_check_options.m4

diff --git a/m4/ecore_check_options.m4 b/m4/ecore_check_options.m4
index e11ca43..d20adca 100644 (file)
--- a/m4/ecore_check_options.m4
+++ b/m4/ecore_check_options.m4
@@ -165,16 +165,24 @@ AC_ARG_ENABLE([gnutls],
    ])
 
 if test "x${_ecore_want_gnutls}" = "xyes" -o "x${_ecore_want_gnutls}" = "xauto" ; then
-   PKG_CHECK_MODULES([TLS], [gnutls],
+   PKG_CHECK_MODULES([TLS], [gnutls >= 2.10.2],
       [
        AC_DEFINE([USE_GNUTLS], [1], [Use GnuTLS])
        _ecore_have_gnutls="yes"
       ],
       [_ecore_have_gnutls="no"])
    # for ecore_con_ssl.c
-   PKG_CHECK_MODULES([TLS2], [gnutls >= 2.0.0],
+   PKG_CHECK_MODULES([TLS2], [gnutls >= 2.10.2],
       [AC_DEFINE(USE_GNUTLS2, 1, [Use GnuTLS 2 or higher])],
       [dummy="no"])
+   if test "x$_ecore_have_gnutls" = "xyes";then
+     AC_PATH_GENERIC([libgcrypt], [], [_ecore_have_gnutls="yes"], [_ecore_have_gnutls="no"])
+        if test "x${_ecore_have_gnutls}" = "xyes" ; then
+           TLS_CFLAGS="${TLS_CFLAGS} ${LIBGCRYPT_CFLAGS}"
+           TLS_LIBS="${TLS_LIBS} ${LIBGCRYPT_LIBS}"
+        fi
+   fi
+
 fi
 
 if test "x$_ecore_have_gnutls" = "xyes" ; then
@@ -200,6 +208,10 @@ AC_ARG_ENABLE(openssl,
     fi
   ])
 
+if test "x${_ecore_have_gnutls}" = "xyes";then
+  _ecore_want_openssl=no
+fi
+
 if test "x${_ecore_want_openssl}" = "xyes" -o "x${_ecore_want_openssl}" = "xauto"; then
    PKG_CHECK_MODULES([SSL],
       [openssl],
@@ -226,6 +238,18 @@ _ecore_have_tslib="no"
 TSLIB_LIBS=""
 TSLIB_CFLAGS=""
 
+AC_ARG_ENABLE([tslib],
+   [AC_HELP_STRING([--disable-tslib],
+       [disable the tslib support in ecore (currently ecore-fb).
+        @<:@default=detect@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       _ecore_want_tslib="yes"
+    else
+       _ecore_want_tslib="no"
+    fi
+   ])
+
 if test "x${_ecore_want_tslib}" = "xyes" -o "x${_ecore_want_tslib}" = "xauto" ; then
    PKG_CHECK_MODULES([TSLIB], [tslib-1.0],
      [
@@ -276,11 +300,8 @@ fi
 dnl use: ECORE_CHECK_CARES(default-enabled[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
 AC_DEFUN([ECORE_CHECK_CARES],
 [
-_cares_requirement=""
 _ecore_want_cares=$1
 _ecore_have_cares="no"
-CARES_LIBS=""
-CARES_CFLAGS=""
 
 AC_ARG_ENABLE(cares,
   [AC_HELP_STRING([--disable-cares], [disable cares support])],
@@ -294,19 +315,13 @@ AC_ARG_ENABLE(cares,
 
 if test "x${_ecore_want_cares}" = "xyes" -o "x${_ecore_want_cares}" = "xauto" ; then
    PKG_CHECK_MODULES([CARES], [libcares >= 1.6.1],
-     [
-      AC_DEFINE(HAVE_CARES, 1, [Build Ecore_Con_Info with c-ares support])
-      _ecore_have_cares="yes"
-      _cares_requirement="libcares"
-     ], [
-      _ecore_have_cares="no"
-     ])
+     [_ecore_have_cares="yes"],
+     [_ecore_have_cares="no"])
 fi
 
-AM_CONDITIONAL(HAVE_CARES, test "x$_ecore_have_cares" = "xyes")
-
-AC_SUBST(CARES_LIBS)
-AC_SUBST(CARES_CFLAGS)
+if test "x${_ecore_have_cares}" = "xyes" ; then
+   AC_DEFINE([HAVE_CARES], [1], [Build Ecore_Con_Info with c-ares support])
+fi
 
 if test "x$_ecore_have_cares" = "xyes" ; then
    m4_default([$2], [:])