E SVN: cedric IN trunk/ecore: . src/lib/ecore_con

[Enlightenment S. <no-...@en...>]

Log:
ecore: Add Ecore_Con_Eet API.
  

Author:       cedric
Date:         2012-08-30 20:11:24 -0700 (Thu, 30 Aug 2012)
New Revision: 75910
Trac:         http://trac.enlightenment.org/e/changeset/75910

Added:
  trunk/ecore/src/lib/ecore_con/Ecore_Con_Eet.h trunk/ecore/src/lib/ecore_con/ecore_con_eet.c 
Modified:
  trunk/ecore/ChangeLog trunk/ecore/NEWS trunk/ecore/configure.ac trunk/ecore/src/lib/ecore_con/Makefile.am 

Modified: trunk/ecore/ChangeLog
===================================================================
--- trunk/ecore/ChangeLog	2012-08-31 02:34:53 UTC (rev 75909)
+++ trunk/ecore/ChangeLog	2012-08-31 03:11:24 UTC (rev 75910)
@@ -891,3 +891,7 @@
 2012-08-30  Carsten Haitzler (The Rasterman)
 
         1.7.0 release
+
+2012-08-31  Cedric Bail
+
+	* Add Ecore_Con_Eet API to help using Eet_Data with Ecore_Con

Modified: trunk/ecore/NEWS
===================================================================
--- trunk/ecore/NEWS	2012-08-31 02:34:53 UTC (rev 75909)
+++ trunk/ecore/NEWS	2012-08-31 03:11:24 UTC (rev 75910)
@@ -1,3 +1,16 @@
+Ecore 1.8.0
+
+Changes since Ecore 1.7.0:
+--------------------------
+
+Additions:
+    * ecore_con:
+     - Add Ecore_Con_Eet API to help using Eet_Data with Ecore_Con.
+
+Fixes:
+
+Improvements:
+
 Ecore 1.7.0
 
 Changes since Ecore 1.2.0:

Modified: trunk/ecore/configure.ac
===================================================================
--- trunk/ecore/configure.ac	2012-08-31 02:34:53 UTC (rev 75909)
+++ trunk/ecore/configure.ac	2012-08-31 03:11:24 UTC (rev 75910)
@@ -114,6 +114,7 @@
 
 # core modules
 want_ecore_con="yes"
+want_ecore_con_eet="yes"
 want_ecore_ipc="yes"
 want_ecore_file="yes"
 #want_ecore_config="no"
@@ -184,6 +185,7 @@
 case "$host_os" in
    mingw32ce*)
       want_ecore_con="no"
+      want_ecore_con_eet="no"
       want_ecore_ipc="no"
       want_ecore_wince="yes"
       want_ecore_evas_software_16_wince="yes"
@@ -622,12 +624,11 @@
 
 # Eet library (ecore_config)
 
-#PKG_CHECK_MODULES([EET],
-#   [eet >= 1.6.99],
-#   [have_eet="yes"],
-#   [have_eet="no"])
+PKG_CHECK_MODULES([EET],
+   [eet >= 1.6.99],
+   [have_eet="yes"],
+   [have_eet="no"])
 
-
 # Xlib and XCB (ecore_x)
 
 AC_CHECK_DECL([MAXHOSTNAMELEN], [FOUND_MAXHOSTNAMELEN=yes])
@@ -1477,6 +1478,7 @@
 have_cares="no"
 want_ipv6="yes"
 have_ipv6="no"
+have_ecore_con_eet="no"
 
 AC_ARG_ENABLE([ipv6],
    [AC_HELP_STRING([--disable-ipv6],
@@ -1511,6 +1513,13 @@
    fi
    AM_CONDITIONAL([HAVE_IPV6], [test "x${have_ipv6}" = "xyes"])
 
+   if test "x${have_eet}" = "xyes" ; then
+      requirements_ecore_con="eet > 1.7 ${requirements_ecore_con}"
+      have_ecore_con_eet="yes"
+      AC_DEFINE(ECORE_HAVE_EET, 1, [Define if Ecore_Con Eet_Connection helper is supported])
+   fi
+   AM_CONDITIONAL([ECORE_HAVE_EET], [test "x${have_ecore_con_eet}" = "xyes"])
+
    ECORE_CHECK_CURL([${want_curl}],
       [
        have_curl="yes"
@@ -2113,6 +2122,7 @@
   echo "    IPv6.......................: $have_ipv6"
   echo "    GnuTLS.....................: $have_gnutls"
   echo "    CURL.......................: $have_curl"
+  echo "    Eet........................: $have_ecore_con_eet"
   echo "    Local Sockets..............: $want_ecore_con_local_sockets"
 if test "x$want_ecore_con_local_sockets" = "xyes" ; then
   echo "      Abstract Sockets.........: $want_ecore_con_abstract_sockets"

Modified: trunk/ecore/src/lib/ecore_con/Makefile.am
===================================================================
--- trunk/ecore/src/lib/ecore_con/Makefile.am	2012-08-31 02:34:53 UTC (rev 75909)
+++ trunk/ecore/src/lib/ecore_con/Makefile.am	2012-08-31 03:11:24 UTC (rev 75910)
@@ -12,6 +12,7 @@
 @EINA_CFLAGS@ \
 @TLS_CFLAGS@ \
 @CARES_CFLAGS@ \
+@EET_CFLAGS@ \
 @WIN32_CPPFLAGS@
 
 lib_LTLIBRARIES = libecore_con.la
@@ -44,9 +45,14 @@
 endif
 endif
 
+if ECORE_HAVE_EET
+libecore_con_la_SOURCES += ecore_con_eet.c
+includes_HEADERS += Ecore_Con_Eet.h
+endif
+
 libecore_con_la_LIBADD = \
 $(top_builddir)/src/lib/ecore/libecore.la \
-@SSL_LIBS@ @CURL_LIBS@ @EINA_LIBS@ @EVIL_LIBS@ @TLS_LIBS@ @CARES_LIBS@ @WIN32_LIBS@
+@SSL_LIBS@ @CURL_LIBS@ @EINA_LIBS@ @EVIL_LIBS@ @TLS_LIBS@ @CARES_LIBS@ @WIN32_LIBS@ @EET_LIBS@
 
 libecore_con_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@