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 257c63b..d20adca 100644 (file)
--- a/m4/ecore_check_options.m4
+++ b/m4/ecore_check_options.m4
@@ -84,6 +84,37 @@ else
    m4_default([$3], [:])
 fi
 ])
+ 
+dnl use: ECORE_CHECK_NOTIFY_WIN32(default-enabled[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+AC_DEFUN([ECORE_CHECK_NOTIFY_WIN32],
+[
+_ecore_want_notify_win32=$1
+_ecore_have_notify_win32="no"
+
+AC_ARG_ENABLE(notify-win32,
+   [AC_HELP_STRING([--disable-notify-win32], [disable Windows notification in the ecore_file module])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       _ecore_want_notify_win32="yes"
+    else
+       _ecore_want_notify_win32="no"
+    fi
+   ])
+
+AC_MSG_CHECKING(whether Windows notification is to be used for filemonitoring)
+AC_MSG_RESULT(${_ecore_want_notify_win32})
+
+if test "x${_ecore_want_notify_win32}" = "xyes" ; then
+   AC_DEFINE([HAVE_NOTIFY_WIN32], [1], [ File monitoring with Windows notification ])
+   _ecore_have_notify_win32="yes"
+fi
+
+if test "x${_ecore_have_notify_win32}" = "xyes" ; then
+   m4_default([$2], [:])
+else
+   m4_default([$3], [:])
+fi
+])
 
 dnl use: ECORE_CHECK_CURL(default-enabled[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
 AC_DEFUN([ECORE_CHECK_CURL],
@@ -134,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
@@ -169,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],
@@ -189,24 +232,37 @@ fi
 dnl use: ECORE_CHECK_TSLIB(default-enabled[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
 AC_DEFUN([ECORE_CHECK_TSLIB],
 [
+_tslib_requirement=""
 _ecore_want_tslib=$1
 _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,
+   PKG_CHECK_MODULES([TSLIB], [tslib-1.0],
      [
       AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code])
-      _ecore_have_ts="yes"
-     ],
-     [
-      PKG_CHECK_MODULES(TSLIB, tslib,
+      _ecore_have_tslib="yes"
+      _tslib_requirement="tslib-1.0"
+     ],[
+      PKG_CHECK_MODULES([TSLIB], [tslib],
         [
          AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code])
-         _ecore_have_ts="yes"
-        ],
-        [
+         _ecore_have_tslib="yes"
+         _tslib_requirement="tslib"
+        ],[
          AC_CHECK_HEADER([tslib.h],
            [
             AC_CHECK_LIB([ts], [ts_open], 
@@ -214,16 +270,16 @@ if test "x${_ecore_want_tslib}" = "xyes" -o "x${_ecore_want_tslib}" = "xauto" ;
                TSLIB_LIBS="-lts" 
                TSLIB_CFLAGS=""
                AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code])
-               _ecore_have_ts="yes"
-              ,
+               _ecore_have_tslib="yes"
+              ],[
                AC_CHECK_LIB([tslib], [ts_open],
                  [
                   TSLIB_LIBS="-ltslib"
                   TSLIB_CFLAGS=""
                   AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code])
-                  _ecore_have_ts="yes"
-                 ,
-                  _ecore_have_ts="no"
+                  _ecore_have_tslib="yes"
+                 ],[
+                  _ecore_have_tslib="no"
                  ])
               ])
            ])
@@ -240,3 +296,36 @@ else
    m4_default([$3], [:])
 fi
 ])
+
+dnl use: ECORE_CHECK_CARES(default-enabled[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+AC_DEFUN([ECORE_CHECK_CARES],
+[
+_ecore_want_cares=$1
+_ecore_have_cares="no"
+
+AC_ARG_ENABLE(cares,
+  [AC_HELP_STRING([--disable-cares], [disable cares support])],
+  [
+    if test "x${enableval}" = "xyes" ; then
+       _ecore_want_cares="yes"
+    else
+       _ecore_want_cares="no"
+    fi
+  ])
+
+if test "x${_ecore_want_cares}" = "xyes" -o "x${_ecore_want_cares}" = "xauto" ; then
+   PKG_CHECK_MODULES([CARES], [libcares >= 1.6.1],
+     [_ecore_have_cares="yes"],
+     [_ecore_have_cares="no"])
+fi
+
+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], [:])
+else
+   m4_default([$3], [:])
+fi
+])