aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-09-17 16:35:38 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-09-17 16:35:38 +0000
commit8abaff3bdf53ecc7e605b82b12e385b8c0a02327 (patch)
tree4c828ae7083f724fd0214cf3624b20a7cf9448d2
parent12732ab7ebcacad66352d3d48306e9945a4a584f (diff)
downloadefl-8abaff3bdf53ecc7e605b82b12e385b8c0a02327.tar.gz
efl-8abaff3bdf53ecc7e605b82b12e385b8c0a02327.tar.xz
efl-8abaff3bdf53ecc7e605b82b12e385b8c0a02327.zip
merge: add eet
SVN revision: 76768
-rw-r--r--AUTHORS20
-rw-r--r--ChangeLog.eet (renamed from legacy/eet/ChangeLog)0
-rw-r--r--Makefile.am24
-rw-r--r--NEWS.eet (renamed from legacy/eet/NEWS)0
-rw-r--r--README.eet (renamed from legacy/eet/README)0
-rw-r--r--configure.ac411
-rw-r--r--eet.pc.in (renamed from legacy/eet/eet.pc.in)0
-rw-r--r--eet.spec.in (renamed from legacy/eet/eet.spec.in)0
-rw-r--r--m4/ac_path_generic.m4 (renamed from legacy/ecore/m4/ac_path_generic.m4)0
-rw-r--r--m4/efl_binary.m4 (renamed from legacy/eet/m4/efl_binary.m4)0
-rw-r--r--m4/efl_check_libs.m4 (renamed from legacy/eet/m4/efl_check_libs.m4)0
-rw-r--r--m4/efl_compiler.m42
-rw-r--r--src/bin/Makefile.am2
-rw-r--r--src/bin/eet/Makefile.am17
-rw-r--r--src/bin/eet/eet_main.c (renamed from legacy/eet/src/bin/eet_main.c)0
-rw-r--r--src/examples/Makefile.am6
-rw-r--r--src/examples/eet/Makefile.am50
-rw-r--r--src/examples/eet/eet-basic.c (renamed from legacy/eet/src/examples/eet-basic.c)0
-rw-r--r--src/examples/eet/eet-data-cipher_decipher.c (renamed from legacy/eet/src/examples/eet-data-cipher_decipher.c)0
-rw-r--r--src/examples/eet/eet-data-file_descriptor_01.c (renamed from legacy/eet/src/examples/eet-data-file_descriptor_01.c)0
-rw-r--r--src/examples/eet/eet-data-file_descriptor_02.c (renamed from legacy/eet/src/examples/eet-data-file_descriptor_02.c)0
-rw-r--r--src/examples/eet/eet-data-nested.c (renamed from legacy/eet/src/examples/eet-data-nested.c)0
-rw-r--r--src/examples/eet/eet-data-simple.c (renamed from legacy/eet/src/examples/eet-data-simple.c)0
-rw-r--r--src/examples/eet/eet-file.c (renamed from legacy/eet/src/examples/eet-file.c)0
-rw-r--r--src/examples/eina/Makefile.am2
-rw-r--r--src/lib/Makefile.am2
-rw-r--r--src/lib/eet/Eet.h (renamed from legacy/eet/src/lib/Eet.h)0
-rw-r--r--src/lib/eet/Eet_private.h (renamed from legacy/eet/src/lib/Eet_private.h)0
-rw-r--r--src/lib/eet/Makefile.am43
-rw-r--r--src/lib/eet/eet_alloc.c (renamed from legacy/eet/src/lib/eet_alloc.c)0
-rw-r--r--src/lib/eet/eet_cipher.c (renamed from legacy/eet/src/lib/eet_cipher.c)0
-rw-r--r--src/lib/eet/eet_connection.c (renamed from legacy/eet/src/lib/eet_connection.c)0
-rw-r--r--src/lib/eet/eet_data.c (renamed from legacy/eet/src/lib/eet_data.c)0
-rw-r--r--src/lib/eet/eet_dictionary.c (renamed from legacy/eet/src/lib/eet_dictionary.c)0
-rw-r--r--src/lib/eet/eet_image.c (renamed from legacy/eet/src/lib/eet_image.c)0
-rw-r--r--src/lib/eet/eet_lib.c (renamed from legacy/eet/src/lib/eet_lib.c)0
-rw-r--r--src/lib/eet/eet_node.c (renamed from legacy/eet/src/lib/eet_node.c)0
-rw-r--r--src/lib/eet/eet_utils.c (renamed from legacy/eet/src/lib/eet_utils.c)0
-rw-r--r--src/lib/eet/lz4/README (renamed from legacy/eet/src/lib/lz4/README)0
-rw-r--r--src/lib/eet/lz4/lz4.c (renamed from legacy/eet/src/lib/lz4/lz4.c)0
-rw-r--r--src/lib/eet/lz4/lz4.h (renamed from legacy/eet/src/lib/lz4/lz4.h)0
-rw-r--r--src/lib/eet/lz4/lz4hc.c (renamed from legacy/eet/src/lib/lz4/lz4hc.c)0
-rw-r--r--src/lib/eet/lz4/lz4hc.h (renamed from legacy/eet/src/lib/lz4/lz4hc.h)0
-rw-r--r--src/tests/Makefile.am2
-rw-r--r--src/tests/eet/Makefile.am19
-rw-r--r--src/tests/eet/TODO (renamed from legacy/eet/src/tests/TODO)0
-rw-r--r--src/tests/eet/cert.pem (renamed from legacy/eet/src/tests/cert.pem)0
-rw-r--r--src/tests/eet/eet_data_suite.c (renamed from legacy/eet/src/tests/eet_data_suite.c)0
-rw-r--r--src/tests/eet/eet_suite.c (renamed from legacy/eet/src/tests/eet_suite.c)0
-rw-r--r--src/tests/eet/eet_suite.h (renamed from legacy/eet/src/tests/eet_suite.h)0
-rw-r--r--src/tests/eet/key.pem (renamed from legacy/eet/src/tests/key.pem)0
-rw-r--r--src/tests/eet/key_enc.pem (renamed from legacy/eet/src/tests/key_enc.pem)0
-rw-r--r--src/tests/eet/key_enc_none.pem (renamed from legacy/eet/src/tests/key_enc_none.pem)0
53 files changed, 561 insertions, 39 deletions
diff --git a/AUTHORS b/AUTHORS
index 674562e3d..8771d23de 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -41,3 +41,23 @@ Raphael Kubo da Costa <rakuco@freebsd.org>
Jérôme Pinot <ngc891@gmail.com>
Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Patryk Kaczmarek <patryk.k@samsung.com>
+
+Eet
+---
+
+The Rasterman (Carsten Haitzler) <raster@rasterman.com>
+David Goodlad <dgoodlad@gmail.com>
+Cedric Bail <cedric.bail@free.fr>
+Arnaud de Turckheim <quarium@gmail.com>
+Luis Felipe Strano Moraes <lfelipe@profusion.mobi>
+Chidambar Zinnoury <illogict@online.fr>
+Vincent Torri <vtorri@univ-evry.fr>
+Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
+Raphael Kubo da Costa <kubo@profusion.mobi>
+Mathieu Taillefumier <mathieu.taillefumier@free.fr>
+Albin "Lutin" Tonnerre <albin.tonnerre@gmail.com>
+Adam Simpkins <adam@adamsimpkins.net>
+Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
+Lionel Orry <lionel.orry@gmail.com>
+Jérôme Pinot <ngc891@gmail.com>
+Leandro Santiago <leandrosansilva@gmail.com>
diff --git a/legacy/eet/ChangeLog b/ChangeLog.eet
index cc26e4442..cc26e4442 100644
--- a/legacy/eet/ChangeLog
+++ b/ChangeLog.eet
diff --git a/Makefile.am b/Makefile.am
index 1d9a508d8..74449d56b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,21 +21,35 @@ m4/ltsugar.m4 \
m4/ltversion.m4
EXTRA_DIST = \
+m4/ac_path_generic.m4 \
m4/efl_attribute.m4 \
m4/efl_check_funcs.m4 \
m4/efl_compiler.m4 \
m4/efl_doxygen.m4 \
m4/efl_path_max.m4 \
m4/efl_threads.m4 \
-m4/evil_windows.m4
+m4/evil_windows.m4 \
+m4/eina_check.m4
if HAVE_WINDOWS
-EXTRA_DIST += evil.pc
+EXTRA_DIST += \
+ChangeLog.evil \
+NEWS.evil \
+README.evil \
+evil.pc
endif
EXTRA_DIST += \
+ChangeLog.eina \
+NEWS.eina \
+README.eina \
eina.spec \
-eina.pc
+eina.pc \
+ChangeLog.eet \
+NEWS.eet \
+README.eet \
+eet.spec \
+eet.pc
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA =
@@ -44,7 +58,7 @@ if HAVE_WINDOWS
pkgconfig_DATA += evil.pc
endif
-pkgconfig_DATA += eina.pc
+pkgconfig_DATA += eina.pc eet.pc
.PHONY: doc benchmark examples install-examples
@@ -79,7 +93,7 @@ check-local:
if EFL_ENABLE_COVERAGE
@$(MAKE) lcov-reset
endif
- @./src/tests/eina/eina_suite
+ @./src/tests/eet/eet_suite
if EFL_ENABLE_COVERAGE
@$(MAKE) lcov-report
endif
diff --git a/legacy/eet/NEWS b/NEWS.eet
index 9555bc938..9555bc938 100644
--- a/legacy/eet/NEWS
+++ b/NEWS.eet
diff --git a/legacy/eet/README b/README.eet
index 989f4bbd7..989f4bbd7 100644
--- a/legacy/eet/README
+++ b/README.eet
diff --git a/configure.ac b/configure.ac
index 475e67730..72b13a2a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -167,6 +167,19 @@ AM_CONDITIONAL([HAVE_WINDOWS], [test "x${have_windows}" = "xyes"])
#### Additional options to configure
+# Assert or fail.
+
+AC_ARG_ENABLE([assert],
+ [AC_HELP_STRING([--enable-assert], [enable assert, @<:@default=no@:>@])],
+ [
+ if test "x${enableval}" = "xyes" ; then
+ prefer_assert="yes"
+ else
+ prefer_assert="no"
+ fi
+ ],
+ [prefer_assert="no"])
+
#### Checks for programs
@@ -216,6 +229,8 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
#### Checks for header files
+EFL_CHECK_PATH_MAX
+
#### Checks for types
@@ -225,6 +240,8 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
#### Checks for compiler characteristics
+AC_C_BIGENDIAN
+AC_C_INLINE
EFL_ATTRIBUTE_UNUSED
# EFL_CHECK_COMPILER_FLAGS([MY_LIB], [-Wall -Wextra])
@@ -242,6 +259,7 @@ AC_SUBST([lt_enable_auto_import])
#### Checks for library functions
+AC_FUNC_ALLOCA
###################### EFL ######################
@@ -422,19 +440,6 @@ if test "x${have_stringshare_usage}" = "xyes"; then
AC_DEFINE([EINA_STRINGSHARE_USAGE], [1], [Report Eina stringshare usage pattern])
fi
-# Assert or fail.
-
-AC_ARG_ENABLE([assert],
- [AC_HELP_STRING([--enable-assert], [enable assert, @<:@default=no@:>@])],
- [
- if test "x${enableval}" = "xyes" ; then
- prefer_assert="yes"
- else
- prefer_assert="no"
- fi
- ],
- [prefer_assert="no"])
-
# Check if we want to benchmark on real data
AC_ARG_ENABLE([e17],
[AC_HELP_STRING([--enable-e17], [enable heavy benchmark @<:@default=no@:>@])],
@@ -481,7 +486,7 @@ case "$host_vendor" in
;;
esac
-# Exotic library for copilation on Coyote
+# Exotic library for compilation on Coyote
PKG_CHECK_EXISTS([exotic],
[
@@ -667,10 +672,6 @@ AC_SUBST([EINA_CONFIGURE_HAVE_DIRENT_H])
### Checks for compiler characteristics
-AC_C_BIGENDIAN
-AC_C_INLINE
-EFL_ATTRIBUTE_UNUSED
-
m4_ifdef([v_ver],
[
EFL_CHECK_COMPILER_FLAGS([EINA], [-Wall -Wextra])
@@ -678,16 +679,12 @@ m4_ifdef([v_ver],
EFL_CHECK_COMPILER_FLAGS([EINA], [-Wshadow])
-EFL_CHECK_PATH_MAX
-
### Checks for linker characteristics
EFL_CHECK_LINKER_FLAGS([EINA], [-fno-strict-aliasing])
### Checks for library functions
-AC_FUNC_ALLOCA
-
AC_CHECK_FUNCS([strlcpy openat fstatat fpathconf execvp backtrace backtrace_symbols malloc_usable_size mtrace])
EFL_CHECK_FUNCS([EINA], [dirfd dlopen dladdr fnmatch iconv shm_open setxattr])
@@ -752,21 +749,359 @@ EINA_CHECK_MODULE([one-big], [${enable_one_big}], [one big])
#### Eet
-#AC_MSG_NOTICE([Eet checks])
+AC_MSG_NOTICE([Eet checks])
### Default values
+
### Additional options to configure
+
+EFL_ENABLE_BIN([eet])
+
+# Old eet file format support
+
+AC_ARG_ENABLE(old-eet-file-format,
+ [AC_HELP_STRING(
+ [--disable-old-eet-file-format],
+ [disable old eet file format support @<:@default=enabled@:>@])],
+ [
+ if test "x${enableval}" = "xyes" ; then
+ old_eet_file_format="yes"
+ else
+ old_eet_file_format="no"
+ fi
+ ],
+ [old_eet_file_format="yes"])
+
+AC_MSG_CHECKING([whether to support old eet file format])
+AC_MSG_RESULT([${old_eet_file_format}])
+
+if test "x${old_eet_file_format}" = "xyes" ; then
+ AC_DEFINE(EET_OLD_EET_FILE_FORMAT, 1, [support old eet file format])
+else
+ AC_DEFINE(EET_OLD_EET_FILE_FORMAT, 0, [support old eet file format])
+fi
+
+# Openssl support
+
+AC_ARG_ENABLE([openssl],
+ [AC_HELP_STRING([--disable-openssl], [disable openssl eet support @<:@default=auto@:>@])],
+ [
+ if test "x${enableval}" = "xyes" ; then
+ want_openssl="yes"
+ else
+ want_openssl="no"
+ fi
+ ],
+ [want_openssl="auto"])
+
+AC_MSG_CHECKING([whether to use OpenSSL])
+AC_MSG_RESULT([${want_openssl}])
+
+# GnuTLS support
+
+AC_ARG_ENABLE([gnutls],
+ [AC_HELP_STRING([--disable-gnutls], [disable gnutls eet support @<:@default=auto@:>@])],
+ [
+ if test "x${enableval}" = "xyes" ; then
+ want_gnutls="yes"
+ else
+ want_gnutls="no"
+ fi
+ ],
+ [want_gnutls="auto"])
+
+AC_MSG_CHECKING([whether to use Gnutls])
+AC_MSG_RESULT([${want_gnutls}])
+
+# Cryptography support
+
+AC_ARG_ENABLE([cipher],
+ [AC_HELP_STRING([--disable-cipher], [disable cipher support for eet API @<:@default=yes@:>@])],
+ [
+ if test "x${enableval}" = "xyes" ; then
+ want_cipher="yes"
+ else
+ want_cipher="no"
+ fi
+ ],
+ [want_cipher="yes"])
+
+AC_MSG_CHECKING([whether to use cipher])
+AC_MSG_RESULT([${want_cipher}])
+
+AC_ARG_ENABLE([signature],
+ [AC_HELP_STRING([--disable-signature], [disable signature file support for eet @<:@default=yes@:>@])],
+ [
+ if test "x${enableval}" = "xyes" ; then
+ want_signature="yes"
+ else
+ want_signature="no"
+ fi
+ ],
+ [want_signature="yes"])
+
+AC_MSG_CHECKING([whether to use signature])
+AC_MSG_RESULT([${want_signature}])
+
### Checks for programs
+
### Checks for libraries
+
+## Compatibility layers
+
+# Evil library for compilation on Windows
+
+EFL_EET_BUILD=""
+case "$host_os" in
+ mingw*)
+ PKG_CHECK_EXISTS([evil >= 1.1.0])
+ AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if Evil package is installed])
+ requirements_pc_eet="evil ${requirements_pc_eet}"
+ EFL_EET_BUILD="-DEFL_EET_BUILD"
+ ;;
+esac
+AC_SUBST(EFL_EET_BUILD)
+
+# Exotic library for compilation on Coyote
+
+PKG_CHECK_EXISTS([exotic],
+ [
+ enable_exotic="yes"
+ AC_DEFINE([HAVE_EXOTIC_H], [1], [Define to 1 if you have Exotic.])
+ requirements_pc_eet="exotic ${requirements_pc_eet}"
+ ],
+ [enable_exotic="no"])
+
+## Secure layer
+
+# Gnutls library
+
+have_gnutls="no"
+if test "x${want_gnutls}" = "xyes" || test "x${want_gnutls}" = "xauto" ; then
+ PKG_CHECK_MODULES([GNUTLS], [gnutls >= 1.7.6],
+ [
+ have_gnutls="yes"
+ want_openssl="no"
+ AC_DEFINE([HAVE_GNUTLS], [1], [Have Gnutls support])
+ requirements_pc_eet="gnutls >= 1.7.6 ${requirements_pc_eet}"
+ ],
+ [have_gnutls="no"])
+fi
+
+# libgcrypt
+
+if test "x${have_gnutls}" = "xyes" ; then
+ AC_PATH_GENERIC([libgcrypt], [], [have_gnutls="yes"], [have_gnutls="no"])
+ if test "x${have_gnutls}" = "xyes" ; then
+ requirements_libs_eet="${LIBGCRYPT_LIBS} ${requirements_libs_eet}"
+ fi
+fi
+
+# Specific GNUTLS improvement
+
+AC_ARG_ENABLE(new-gnutls-api,
+ [AC_HELP_STRING(
+ [--disable-new-gnutls-api],
+ [enable use of gnutls_x509_crt_verify_hash. @<:@default=yes@:>@])],
+ [
+ if test "x${enableval}" = "xyes" ; then
+ new_gnutls_api="yes"
+ else
+ new_gnutls_api="no"
+ fi
+ ],
+ [new_gnutls_api="yes"])
+
+AC_MSG_CHECKING([whether to use gnutls_x509_crt_verify_hash])
+AC_MSG_RESULT([${new_gnutls_api}])
+
+if test "x${have_gnutls}" = "xyes" && test "x${new_gnutls_api}" = "xyes" ; then
+ CFLAGS_save="${CFLAGS}"
+ LIBS_save="${LIBS}"
+ CFLAGS="${GNUTLS_CFLAGS}"
+ LIBS="${GNUTLS_LIBS}"
+ AC_CHECK_LIB([gnutls], [gnutls_x509_crt_verify_hash],
+ [
+ AC_DEFINE([EET_USE_NEW_GNUTLS_API], [1], [use gnutls_x509_crt_verify_hash])
+ new_gnutls_api="yes"
+ ],
+ [new_gnutls_api="no"])
+ CFLAGS="${CFLAGS_save}"
+ LIBS="${LIBS_save}"
+fi
+
+use_gnutls_privkey_sign_data="no"
+if test "x${have_gnutls}" = "xyes" ; then
+ CFLAGS_save="${CFLAGS}"
+ LIBS_save="${LIBS}"
+ CFLAGS="${GNUTLS_CFLAGS}"
+ LIBS="${GNUTLS_LIBS}"
+ AC_CHECK_LIB([gnutls], [gnutls_privkey_sign_data],
+ [
+ AC_DEFINE([EET_USE_NEW_PRIVKEY_SIGN_DATA], [1], [use gnutls_privkey_sign_data])
+ use_gnutls_privkey_sign_data="yes"
+ ],
+ [use_gnutls_privkey_sign_data="no"])
+ CFLAGS="${CFLAGS_save}"
+ LIBS="${LIBS_save}"
+fi
+
+AC_MSG_CHECKING([whether to use gnutls_privkey_sign_data])
+AC_MSG_RESULT([${use_gnutls_privkey_sign_data}])
+
+use_gnutls_pubkey_verify_hash="no"
+if test "x${have_gnutls}" = "xyes" ; then
+ CFLAGS_save="${CFLAGS}"
+ LIBS_save="${LIBS}"
+ CFLAGS="${GNUTLS_CFLAGS}"
+ LIBS="${GNUTLS_LIBS}"
+ AC_CHECK_LIB([gnutls], [gnutls_pubkey_verify_hash],
+ [
+ AC_DEFINE([EET_USE_NEW_PUBKEY_VERIFY_HASH], [1], [use gnutls_pubkey_verify_hash])
+ use_gnutls_pubkey_verify_hash="yes"
+ ],
+ [use_gnutls_pubkey_verify_hash="no"])
+ CFLAGS="${CFLAGS_save}"
+ LIBS="${LIBS_save}"
+fi
+
+AC_MSG_CHECKING([whether to use gnutls_pubkey_verify_hash])
+AC_MSG_RESULT([${use_gnutls_pubkey_verify_hash}])
+
+# Openssl library
+
+have_openssl="no"
+if test "x${want_openssl}" = "xyes" || test "x${want_openssl}" = "xauto" ; then
+ PKG_CHECK_EXISTS([openssl],
+ [
+ have_openssl="yes"
+ AC_DEFINE([HAVE_OPENSSL], [1], [Have Openssl support])
+ requirements_pc_eet="openssl ${requirements_pc_eet}"
+ ],
+ [have_openssl="no"])
+fi
+
+if test "x${have_gnutls}" = "xyes" ; then
+ secure_layer="GnuTLS"
+elif test "x${have_openssl}" = "xyes" ; then
+ secure_layer="OpenSSL"
+else
+ secure_layer="no"
+fi
+
+# Cryptography support
+
+have_cipher="no"
+if test "x${have_gnutls}" = "xyes" && test "x${want_cipher}" = "xyes" ; then
+ have_cipher="yes"
+ AC_DEFINE([HAVE_CIPHER], [1], [Have cipher support built in eet])
+elif test "x${have_openssl}" = "xyes" && test "x${want_cipher}" = "xyes" ; then
+ have_cipher="yes"
+ AC_DEFINE([HAVE_CIPHER], [1], [Have cipher support built in eet])
+fi
+
+AC_MSG_CHECKING([whether to activate cipher support in eet])
+AC_MSG_RESULT([${have_cipher}])
+
+have_signature="no"
+if test "x${have_gnutls}" = "xyes" && test "x${want_signature}" = "xyes" ; then
+ have_signature="yes"
+ AC_DEFINE([HAVE_SIGNATURE], [1], [Have signature support for eet file])
+elif test "x${have_openssl}" = "xyes" && test "x${want_signature}" = "xyes" ; then
+ have_signature="yes"
+ AC_DEFINE([HAVE_SIGNATURE], [1], [Have signature support for eet file])
+fi
+
+AC_MSG_CHECKING([whether to activate signature support in eet])
+AC_MSG_RESULT([${have_signature}])
+
+# libjpeg and zlib
+
+EFL_CHECK_LIBS([eet], [libjpeg zlib])
+
+# Eina library
+
+requirements_pc_eet="eina >= 1.2.0 ${requirements_pc_eet}"
+PKG_CHECK_MODULES([EET], [${requirements_pc_eet}])
+
+case "$host_os" in
+ mingw32ce*)
+ requirements_libs_eet="${requirements_libs_eet} -lws2"
+ ;;
+ mingw*)
+ requirements_libs_eet="${requirements_libs_eet} -lws2_32"
+ ;;
+esac
+
+EET_LIBS="${EET_LIBS} ${requirements_libs_eet}"
+
### Checks for header files
+
+AC_CHECK_HEADERS(netinet/in.h unistd.h)
+
### Checks for types
+
### Checks for structures
+
### Checks for compiler characteristics
+
+# Check whether the null pointer is zero on this arch
+AC_TRY_RUN(
+ [
+#include <stdlib.h>
+#include <inttypes.h>
+int main (int argc, char **argv) {
+ void *foo = NULL;
+ uintptr_t bar = (uintptr_t)foo;
+ return (uintptr_t)foo;
+}
+ ],
+ [have_null="yes"],
+ [have_null="no"],
+ [
+ AC_MSG_WARN([Cannot check when cross-compiling -- assuming null is okay])
+ have_null="yes"
+ ])
+AC_MSG_CHECKING([value of the null pointer])
+AC_MSG_RESULT([${have_null}])
+
+if test ! "x${have_null}" = "xyes" ; then
+ AC_MSG_WARN([Your system is a bit too funny, eet might not work properly])
+fi
+
### Checks for linker characteristics
+
+case "${host_os}" in
+ openbsd*)
+ ;;
+ *)
+ EFL_CHECK_LINKER_FLAGS([EET], [-Wl,--as-needed])
+ ;;
+esac
+
### Checks for library functions
#### End of Eet
+
+#### Evas
+
+#AC_MSG_NOTICE([Evas checks])
+
+### Default values
+### Additional options to configure
+### Checks for programs
+### Checks for libraries
+### Checks for header files
+### Checks for types
+### Checks for structures
+### Checks for compiler characteristics
+### Checks for linker characteristics
+### Checks for library functions
+
+#### End of Evas
+
+
AC_CONFIG_FILES([
Makefile
src/Makefile
@@ -774,14 +1109,17 @@ src/benchmarks/Makefile
src/benchmarks/eina/Makefile
src/bin/Makefile
src/bin/evil/Makefile
+src/bin/eet/Makefile
src/examples/Makefile
src/examples/eina/Makefile
+src/examples/eet/Makefile
src/include/Makefile
src/include/eina/Makefile
src/include/eina/eina_config.h
src/lib/Makefile
src/lib/evil/Makefile
src/lib/eina/Makefile
+src/lib/eet/Makefile
src/modules/Makefile
src/modules/eina/Makefile
src/modules/eina/mp/Makefile
@@ -796,9 +1134,12 @@ src/scripts/Makefile
src/scripts/eina/Makefile
src/tests/Makefile
src/tests/eina/Makefile
+src/tests/eet/Makefile
eina.spec
+eet.spec
evil.pc
eina.pc
+eet.pc
])
AC_OUTPUT
@@ -842,11 +1183,11 @@ echo " File dirfd...........: ${efl_func_dirfd}"
echo " File xattr...........: ${efl_func_setxattr}"
echo " shm_open.............: ${efl_func_shm_open}"
echo
-echo " Tests................: ${_efl_enable_tests} (Coverage: ${_efl_enable_coverage})"
-echo " Examples.............: ${enable_build_examples}"
-echo " Tiler Example........: ${build_tiler_example}"
-echo " Examples installed...: ${enable_install_examples}"
-echo " Benchmark............: ${enable_benchmark}"
+echo " Tests................: make check (Coverage: ${_efl_enable_coverage})"
+echo " Examples.............: make examples"
+echo " Tiler Example......: ${build_tiler_example}"
+echo " installation.......: make install-examples"
+echo " Benchmark............: make benchmark"
if test "x${enable_benchmark}" = "xyes" ; then
echo " Glib...............: ${enable_benchmark_glib}"
echo " E17 real data......: ${enable_benchmark_e17}"
@@ -861,6 +1202,20 @@ echo " Fixed bitmap.......: ${enable_fixed_bitmap}"
echo " One big............: ${enable_one_big}"
echo " Pass through.......: ${enable_pass_through}"
echo
+echo "Eet"
+echo
+echo " Secure layer.........: ${secure_layer}"
+if test "x${have_gnutls}" = "xyes" || test "x${have_openssl}" = "xyes" ; then
+ echo " Cipher support.....: ${have_cipher}"
+ echo " Signature..........: ${have_signature}"
+fi
+echo
+echo " Old eet file format..: ${old_eet_file_format}"
+echo
+echo " Tests................: make check (Coverage: ${_efl_enable_coverage})"
+echo " Examples.............: make examples"
+echo " installation.......: make install-examples"
+echo
echo "Compilation............: make (or gmake)"
echo " CPPFLAGS.............: $CPPFLAGS"
echo " CFLAGS...............: $CFLAGS"
diff --git a/legacy/eet/eet.pc.in b/eet.pc.in
index ee958878b..ee958878b 100644
--- a/legacy/eet/eet.pc.in
+++ b/eet.pc.in
diff --git a/legacy/eet/eet.spec.in b/eet.spec.in
index 5a91f6004..5a91f6004 100644
--- a/legacy/eet/eet.spec.in
+++ b/eet.spec.in
diff --git a/legacy/ecore/m4/ac_path_generic.m4 b/m4/ac_path_generic.m4
index d42724115..d42724115 100644
--- a/legacy/ecore/m4/ac_path_generic.m4
+++ b/m4/ac_path_generic.m4
diff --git a/legacy/eet/m4/efl_binary.m4 b/m4/efl_binary.m4
index fc2f20050..fc2f20050 100644
--- a/legacy/eet/m4/efl_binary.m4
+++ b/m4/efl_binary.m4
diff --git a/legacy/eet/m4/efl_check_libs.m4 b/m4/efl_check_libs.m4
index b1c37894b..b1c37894b 100644
--- a/legacy/eet/m4/efl_check_libs.m4
+++ b/m4/efl_check_libs.m4
diff --git a/m4/efl_compiler.m4 b/m4/efl_compiler.m4
index be6a753e0..ca30759d8 100644
--- a/m4/efl_compiler.m4
+++ b/m4/efl_compiler.m4
@@ -65,7 +65,7 @@ dnl AM_CONDITIONAL : EFL_HAVE_FLAG (FLAG being replaced by its value)
AC_DEFUN([EFL_CHECK_LINKER_FLAG],
[
m4_pushdef([UPEFL], m4_translit([[$1]], [-a-z], [_A-Z]))
-m4_pushdef([UP], m4_translit([[$2]], [-a-z], [_A-Z]))
+m4_pushdef([UP], m4_translit([[$2]], [,-a-z], [__A-Z]))
LDFLAGS_save="${LDFLAGS}"
LDFLAGS="${LDFLAGS} $2"
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index d89d02e56..70889282e 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -7,3 +7,5 @@ if HAVE_WINDOWS
SUBDIRS += evil
endif
+
+SUBDIRS += eet
diff --git a/src/bin/eet/Makefile.am b/src/bin/eet/Makefile.am
new file mode 100644
index 000000000..af5fa844c
--- /dev/null
+++ b/src/bin/eet/Makefile.am
@@ -0,0 +1,17 @@
+
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eet \
+-I$(top_builddir)/src/lib/eet \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+@EET_CFLAGS@
+
+bin_PROGRAMS = @EET_PRG@
+EXTRA_PROGRAMS = eet
+
+eet_SOURCES = eet_main.c
+eet_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@
+eet_LDFLAGS = @lt_enable_auto_import@
diff --git a/legacy/eet/src/bin/eet_main.c b/src/bin/eet/eet_main.c
index 8a93d11b4..8a93d11b4 100644
--- a/legacy/eet/src/bin/eet_main.c
+++ b/src/bin/eet/eet_main.c
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index d6fbe3e3f..85c8ca3a4 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -1,9 +1,11 @@
MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = eina
+SUBDIRS = eina eet
examples:
@$(MAKE) -C eina examples
+ @$(MAKE) -C eet examples
install-examples:
- @$(MAKE) -C eina install-examples \ No newline at end of file
+ @$(MAKE) -C eina install-examples
+ @$(MAKE) -C eet install-examples \ No newline at end of file
diff --git a/src/examples/eet/Makefile.am b/src/examples/eet/Makefile.am
new file mode 100644
index 000000000..16815c14b
--- /dev/null
+++ b/src/examples/eet/Makefile.am
@@ -0,0 +1,50 @@
+MAINTAINERCLEANFILES = Makefile.in
+AM_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eet \
+-I$(top_builddir)/src/lib/eet \
+@EET_CFLAGS@
+
+EXTRA_PROGRAMS = eet_basic eet_file eet_data_simple eet_data_nested eet_data_file_descriptor_01 eet_data_file_descriptor_02 eet_data_cipher_decipher
+
+eet_basic_SOURCES = eet-basic.c
+eet_basic_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@
+
+eet_file_SOURCES = eet-file.c
+eet_file_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@
+
+eet_data_simple_SOURCES = eet-data-simple.c
+eet_data_simple_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@
+
+eet_data_nested_SOURCES = eet-data-nested.c
+eet_data_nested_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@
+
+eet_data_file_descriptor_01_SOURCES = eet-data-file_descriptor_01.c
+eet_data_file_descriptor_01_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@
+
+eet_data_file_descriptor_02_SOURCES = eet-data-file_descriptor_02.c
+eet_data_file_descriptor_02_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@
+
+eet_data_cipher_decipher_SOURCES = eet-data-cipher_decipher.c
+eet_data_cipher_decipher_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@
+
+SRCS = \
+eet-basic.c \
+eet-file.c \
+eet-data-simple.c \
+eet-data-nested.c \
+eet-data-file_descriptor_01.c \
+eet-data-file_descriptor_02.c \
+eet-data-cipher_decipher.c
+
+examples: $(EXTRA_PROGRAMS)
+
+install-examples:
+ mkdir -p $(pkgdatadir)/examples
+ $(install_sh_DATA) -c $(SRCS) $(pkgdatadir)/examples
+
+uninstall-local:
+ for f in $(SRCS) ; do \
+ rm -f $(pkgdatadir)/examples/$$f ; \
+ done
+
+EXTRA_DIST = addr_book.txt chat.xml
diff --git a/legacy/eet/src/examples/eet-basic.c b/src/examples/eet/eet-basic.c
index 05ff39778..05ff39778 100644
--- a/legacy/eet/src/examples/eet-basic.c
+++ b/src/examples/eet/eet-basic.c
diff --git a/legacy/eet/src/examples/eet-data-cipher_decipher.c b/src/examples/eet/eet-data-cipher_decipher.c
index 2ef965c74..2ef965c74 100644
--- a/legacy/eet/src/examples/eet-data-cipher_decipher.c
+++ b/src/examples/eet/eet-data-cipher_decipher.c
diff --git a/legacy/eet/src/examples/eet-data-file_descriptor_01.c b/src/examples/eet/eet-data-file_descriptor_01.c
index 4b5b75f86..4b5b75f86 100644
--- a/legacy/eet/src/examples/eet-data-file_descriptor_01.c
+++ b/src/examples/eet/eet-data-file_descriptor_01.c
diff --git a/legacy/eet/src/examples/eet-data-file_descriptor_02.c b/src/examples/eet/eet-data-file_descriptor_02.c
index 65ba79ec4..65ba79ec4 100644
--- a/legacy/eet/src/examples/eet-data-file_descriptor_02.c
+++ b/src/examples/eet/eet-data-file_descriptor_02.c
diff --git a/legacy/eet/src/examples/eet-data-nested.c b/src/examples/eet/eet-data-nested.c
index a6b0e1208..a6b0e1208 100644
--- a/legacy/eet/src/examples/eet-data-nested.c
+++ b/src/examples/eet/eet-data-nested.c
diff --git a/legacy/eet/src/examples/eet-data-simple.c b/src/examples/eet/eet-data-simple.c
index 1951fc012..1951fc012 100644
--- a/legacy/eet/src/examples/eet-data-simple.c
+++ b/src/examples/eet/eet-data-simple.c
diff --git a/legacy/eet/src/examples/eet-file.c b/src/examples/eet/eet-file.c
index 740c179f7..740c179f7 100644
--- a/legacy/eet/src/examples/eet-file.c
+++ b/src/examples/eet/eet-file.c
diff --git a/src/examples/eina/Makefile.am b/src/examples/eina/Makefile.am
index 4656e4724..96e7735e5 100644
--- a/src/examples/eina/Makefile.am
+++ b/src/examples/eina/Makefile.am
@@ -112,7 +112,7 @@ install-examples:
mkdir -p $(pkgdatadir)/examples
$(install_sh_DATA) -c $(SRCS) $(pkgdatadir)/examples
-unsinstall-local:
+uninstall-local:
for f in $(SRCS) ; do \
rm -f $(pkgdatadir)/examples/$$f ; \
done
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 92c50645f..852263949 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -8,4 +8,4 @@ SUBDIRS += evil
endif
-SUBDIRS += eina
+SUBDIRS += eina eet
diff --git a/legacy/eet/src/lib/Eet.h b/src/lib/eet/Eet.h
index 05f80e959..05f80e959 100644
--- a/legacy/eet/src/lib/Eet.h
+++ b/src/lib/eet/Eet.h
diff --git a/legacy/eet/src/lib/Eet_private.h b/src/lib/eet/Eet_private.h
index 20c12d75b..20c12d75b 100644
--- a/legacy/eet/src/lib/Eet_private.h
+++ b/src/lib/eet/Eet_private.h
diff --git a/src/lib/eet/Makefile.am b/src/lib/eet/Makefile.am
new file mode 100644
index 000000000..e4d1c3b82
--- /dev/null
+++ b/src/lib/eet/Makefile.am
@@ -0,0 +1,43 @@
+
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/lib/eet \
+-I$(top_srcdir)/src/lib/eet/lz4 \
+-I$(top_builddir)/src/lib/eet \
+-I$(top_builddir)/src/lib/eet/lz4 \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
+@EET_CFLAGS@ \
+@EFL_EET_BUILD@
+
+includes_HEADERS = Eet.h
+includesdir = $(includedir)/eet-@VMAJ@
+
+lib_LTLIBRARIES = libeet.la
+
+libeet_la_SOURCES = \
+Eet_private.h \
+eet_alloc.c \
+eet_cipher.c \
+eet_connection.c \
+eet_data.c \
+eet_dictionary.c \
+eet_image.c \
+eet_lib.c \
+eet_node.c \
+eet_utils.c \
+lz4/lz4.c \
+lz4/lz4.h \
+lz4/lz4hc.c \
+lz4/lz4hc.h
+
+libeet_la_LIBADD = @EET_LIBS@ -lm
+libeet_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
+
+EXTRA_DIST = lz4/README
+
+clean-local:
+ @rm -rf *.gcno
diff --git a/legacy/eet/src/lib/eet_alloc.c b/src/lib/eet/eet_alloc.c
index 310b1bff9..310b1bff9 100644
--- a/legacy/eet/src/lib/eet_alloc.c
+++ b/src/lib/eet/eet_alloc.c
diff --git a/legacy/eet/src/lib/eet_cipher.c b/src/lib/eet/eet_cipher.c
index 5bd9f25d0..5bd9f25d0 100644
--- a/legacy/eet/src/lib/eet_cipher.c
+++ b/src/lib/eet/eet_cipher.c
diff --git a/legacy/eet/src/lib/eet_connection.c b/src/lib/eet/eet_connection.c
index c044e3d11..c044e3d11 100644
--- a/legacy/eet/src/lib/eet_connection.c
+++ b/src/lib/eet/eet_connection.c
diff --git a/legacy/eet/src/lib/eet_data.c b/src/lib/eet/eet_data.c
index d06d3eace..d06d3eace 100644
--- a/legacy/eet/src/lib/eet_data.c
+++ b/src/lib/eet/eet_data.c
diff --git a/legacy/eet/src/lib/eet_dictionary.c b/src/lib/eet/eet_dictionary.c
index aef8ad272..aef8ad272 100644
--- a/legacy/eet/src/lib/eet_dictionary.c
+++ b/src/lib/eet/eet_dictionary.c
diff --git a/legacy/eet/src/lib/eet_image.c b/src/lib/eet/eet_image.c
index 00acda8d2..00acda8d2 100644
--- a/legacy/eet/src/lib/eet_image.c
+++ b/src/lib/eet/eet_image.c
diff --git a/legacy/eet/src/lib/eet_lib.c b/src/lib/eet/eet_lib.c
index 98c9225cb..98c9225cb 100644
--- a/legacy/eet/src/lib/eet_lib.c
+++ b/src/lib/eet/eet_lib.c
diff --git a/legacy/eet/src/lib/eet_node.c b/src/lib/eet/eet_node.c
index faaa90587..faaa90587 100644
--- a/legacy/eet/src/lib/eet_node.c
+++ b/src/lib/eet/eet_node.c
diff --git a/legacy/eet/src/lib/eet_utils.c b/src/lib/eet/eet_utils.c
index b04ad1b52..b04ad1b52 100644
--- a/legacy/eet/src/lib/eet_utils.c
+++ b/src/lib/eet/eet_utils.c
diff --git a/legacy/eet/src/lib/lz4/README b/src/lib/eet/lz4/README
index 0abb85714..0abb85714 100644
--- a/legacy/eet/src/lib/lz4/README
+++ b/src/lib/eet/lz4/README
diff --git a/legacy/eet/src/lib/lz4/lz4.c b/src/lib/eet/lz4/lz4.c
index 06e282970..06e282970 100644
--- a/legacy/eet/src/lib/lz4/lz4.c
+++ b/src/lib/eet/lz4/lz4.c
diff --git a/legacy/eet/src/lib/lz4/lz4.h b/src/lib/eet/lz4/lz4.h
index ebd62b69a..ebd62b69a 100644
--- a/legacy/eet/src/lib/lz4/lz4.h
+++ b/src/lib/eet/lz4/lz4.h
diff --git a/legacy/eet/src/lib/lz4/lz4hc.c b/src/lib/eet/lz4/lz4hc.c
index cca755c26..cca755c26 100644
--- a/legacy/eet/src/lib/lz4/lz4hc.c
+++ b/src/lib/eet/lz4/lz4hc.c
diff --git a/legacy/eet/src/lib/lz4/lz4hc.h b/src/lib/eet/lz4/lz4hc.h
index cb74689f0..cb74689f0 100644
--- a/legacy/eet/src/lib/lz4/lz4hc.h
+++ b/src/lib/eet/lz4/lz4hc.h
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index b8f642fb7..45fa7fe5f 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,3 +1,3 @@
MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = eina
+SUBDIRS = eina eet
diff --git a/src/tests/eet/Makefile.am b/src/tests/eet/Makefile.am
new file mode 100644
index 000000000..b1a6ee94d
--- /dev/null
+++ b/src/tests/eet/Makefile.am
@@ -0,0 +1,19 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eet \
+-I$(top_builddir)/src/lib/eet \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests\" \
+@CHECK_CFLAGS@ \
+@EET_CFLAGS@
+
+if EFL_ENABLE_TESTS
+
+check_PROGRAMS = eet_suite
+
+eet_suite_SOURCES = eet_suite.c eet_data_suite.c eet_suite.h
+eet_suite_LDADD = @CHECK_LIBS@ $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@
+
+endif
+
+EXTRA_DIST = cert.pem key_enc_none.pem key_enc.pem key.pem
diff --git a/legacy/eet/src/tests/TODO b/src/tests/eet/TODO
index da5fa1bd1..da5fa1bd1 100644
--- a/legacy/eet/src/tests/TODO
+++ b/src/tests/eet/TODO
diff --git a/legacy/eet/src/tests/cert.pem b/src/tests/eet/cert.pem
index 3265462d7..3265462d7 100644
--- a/legacy/eet/src/tests/cert.pem
+++ b/src/tests/eet/cert.pem
diff --git a/legacy/eet/src/tests/eet_data_suite.c b/src/tests/eet/eet_data_suite.c
index c4d5e5096..c4d5e5096 100644
--- a/legacy/eet/src/tests/eet_data_suite.c
+++ b/src/tests/eet/eet_data_suite.c
diff --git a/legacy/eet/src/tests/eet_suite.c b/src/tests/eet/eet_suite.c
index 91ef2a73a..91ef2a73a 100644
--- a/legacy/eet/src/tests/eet_suite.c
+++ b/src/tests/eet/eet_suite.c
diff --git a/legacy/eet/src/tests/eet_suite.h b/src/tests/eet/eet_suite.h
index c5c91aaee..c5c91aaee 100644
--- a/legacy/eet/src/tests/eet_suite.h
+++ b/src/tests/eet/eet_suite.h
diff --git a/legacy/eet/src/tests/key.pem b/src/tests/eet/key.pem
index 74763ca8c..74763ca8c 100644
--- a/legacy/eet/src/tests/key.pem
+++ b/src/tests/eet/key.pem
diff --git a/legacy/eet/src/tests/key_enc.pem b/src/tests/eet/key_enc.pem
index 83c1ba235..83c1ba235 100644
--- a/legacy/eet/src/tests/key_enc.pem
+++ b/src/tests/eet/key_enc.pem
diff --git a/legacy/eet/src/tests/key_enc_none.pem b/src/tests/eet/key_enc_none.pem
index 116385190..116385190 100644
--- a/legacy/eet/src/tests/key_enc_none.pem
+++ b/src/tests/eet/key_enc_none.pem