forked from enlightenment/efl
parent
12732ab7eb
commit
8abaff3bdf
20
AUTHORS
20
AUTHORS
|
@ -41,3 +41,23 @@ Raphael Kubo da Costa <rakuco@freebsd.org>
|
||||||
Jérôme Pinot <ngc891@gmail.com>
|
Jérôme Pinot <ngc891@gmail.com>
|
||||||
Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
|
Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
|
||||||
Patryk Kaczmarek <patryk.k@samsung.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>
|
||||||
|
|
24
Makefile.am
24
Makefile.am
|
@ -21,21 +21,35 @@ m4/ltsugar.m4 \
|
||||||
m4/ltversion.m4
|
m4/ltversion.m4
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
|
m4/ac_path_generic.m4 \
|
||||||
m4/efl_attribute.m4 \
|
m4/efl_attribute.m4 \
|
||||||
m4/efl_check_funcs.m4 \
|
m4/efl_check_funcs.m4 \
|
||||||
m4/efl_compiler.m4 \
|
m4/efl_compiler.m4 \
|
||||||
m4/efl_doxygen.m4 \
|
m4/efl_doxygen.m4 \
|
||||||
m4/efl_path_max.m4 \
|
m4/efl_path_max.m4 \
|
||||||
m4/efl_threads.m4 \
|
m4/efl_threads.m4 \
|
||||||
m4/evil_windows.m4
|
m4/evil_windows.m4 \
|
||||||
|
m4/eina_check.m4
|
||||||
|
|
||||||
if HAVE_WINDOWS
|
if HAVE_WINDOWS
|
||||||
EXTRA_DIST += evil.pc
|
EXTRA_DIST += \
|
||||||
|
ChangeLog.evil \
|
||||||
|
NEWS.evil \
|
||||||
|
README.evil \
|
||||||
|
evil.pc
|
||||||
endif
|
endif
|
||||||
|
|
||||||
EXTRA_DIST += \
|
EXTRA_DIST += \
|
||||||
|
ChangeLog.eina \
|
||||||
|
NEWS.eina \
|
||||||
|
README.eina \
|
||||||
eina.spec \
|
eina.spec \
|
||||||
eina.pc
|
eina.pc \
|
||||||
|
ChangeLog.eet \
|
||||||
|
NEWS.eet \
|
||||||
|
README.eet \
|
||||||
|
eet.spec \
|
||||||
|
eet.pc
|
||||||
|
|
||||||
pkgconfigdir = $(libdir)/pkgconfig
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
pkgconfig_DATA =
|
pkgconfig_DATA =
|
||||||
|
@ -44,7 +58,7 @@ if HAVE_WINDOWS
|
||||||
pkgconfig_DATA += evil.pc
|
pkgconfig_DATA += evil.pc
|
||||||
endif
|
endif
|
||||||
|
|
||||||
pkgconfig_DATA += eina.pc
|
pkgconfig_DATA += eina.pc eet.pc
|
||||||
|
|
||||||
|
|
||||||
.PHONY: doc benchmark examples install-examples
|
.PHONY: doc benchmark examples install-examples
|
||||||
|
@ -79,7 +93,7 @@ check-local:
|
||||||
if EFL_ENABLE_COVERAGE
|
if EFL_ENABLE_COVERAGE
|
||||||
@$(MAKE) lcov-reset
|
@$(MAKE) lcov-reset
|
||||||
endif
|
endif
|
||||||
@./src/tests/eina/eina_suite
|
@./src/tests/eet/eet_suite
|
||||||
if EFL_ENABLE_COVERAGE
|
if EFL_ENABLE_COVERAGE
|
||||||
@$(MAKE) lcov-report
|
@$(MAKE) lcov-report
|
||||||
endif
|
endif
|
||||||
|
|
413
configure.ac
413
configure.ac
|
@ -167,6 +167,19 @@ AM_CONDITIONAL([HAVE_WINDOWS], [test "x${have_windows}" = "xyes"])
|
||||||
|
|
||||||
#### Additional options to configure
|
#### 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
|
#### Checks for programs
|
||||||
|
|
||||||
|
@ -216,6 +229,8 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
|
||||||
|
|
||||||
#### Checks for header files
|
#### Checks for header files
|
||||||
|
|
||||||
|
EFL_CHECK_PATH_MAX
|
||||||
|
|
||||||
|
|
||||||
#### Checks for types
|
#### Checks for types
|
||||||
|
|
||||||
|
@ -225,6 +240,8 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
|
||||||
|
|
||||||
#### Checks for compiler characteristics
|
#### Checks for compiler characteristics
|
||||||
|
|
||||||
|
AC_C_BIGENDIAN
|
||||||
|
AC_C_INLINE
|
||||||
EFL_ATTRIBUTE_UNUSED
|
EFL_ATTRIBUTE_UNUSED
|
||||||
# EFL_CHECK_COMPILER_FLAGS([MY_LIB], [-Wall -Wextra])
|
# EFL_CHECK_COMPILER_FLAGS([MY_LIB], [-Wall -Wextra])
|
||||||
|
|
||||||
|
@ -242,6 +259,7 @@ AC_SUBST([lt_enable_auto_import])
|
||||||
|
|
||||||
#### Checks for library functions
|
#### Checks for library functions
|
||||||
|
|
||||||
|
AC_FUNC_ALLOCA
|
||||||
|
|
||||||
|
|
||||||
###################### EFL ######################
|
###################### EFL ######################
|
||||||
|
@ -422,19 +440,6 @@ if test "x${have_stringshare_usage}" = "xyes"; then
|
||||||
AC_DEFINE([EINA_STRINGSHARE_USAGE], [1], [Report Eina stringshare usage pattern])
|
AC_DEFINE([EINA_STRINGSHARE_USAGE], [1], [Report Eina stringshare usage pattern])
|
||||||
fi
|
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
|
# Check if we want to benchmark on real data
|
||||||
AC_ARG_ENABLE([e17],
|
AC_ARG_ENABLE([e17],
|
||||||
[AC_HELP_STRING([--enable-e17], [enable heavy benchmark @<:@default=no@:>@])],
|
[AC_HELP_STRING([--enable-e17], [enable heavy benchmark @<:@default=no@:>@])],
|
||||||
|
@ -481,7 +486,7 @@ case "$host_vendor" in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# Exotic library for copilation on Coyote
|
# Exotic library for compilation on Coyote
|
||||||
|
|
||||||
PKG_CHECK_EXISTS([exotic],
|
PKG_CHECK_EXISTS([exotic],
|
||||||
[
|
[
|
||||||
|
@ -667,10 +672,6 @@ AC_SUBST([EINA_CONFIGURE_HAVE_DIRENT_H])
|
||||||
|
|
||||||
### Checks for compiler characteristics
|
### Checks for compiler characteristics
|
||||||
|
|
||||||
AC_C_BIGENDIAN
|
|
||||||
AC_C_INLINE
|
|
||||||
EFL_ATTRIBUTE_UNUSED
|
|
||||||
|
|
||||||
m4_ifdef([v_ver],
|
m4_ifdef([v_ver],
|
||||||
[
|
[
|
||||||
EFL_CHECK_COMPILER_FLAGS([EINA], [-Wall -Wextra])
|
EFL_CHECK_COMPILER_FLAGS([EINA], [-Wall -Wextra])
|
||||||
|
@ -678,16 +679,12 @@ m4_ifdef([v_ver],
|
||||||
|
|
||||||
EFL_CHECK_COMPILER_FLAGS([EINA], [-Wshadow])
|
EFL_CHECK_COMPILER_FLAGS([EINA], [-Wshadow])
|
||||||
|
|
||||||
EFL_CHECK_PATH_MAX
|
|
||||||
|
|
||||||
### Checks for linker characteristics
|
### Checks for linker characteristics
|
||||||
|
|
||||||
EFL_CHECK_LINKER_FLAGS([EINA], [-fno-strict-aliasing])
|
EFL_CHECK_LINKER_FLAGS([EINA], [-fno-strict-aliasing])
|
||||||
|
|
||||||
### Checks for library functions
|
### Checks for library functions
|
||||||
|
|
||||||
AC_FUNC_ALLOCA
|
|
||||||
|
|
||||||
AC_CHECK_FUNCS([strlcpy openat fstatat fpathconf execvp backtrace backtrace_symbols malloc_usable_size mtrace])
|
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])
|
EFL_CHECK_FUNCS([EINA], [dirfd dlopen dladdr fnmatch iconv shm_open setxattr])
|
||||||
|
@ -752,7 +749,344 @@ EINA_CHECK_MODULE([one-big], [${enable_one_big}], [one big])
|
||||||
|
|
||||||
#### Eet
|
#### 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
|
### Default values
|
||||||
### Additional options to configure
|
### Additional options to configure
|
||||||
|
@ -765,7 +1099,8 @@ EINA_CHECK_MODULE([one-big], [${enable_one_big}], [one big])
|
||||||
### Checks for linker characteristics
|
### Checks for linker characteristics
|
||||||
### Checks for library functions
|
### Checks for library functions
|
||||||
|
|
||||||
#### End of Eet
|
#### End of Evas
|
||||||
|
|
||||||
|
|
||||||
AC_CONFIG_FILES([
|
AC_CONFIG_FILES([
|
||||||
Makefile
|
Makefile
|
||||||
|
@ -774,14 +1109,17 @@ src/benchmarks/Makefile
|
||||||
src/benchmarks/eina/Makefile
|
src/benchmarks/eina/Makefile
|
||||||
src/bin/Makefile
|
src/bin/Makefile
|
||||||
src/bin/evil/Makefile
|
src/bin/evil/Makefile
|
||||||
|
src/bin/eet/Makefile
|
||||||
src/examples/Makefile
|
src/examples/Makefile
|
||||||
src/examples/eina/Makefile
|
src/examples/eina/Makefile
|
||||||
|
src/examples/eet/Makefile
|
||||||
src/include/Makefile
|
src/include/Makefile
|
||||||
src/include/eina/Makefile
|
src/include/eina/Makefile
|
||||||
src/include/eina/eina_config.h
|
src/include/eina/eina_config.h
|
||||||
src/lib/Makefile
|
src/lib/Makefile
|
||||||
src/lib/evil/Makefile
|
src/lib/evil/Makefile
|
||||||
src/lib/eina/Makefile
|
src/lib/eina/Makefile
|
||||||
|
src/lib/eet/Makefile
|
||||||
src/modules/Makefile
|
src/modules/Makefile
|
||||||
src/modules/eina/Makefile
|
src/modules/eina/Makefile
|
||||||
src/modules/eina/mp/Makefile
|
src/modules/eina/mp/Makefile
|
||||||
|
@ -796,9 +1134,12 @@ src/scripts/Makefile
|
||||||
src/scripts/eina/Makefile
|
src/scripts/eina/Makefile
|
||||||
src/tests/Makefile
|
src/tests/Makefile
|
||||||
src/tests/eina/Makefile
|
src/tests/eina/Makefile
|
||||||
|
src/tests/eet/Makefile
|
||||||
eina.spec
|
eina.spec
|
||||||
|
eet.spec
|
||||||
evil.pc
|
evil.pc
|
||||||
eina.pc
|
eina.pc
|
||||||
|
eet.pc
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
@ -842,11 +1183,11 @@ echo " File dirfd...........: ${efl_func_dirfd}"
|
||||||
echo " File xattr...........: ${efl_func_setxattr}"
|
echo " File xattr...........: ${efl_func_setxattr}"
|
||||||
echo " shm_open.............: ${efl_func_shm_open}"
|
echo " shm_open.............: ${efl_func_shm_open}"
|
||||||
echo
|
echo
|
||||||
echo " Tests................: ${_efl_enable_tests} (Coverage: ${_efl_enable_coverage})"
|
echo " Tests................: make check (Coverage: ${_efl_enable_coverage})"
|
||||||
echo " Examples.............: ${enable_build_examples}"
|
echo " Examples.............: make examples"
|
||||||
echo " Tiler Example........: ${build_tiler_example}"
|
echo " Tiler Example......: ${build_tiler_example}"
|
||||||
echo " Examples installed...: ${enable_install_examples}"
|
echo " installation.......: make install-examples"
|
||||||
echo " Benchmark............: ${enable_benchmark}"
|
echo " Benchmark............: make benchmark"
|
||||||
if test "x${enable_benchmark}" = "xyes" ; then
|
if test "x${enable_benchmark}" = "xyes" ; then
|
||||||
echo " Glib...............: ${enable_benchmark_glib}"
|
echo " Glib...............: ${enable_benchmark_glib}"
|
||||||
echo " E17 real data......: ${enable_benchmark_e17}"
|
echo " E17 real data......: ${enable_benchmark_e17}"
|
||||||
|
@ -861,6 +1202,20 @@ echo " Fixed bitmap.......: ${enable_fixed_bitmap}"
|
||||||
echo " One big............: ${enable_one_big}"
|
echo " One big............: ${enable_one_big}"
|
||||||
echo " Pass through.......: ${enable_pass_through}"
|
echo " Pass through.......: ${enable_pass_through}"
|
||||||
echo
|
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 "Compilation............: make (or gmake)"
|
||||||
echo " CPPFLAGS.............: $CPPFLAGS"
|
echo " CPPFLAGS.............: $CPPFLAGS"
|
||||||
echo " CFLAGS...............: $CFLAGS"
|
echo " CFLAGS...............: $CFLAGS"
|
||||||
|
|
|
@ -65,7 +65,7 @@ dnl AM_CONDITIONAL : EFL_HAVE_FLAG (FLAG being replaced by its value)
|
||||||
AC_DEFUN([EFL_CHECK_LINKER_FLAG],
|
AC_DEFUN([EFL_CHECK_LINKER_FLAG],
|
||||||
[
|
[
|
||||||
m4_pushdef([UPEFL], m4_translit([[$1]], [-a-z], [_A-Z]))
|
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_save="${LDFLAGS}"
|
||||||
LDFLAGS="${LDFLAGS} $2"
|
LDFLAGS="${LDFLAGS} $2"
|
||||||
|
|
|
@ -7,3 +7,5 @@ if HAVE_WINDOWS
|
||||||
SUBDIRS += evil
|
SUBDIRS += evil
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
SUBDIRS += eet
|
||||||
|
|
|
@ -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@
|
|
@ -1,9 +1,11 @@
|
||||||
MAINTAINERCLEANFILES = Makefile.in
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
SUBDIRS = eina
|
SUBDIRS = eina eet
|
||||||
|
|
||||||
examples:
|
examples:
|
||||||
@$(MAKE) -C eina examples
|
@$(MAKE) -C eina examples
|
||||||
|
@$(MAKE) -C eet examples
|
||||||
|
|
||||||
install-examples:
|
install-examples:
|
||||||
@$(MAKE) -C eina install-examples
|
@$(MAKE) -C eina install-examples
|
||||||
|
@$(MAKE) -C eet install-examples
|
|
@ -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
|
|
@ -112,7 +112,7 @@ install-examples:
|
||||||
mkdir -p $(pkgdatadir)/examples
|
mkdir -p $(pkgdatadir)/examples
|
||||||
$(install_sh_DATA) -c $(SRCS) $(pkgdatadir)/examples
|
$(install_sh_DATA) -c $(SRCS) $(pkgdatadir)/examples
|
||||||
|
|
||||||
unsinstall-local:
|
uninstall-local:
|
||||||
for f in $(SRCS) ; do \
|
for f in $(SRCS) ; do \
|
||||||
rm -f $(pkgdatadir)/examples/$$f ; \
|
rm -f $(pkgdatadir)/examples/$$f ; \
|
||||||
done
|
done
|
||||||
|
|
|
@ -8,4 +8,4 @@ SUBDIRS += evil
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SUBDIRS += eina
|
SUBDIRS += eina eet
|
||||||
|
|
|
@ -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
|
|
@ -1,3 +1,3 @@
|
||||||
MAINTAINERCLEANFILES = Makefile.in
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
SUBDIRS = eina
|
SUBDIRS = eina eet
|
||||||
|
|
|
@ -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
|
Loading…
Reference in New Issue