From: caro Date: Sun, 1 Jul 2012 09:47:48 +0000 (+0000) Subject: Eet: add nice m4 macros to check functions and libraries. Will be usable easily in... X-Git-Tag: 2.0_alpha~1^2~16 X-Git-Url: http://review.tizen.org/git/?p=framework%2Fuifw%2Feet.git;a=commitdiff_plain;h=c0f6e49533e34956b085db08f961472f532d9b06 Eet: add nice m4 macros to check functions and libraries. Will be usable easily in the merge, per EFL lib Please, test. config.h is the same (except useless macro HAVE_ICONV_H) and compilation is correct on linux and mingw here git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/eet@73095 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/Makefile.am b/Makefile.am index d3622dc..78b226a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,9 +34,10 @@ eet.spec \ m4/ac_attribute.m4 \ m4/ac_path_generic.m4 \ m4/efl_binary.m4 \ +m4/efl_check_funcs.m4 \ +m4/efl_check_libs.m4 \ m4/efl_coverage.m4 \ m4/efl_doxygen.m4 \ -m4/efl_fnmatch.m4 \ m4/efl_tests.m4 \ m4/efl_path_max.m4 diff --git a/configure.ac b/configure.ac index 3fcd376..852dc04 100644 --- a/configure.ac +++ b/configure.ac @@ -35,6 +35,8 @@ AH_BOTTOM([ AM_INIT_AUTOMAKE([1.6 dist-bzip2]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +AC_GNU_SOURCE + AC_LIBTOOL_WIN32_DLL define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl @@ -65,25 +67,28 @@ AC_CANONICAL_HOST ### Default options with respect to host -want_gnutls="auto" -want_openssl="auto" -want_cipher="yes" -want_signature="yes" +requirements_pc_eet="" +requirements_libs_eet="" -requirement_eet="" +### Additional options to configure EFL_ENABLE_BIN([eet]) # Old eet file format support -old_eet_file_format="yes" AC_ARG_ENABLE(old-eet-file-format, [AC_HELP_STRING( [--disable-old-eet-file-format], - [disable old eet file format support. [[default=enabled]]] - )], - [old_eet_file_format=$enableval] -) + [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}]) @@ -96,40 +101,67 @@ fi # Openssl support AC_ARG_ENABLE([openssl], - [AC_HELP_STRING([--disable-openssl], [disable openssl eet support])], - [want_openssl=$enableval] -) + [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}]) # Cryptography support AC_ARG_ENABLE([cipher], - [AC_HELP_STRING([--disable-cipher], [disable cipher support for eet API])], - [want_cipher=$enableval] -) + [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])], - [want_signature=$enableval] -) + [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}]) # Assert or fail. -prefer_assert="no" + AC_ARG_ENABLE([assert], - [AC_HELP_STRING([--enable-assert], [enable assert, [[default=disabled]]])], - [prefer_assert=$enableval] -) + [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"]) # Examples AC_ARG_ENABLE([install-examples], [AC_HELP_STRING([--disable-install-examples], - [disable installing examples (compiled or just source). @<:@default==enabled@:>@])], + [disable installing examples (compiled or just source). @<:@default=yes@:>@])], [ if test "x${enableval}" = "xyes" ; then install_examples="yes" @@ -138,11 +170,12 @@ AC_ARG_ENABLE([install-examples], fi ], [install_examples="yes"]) + AM_CONDITIONAL([INSTALL_EXAMPLES], [test "x${install_examples}" = "xyes"]) AC_ARG_ENABLE([build-examples], [AC_HELP_STRING([--enable-build-examples], - [enable building examples. @<:@default==disabled@:>@])], + [enable building examples @<:@default=yes@:>@])], [ if test "x${enableval}" = "xyes" ; then build_examples="yes" @@ -188,155 +221,150 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"]) ### Checks for libraries +## Compatibility layers + # Evil library for compilation on Windows EFL_EET_BUILD="" case "$host_os" in mingw*) - PKG_CHECK_MODULES([EVIL], [evil >= 1.0.0]) - AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if Evil library is installed]) - requirement_eet="evil ${requirement_eet}" + 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) -EET_LIBS="" -case "$host_os" in - mingw32ce*) - EET_LIBS="-lws2" - ;; - mingw*) - EET_LIBS="-lws2_32" - ;; -esac -AC_SUBST(EET_LIBS) - -# Eina library +# Exotic library for copilation on Coyote -PKG_CHECK_MODULES(EINA, [eina >= 1.2.0]) -requirement_eet="eina >= 1.2.0 ${requirement_eet}" - -### Checks for portability layer - -PKG_CHECK_MODULES([EXOTIC], - [exotic], - [enable_exotic="yes"], +PKG_CHECK_EXISTS([exotic], + [ + enable_exotic="yes" + AC_DEFINE([HAVE_EXOTIC_H], [1], [Define to 1 if you have Exotic.]) + EINA_CONFIGURE_HAVE_EXOTIC="#define EINA_HAVE_EXOTIC" + requirements_pc_eina="exotic ${requirements_pc_eina}" + ], [enable_exotic="no"]) -if test "x${enable_exotic}" = "xyes"; then - requirement_eet="exotic ${requirement_eet}" - - AC_DEFINE([HAVE_EXOTIC_H], [1], [Define to 1 if you have Exotic.]) -fi +## Secure layer -# Gnutls support +# Gnutls library AC_ARG_ENABLE([gnutls], - [AC_HELP_STRING([--disable-gnutls], [disable gnutls eet support])], - [want_gnutls=$enableval] -) + [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}]) -# 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], + PKG_CHECK_MODULES([GNUTLS], [gnutls >= 1.7.6], [ have_gnutls="yes" want_openssl="no" - AC_DEFINE(HAVE_GNUTLS, 1, [Have Gnutls support]) - requirement_eet="gnutls ${requirement_eet}" + 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 - AC_PATH_GENERIC([libgcrypt], [], [have_gnutls="yes"], [have_gnutls="no"]) - if test "x${have_gnutls}" = "xyes" ; then - GNUTLS_CFLAGS="${GNUTLS_CFLAGS} ${LIBGCRYPT_CFLAGS}" - GNUTLS_LIBS="${GNUTLS_LIBS} ${LIBGCRYPT_LIBS}" - fi + requirements_libs_eet="${LIBGCRYPT_LIBS} ${requirements_libs_eet}" fi fi # Specific GNUTLS improvement -new_gnutls_api="yes" AC_ARG_ENABLE(new-gnutls-api, [AC_HELP_STRING( [--disable-new-gnutls-api], - [enable use of gnutls_x509_crt_verify_hash. [[default=enable]]] - )], - [new_gnutls_api=$enableval] -) + [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${new_gnutls_api}" = "xyes" ; then - tmp_CFLAGS="${CFLAGS}" - tmp_LIBS="${LIBS}" +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, - [ new_gnutls_api="yes" ], - [ new_gnutls_api="no" ] - ) - CFLAGS="${tmp_CFLAGS}" - LIBS="${tmp_LIBS}" - - if test "x${new_gnutls_api}" = "xyes"; then - AC_DEFINE(EET_USE_NEW_GNUTLS_API, 1, [use gnutls_x509_crt_verify_hash]) - fi + 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${want_gnutls}" = "xyes" -o "x${want_gnutls}" = "xauto"; then - tmp_CFLAGS="${CFLAGS}" - tmp_LIBS="${LIBS}" +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, - [ use_gnutls_privkey_sign_data="yes" ], - [ use_gnutls_privkey_sign_data="no" ] - ) - CFLAGS="${tmp_CFLAGS}" - LIBS="${tmp_LIBS}" - - if test "x${use_gnutls_privkey_sign_data}" = "xyes"; then - AC_DEFINE(EET_USE_NEW_PRIVKEY_SIGN_DATA, 1, [use gnutls_privkey_sign_data]) - fi + 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${want_gnutls}" = "xyes" -o "x${want_gnutls}" = "xauto"; then - tmp_CFLAGS="${CFLAGS}" - tmp_LIBS="${LIBS}" +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, - [ use_gnutls_pubkey_verify_hash="yes" ], - [ use_gnutls_pubkey_verify_hash="no" ] - ) - CFLAGS="${tmp_CFLAGS}" - LIBS="${tmp_LIBS}" - - if test "x${use_gnutls_pubkey_verify_hash}" = "xyes"; then - AC_DEFINE(EET_USE_NEW_PUBKEY_VERIFY_HASH, 1, [use gnutls_pubkey_verify_hash]) - fi + 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_MODULES(OPENSSL, openssl, + PKG_CHECK_EXISTS([openssl], [ have_openssl="yes" - AC_DEFINE(HAVE_OPENSSL, 1, [Have Openssl support]) - requirement_eet="openssl ${requirement_eet}" + AC_DEFINE([HAVE_OPENSSL], [1], [Have Openssl support]) + requirements_pc_eet="openssl ${requirements_pc_eet}" ], [have_openssl="no"]) fi @@ -352,36 +380,47 @@ fi 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]) + 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]) + 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}) +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]) + 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]) + 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}) +AC_MSG_CHECKING([whether to activate signature support in eet]) +AC_MSG_RESULT([${have_signature}]) -### Checks for header files +# libjpeg and zlib +EFL_CHECK_LIBS([eet], [libjpeg zlib]) -AC_CHECK_HEADER([zlib.h], - [dummy="yes"], - [AC_MSG_ERROR("Cannot find zlib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file")]) +# Eina library -AC_CHECK_HEADER([jpeglib.h], - [dummy="yes"], - [AC_MSG_ERROR("Cannot find jpeglib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file")]) +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) EFL_CHECK_PATH_MAX @@ -394,7 +433,6 @@ EFL_CHECK_PATH_MAX ### Checks for compiler characteristics AM_PROG_CC_C_O -AC_C_CONST AC_C_INLINE AC_PROG_CC_STDC AC_C___ATTRIBUTE__ @@ -423,22 +461,6 @@ if test ! "x${have_null}" = "xyes" ; then AC_MSG_WARN([Your system is a bit too funny, eet might not work properly]) fi -# These are needed for fmemopen/open_memstream -AC_DEFINE(_GNU_SOURCE, , [Enable GNU extensions]) - -EET_CPPFLAGS="" -EET_CFLAGS="" -case "$host_os" in - mingw32ce*) - EET_CPPFLAGS="-D_WIN32_WCE=0x0420" - ;; - mingw*) - EET_CPPFLAGS="-D_WIN32_WINNT=0x0501" - ;; -esac -AC_SUBST(EET_CPPFLAGS) -AC_SUBST(EET_CFLAGS) - ### Checks for linker characteristics @@ -450,7 +472,7 @@ case "$host_os" in lt_enable_auto_import="-Wl,--enable-auto-import" ;; esac -AC_SUBST(lt_enable_auto_import) +AC_SUBST([lt_enable_auto_import]) case "${host_os}" in openbsd*) @@ -467,10 +489,11 @@ AC_FUNC_ALLOCA AC_CHECK_FUNCS(fmemopen open_memstream realpath) -EFL_CHECK_FNMATCH([], [AC_MSG_ERROR([Cannot find fnmatch()])]) +EFL_CHECK_FUNCS([eet], [fnmatch]) -AC_SUBST(requirement_eet) +AC_SUBST([requirements_pc_eet]) +AC_SUBST([requirements_libs_eet]) AC_OUTPUT([ Makefile diff --git a/eet.pc.in b/eet.pc.in index f7a3bf1..ee95887 100644 --- a/eet.pc.in +++ b/eet.pc.in @@ -5,9 +5,8 @@ includedir=@includedir@ Name: eet Description: Library for speedy data storage, retrieval, and compression -@pkgconfig_requires_private@: @requirement_eet@ Version: @VERSION@ +@pkgconfig_requires_private@: @requirements_pc_eet@ Libs: -L${libdir} -leet -Libs.private: @EET_LIBS@ @EFL_FNMATCH_LIBS@ @LIBGCRYPT_LIBS@ -ljpeg -lz -lm +Libs.private: @requirements_libs_eet@ -lm Cflags: -I${includedir}/eet-@VMAJ@ -Cflags.private: @LIBGCRYPT_CFLAGS@ diff --git a/m4/efl_check_funcs.m4 b/m4/efl_check_funcs.m4 new file mode 100644 index 0000000..3714969 --- /dev/null +++ b/m4/efl_check_funcs.m4 @@ -0,0 +1,435 @@ +dnl Copyright (C) 2012 Vincent Torri +dnl This code is public domain and can be freely used or copied. + +dnl Macros that check functions availability for the EFL: + +dnl dirfd +dnl dladdr +dnl dlopen +dnl fnmatch +dnl iconv +dnl setxattr (an al.) +dnl shm_open + + +dnl _EFL_CHECK_FUNC_DIRFD is for internal use +dnl _EFL_CHECK_FUNC_DIRFD(EFL, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) + +AC_DEFUN([_EFL_CHECK_FUNC_DIRFD], +[ +AC_LINK_IFELSE( + [ + AC_LANG_PROGRAM( + [[ +#ifdef HAVE_DIRENT_H +# include +#endif + ]], + [[ +int main(void) +{ + DIR *dirp; + return dirfd(dirp); +} + ]]) + ], + [_efl_have_fct="yes"], + [_efl_have_fct="no"]) + +AS_IF([test "x${_efl_have_fct}" = "xyes"], [$2], [$3]) +]) + +dnl _EFL_CHECK_FUNC_DLADDR_PRIV is for internal use +dnl _EFL_CHECK_FUNC_DLADDR_PRIV(EFL, LIB, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) + +AC_DEFUN([_EFL_CHECK_FUNC_DLADDR_PRIV], +[ +m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl +m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl + +LIBS_save="${LIBS}" +LIBS="${LIBS} $2" +AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#define _GNU_SOURCE +#include + ]], + [[ +int res = dladdr(0, 0); + ]])], + [ + m4_defn([UPEFL])[]_LIBS="${m4_defn([UPEFL])[]_LIBS} $2" + requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} $2" + _efl_have_fct="yes" + ], + [_efl_have_fct="no"]) + +LIBS="${LIBS_save}" + +AS_IF([test "x${_efl_have_fct}" = "xyes"], [$3], [$4]) + +m4_popdef([DOWNEFL]) +m4_popdef([UPEFL]) +]) + +dnl _EFL_CHECK_FUNC_DLADDR is for internal use +dnl _EFL_CHECK_FUNC_DLADDR(EFL, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) + +AC_DEFUN([_EFL_CHECK_FUNC_DLADDR], +[ +m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl +m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl + +case "$host_os" in + mingw*) + _efl_have_fct="yes" + requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -ldl" + m4_defn([UPEFL])[]_LIBS="${m4_defn([UPEFL])[]_LIBS} -ldl" + ;; + *) + _efl_have_fct="no" + +dnl Check is dladdr is in libc + _EFL_CHECK_FUNC_DLADDR_PRIV([$1], [], [_efl_have_fct="yes"], [_efl_have_fct="no"]) + +dnl Check is dlopen is in libdl + if test "x${_efl_have_fct}" = "xno" ; then + _EFL_CHECK_FUNC_DLADDR_PRIV([$1], [-ldl], [_efl_have_fct="yes"], [_efl_have_fct="no"]) + fi + ;; +esac + +AS_IF([test "x${_efl_have_fct}" = "xyes"], [$2], [$3]) + +m4_popdef([DOWNEFL]) +m4_popdef([UPEFL]) +]) + +dnl _EFL_CHECK_FUNC_DLOPEN_PRIV is for internal use +dnl _EFL_CHECK_FUNC_DLOPEN_PRIV(EFL, LIB, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) + +AC_DEFUN([_EFL_CHECK_FUNC_DLOPEN_PRIV], +[ +m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl +m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl + +LIBS_save="${LIBS}" +LIBS="${LIBS} $2" +AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include + ]], + [[ +void *h = dlopen(0, 0); + ]])], + [ + m4_defn([UPEFL])[]_LIBS="${m4_defn([UPEFL])[]_LIBS} $2" + requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} $2" + _efl_have_fct="yes" + ], + [_efl_have_fct="no"]) + +LIBS="${LIBS_save}" + +AS_IF([test "x${_efl_have_fct}" = "xyes"], [$3], [$4]) + +m4_popdef([DOWNEFL]) +m4_popdef([UPEFL]) +]) + +dnl _EFL_CHECK_FUNC_DLOPEN is for internal use +dnl _EFL_CHECK_FUNC_DLOPEN(EFL, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) + +AC_DEFUN([_EFL_CHECK_FUNC_DLOPEN], +[ +m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl +m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl + +case "$host_os" in + mingw*) + _efl_have_fct="yes" + requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -ldl" + m4_defn([UPEFL])[]_LIBS="${m4_defn([UPEFL])[]_LIBS} -ldl" + ;; + *) + _efl_have_fct="no" + +dnl Check is dlopen is in libc + _EFL_CHECK_FUNC_DLOPEN_PRIV([$1], [], [_efl_have_fct="yes"], [_efl_have_fct="no"]) + +dnl Check is dlopen is in libdl + if test "x${_efl_have_fct}" = "xno" ; then + _EFL_CHECK_FUNC_DLOPEN_PRIV([$1], [-ldl], [_efl_have_fct="yes"], [_efl_have_fct="no"]) + fi + ;; +esac + +AS_IF([test "x${_efl_have_fct}" = "xyes"], [$2], [$3]) + +m4_popdef([DOWNEFL]) +m4_popdef([UPEFL]) +]) + +dnl _EFL_CHECK_FUNC_FNMATCH_PRIV is for internal use +dnl _EFL_CHECK_FUNC_FNMATCH_PRIV(EFL, LIB, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) + +AC_DEFUN([_EFL_CHECK_FUNC_FNMATCH_PRIV], +[ +m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl +m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl + +LIBS_save="${LIBS}" +LIBS="${LIBS} $2" +AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include +#include + ]], + [[ +int g = fnmatch(NULL, NULL, 0); + ]])], + [ + m4_defn([UPEFL])[]_LIBS="${m4_defn([UPEFL])[]_LIBS} $2" + requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} $2" + _efl_have_fct="yes" + ], + [_efl_have_fct="no"]) + +LIBS="${LIBS_save}" + +AS_IF([test "x${_efl_have_fct}" = "xyes"], [$3], [$4]) + +m4_popdef([DOWNEFL]) +m4_popdef([UPEFL]) +]) + +dnl _EFL_CHECK_FUNC_FNMATCH is for internal use +dnl _EFL_CHECK_FUNC_FNMATCH(EFL, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) + +AC_DEFUN([_EFL_CHECK_FUNC_FNMATCH], +[ +case "$host_os" in + mingw*) + _efl_have_fct="yes" + ;; + *) +dnl Check is fnmatch is in libc + _EFL_CHECK_FUNC_FNMATCH_PRIV([$1], [], [_efl_have_fct="yes"], [_efl_have_fct="no"]) + +dnl Check is fnmatch is in libfnmatch + if test "x${_efl_have_fct}" = "xno" ; then + _EFL_CHECK_FUNC_FNMATCH_PRIV([$1], [-lfnmatch], [_efl_have_fct="yes"], [_efl_have_fct="no"]) + fi + +dnl Check is fnmatch is in libiberty + if test "x${_efl_have_fct}" = "xno" ; then + _EFL_CHECK_FUNC_FNMATCH_PRIV([$1], [-liberty], [_efl_have_fct="yes"], [_efl_have_fct="no"]) + fi + ;; +esac + +AS_IF([test "x${_efl_have_fct}" = "xyes"], [$2], [$3]) +]) + +dnl _EFL_CHECK_FUNC_ICONV_PRIV is for internal use +dnl _EFL_CHECK_FUNC_ICONV_PRIV(EFL, LIB, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) + +AC_DEFUN([_EFL_CHECK_FUNC_ICONV_PRIV], +[ +m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl +m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl + +LIBS_save="${LIBS}" +LIBS="${LIBS} $2" +AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include +#include + ]], + [[ +iconv_t ic; +size_t count = iconv(ic, NULL, NULL, NULL, NULL); + ]])], + [ + m4_defn([UPEFL])[]_LIBS="${m4_defn([UPEFL])[]_LIBS} $2" + requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} $2" + _efl_have_fct="yes" + ], + [_efl_have_fct="no"]) + +LIBS="${LIBS_save}" + +AS_IF([test "x${_efl_have_fct}" = "xyes"], [$3], [$4]) + +m4_popdef([DOWNEFL]) +m4_popdef([UPEFL]) +]) + +dnl _EFL_CHECK_FUNC_ICONV is for internal use +dnl _EFL_CHECK_FUNC_ICONV(EFL, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) + +AC_DEFUN([_EFL_CHECK_FUNC_ICONV], +[ +AC_ARG_WITH([iconv-link], + AC_HELP_STRING([--with-iconv-link=ICONV_LINK], [explicitly specify an iconv link option]), + [ + _efl_have_fct="yes" + iconv_libs=${withval} + ], + [_efl_have_fct="no"]) + +AC_MSG_CHECKING([for explicit iconv link options]) +if test "x${iconv_libs}" = "x" ; then + AC_MSG_RESULT([no explicit iconv link option]) +else + AC_MSG_RESULT([${iconv_libs}]) +fi + +dnl Check is iconv is in libc +if test "x${_efl_have_fct}" = "xno" ; then + _EFL_CHECK_FUNC_ICONV_PRIV([$1], [], [_efl_have_fct="yes"], [_efl_have_fct="no"]) +fi + +dnl Check is iconv is in libiconv +if test "x${_efl_have_fct}" = "xno" ; then + _EFL_CHECK_FUNC_ICONV_PRIV([$1], [-liconv], [_efl_have_fct="yes"], [_efl_have_fct="no"]) +fi + +dnl Check is iconv is in libiconv_plug +if test "x${_efl_have_fct}" = "xno" ; then + _EFL_CHECK_FUNC_ICONV_PRIV([$1], [-liconv_plug], [_efl_have_fct="yes"], [_efl_have_fct="no"]) +fi + +AS_IF([test "x${_efl_have_fct}" = "xyes"], [$2], [$3]) +]) + +dnl _EFL_CHECK_FUNC_SETXATTR is for internal use +dnl _EFL_CHECK_FUNC_SETXATTR(EFL, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) + +AC_DEFUN([_EFL_CHECK_FUNC_SETXATTR], +[ +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include +#include +#include + ]], + [[ +size_t tmp = listxattr("/", NULL, 0); +tmp = getxattr("/", "user.ethumb.md5", NULL, 0); +setxattr("/", "user.ethumb.md5", NULL, 0, 0); + ]])], + [_efl_have_fct="yes"], + [_efl_have_fct="no"]) + +AS_IF([test "x${_efl_have_fct}" = "xyes"], [$2], [$3]) +]) + +dnl _EFL_CHECK_FUNC_SHM_OPEN_PRIV is for internal use +dnl _EFL_CHECK_FUNC_SHM_OPEN_PRIV(EFL, LIB, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) + +AC_DEFUN([_EFL_CHECK_FUNC_SHM_OPEN_PRIV], +[ +m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl +m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl + +LIBS_save="${LIBS}" +LIBS="${LIBS} $2" +AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include +#include /* For mode constants */ +#include /* For O_* constants */ + ]], + [[ +int fd; + +fd = shm_open("/dev/null", O_RDONLY, S_IRWXU | S_IRWXG | S_IRWXO); + ]])], + [ + m4_defn([UPEFL])[]_LIBS="$m4_defn([UPEFL])[]_LIBS $2" + requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} $2" + _efl_have_fct="yes" + ], + [_efl_have_fct="no"]) + +LIBS="${LIBS_save}" + +AS_IF([test "x${_efl_have_fct}" = "xyes"], [$3], [$4]) + +m4_popdef([DOWNEFL]) +m4_popdef([UPEFL]) +]) + +dnl _EFL_CHECK_FUNC_SHM_OPEN is for internal use +dnl _EFL_CHECK_FUNC_SHM_OPEN(EFL, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) + +AC_DEFUN([_EFL_CHECK_FUNC_SHM_OPEN], +[ +_efl_have_fct="no" + +dnl Check is shm_open is in libc +_EFL_CHECK_FUNC_SHM_OPEN_PRIV([$1], [], + [_efl_have_fct="yes"], + [_efl_have_fct="no"]) + +dnl Check is shm_open is in librt +if test "x${_efl_have_fct}" = "xno" ; then + _EFL_CHECK_FUNC_SHM_OPEN_PRIV([$1], [-lrt], + [_efl_have_fct="yes"], + [_efl_have_fct="no"]) +fi + +AS_IF([test "x${_efl_have_fct}" = "xyes"], [$2], [$3]) +]) + +dnl Macro that checks function availability +dnl +dnl EFL_CHECK_FUNC(EFL, FUNCTION) +dnl AC_DEFINE : EFL_HAVE_FUNCTION (FUNCTION being replaced by its value) +dnl result in efl_func_function (function being replaced by its value) + +AC_DEFUN([EFL_CHECK_FUNC], +[ +m4_pushdef([UP], m4_translit([$2], [-a-z], [_A-Z]))dnl +m4_pushdef([DOWN], m4_translit([$2], [-A-Z], [_a-z]))dnl + +m4_default([_EFL_CHECK_FUNC_]m4_defn([UP]))($1, [have_fct="yes"], [have_fct="no"]) + +if test "x$2" = "xsetxattr" ; then + AC_MSG_CHECKING([for extended attributes]) +else + AC_MSG_CHECKING([for ]m4_defn([DOWN])) +fi + +AC_MSG_RESULT([${have_fct}]) + +if test "x${have_fct}" = "xyes" ; then + if test "x$2" = "xsetxattr" ; then + AC_DEFINE([HAVE_XATTR], [1], [Define to 1 if you have the `listxattr', `setxattr' and `getxattr' functions.]) + else + AC_DEFINE([HAVE_]m4_defn([UP]), [1], [Define to 1 if you have the `]m4_defn([DOWN])[' function.]) + fi +fi + +efl_func_[]m4_defn([DOWN])="${have_fct}" + +m4_popdef([DOWN]) +m4_popdef([UP]) +]) + +dnl Macro that iterates over a sequence of space separated functions +dnl and that calls EFL_CHECK_FUNC() for each of these functions +dnl +dnl EFL_CHECK_FUNCS(EFL, FUNCTIONS) + +AC_DEFUN([EFL_CHECK_FUNCS], +[ +m4_foreach_w([fct], [$2], [EFL_CHECK_FUNC($1, m4_defn([fct]))]) +]) diff --git a/m4/efl_check_libs.m4 b/m4/efl_check_libs.m4 new file mode 100644 index 0000000..ea2fc8e --- /dev/null +++ b/m4/efl_check_libs.m4 @@ -0,0 +1,120 @@ +dnl Copyright (C) 2012 Vincent Torri +dnl This code is public domain and can be freely used or copied. + +dnl Macro that check dependencies libraries for the EFL: + +dnl libjpeg +dnl zlib + +dnl _EFL_CHECK_LIB_LIBJPEG is for internal use +dnl _EFL_CHECK_LIB_LIBJPEG(EFL, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) + +AC_DEFUN([_EFL_CHECK_LIB_LIBJPEG], +[ +m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl +m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl + +AC_CHECK_HEADER([jpeglib.h], + [have_dep="yes"], + [ + AC_MSG_ERROR(["Cannot find jpeglib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file"]) + have_dep="no" + ]) + +if test "x${have_dep}" = "xyes" ; then + AC_CHECK_LIB([jpeg], [jpeg_std_error], + [ + have_dep="yes" + requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -ljpeg" + ], + [ + AC_MSG_ERROR("Cannot find libjpeg library. Make sure your LDFLAGS environment variable contains include lines for the location of this file") + have_dep="no" + ]) +fi + +AS_IF([test "x${have_dep}" = "xyes"], [$2], [$3]) + +m4_popdef([DOWNEFL]) +m4_popdef([UPEFL]) +]) + +dnl _EFL_CHECK_LIB_ZLIB is for internal use +dnl _EFL_CHECK_LIB_ZLIB(EFL, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) + +AC_DEFUN([_EFL_CHECK_LIB_ZLIB], +[ +m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl +m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl + +PKG_CHECK_EXISTS([zlib], + [ + _efl_have_lib="yes" + requirements_pc_[]m4_defn([DOWNEFL])="${requirements_pc_[]m4_defn([DOWNEFL])} zlib" + ], + [ + AC_MSG_ERROR(["Cannot find zlib.PC. Make sure your PKG_CONFIG_PATH environment variable contains include lines for the location of this file"]) + _efl_have_lib="no" + ]) + +if test "x${_efl_have_lib}" = "xno" ; then + AC_CHECK_HEADER([zlib.h], + [_efl_have_lib="yes"], + [ + AC_MSG_ERROR(["Cannot find zlib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file"]) + _efl_have_lib="no" + ]) + + if test "x${_efl_have_lib}" = "xyes" ; then + AC_CHECK_LIB([z], [zlibVersion], + [ + _efl_have_lib="yes" + requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -lz" + ], + [ + AC_MSG_ERROR(["Cannot find libjpeg library. Make sure your LDFLAGS environment variable contains include lines for the location of this file"]) + _efl_have_lib="no" + ]) + fi +fi + +AS_IF([test "x${_efl_have_lib}" = "xyes"], [$2], [$3]) + +m4_popdef([DOWNEFL]) +m4_popdef([UPEFL]) +]) + +dnl Macro that checks for a library +dnl +dnl EFL_CHECK_LIB(EFL, LIBRARY) +dnl AC_DEFINE : EFL_HAVE_LIBRARY (LIBRARY being replaced by its value) + +AC_DEFUN([EFL_CHECK_LIB], +[ +m4_pushdef([UP], m4_translit([$2], [-a-z], [_A-Z]))dnl +m4_pushdef([DOWN], m4_translit([$2], [-A-Z], [_a-z]))dnl + +m4_default([_EFL_CHECK_LIB_]m4_defn([UP]))($1, [have_lib="yes"], [have_lib="no"]) + +AC_MSG_CHECKING([for ]m4_defn([DOWN])) +AC_MSG_RESULT([${have_lib}]) + +if test "x${have_lib}" = "xyes" ; then + AC_DEFINE([HAVE_]m4_defn([UP]), [1], [Define to 1 if the `]m4_defn([DOWN])[' library is installed.]) +fi + +efl_lib_[]m4_defn([DOWN])="${have_lib}" + +m4_popdef([DOWN]) +m4_popdef([UP]) +]) + +dnl Macro that iterates over a sequence of white separated libraries +dnl and that calls EFL_CHECK_LIB() for each of these libraries +dnl +dnl EFL_CHECK_LIBS(EFL, LIBRARIES) + +AC_DEFUN([EFL_CHECK_LIBS], +[ +m4_foreach_w([lib], [$2], [EFL_CHECK_LIB($1, m4_defn([lib]))]) +]) \ No newline at end of file diff --git a/m4/efl_fnmatch.m4 b/m4/efl_fnmatch.m4 deleted file mode 100644 index b5555ee..0000000 --- a/m4/efl_fnmatch.m4 +++ /dev/null @@ -1,43 +0,0 @@ -dnl Copyright (C) 2010 Vincent Torri -dnl That code is public domain and can be freely used or copied. - -dnl Macro that check if fnmatch functions are available or not. - -dnl Usage: EFL_CHECK_FNMATCH([, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -dnl Call AC_SUBST(EFL_FNMATCH_LIBS) - -AC_DEFUN([EFL_CHECK_FNMATCH], -[ - -AC_CHECK_HEADER([fnmatch.h], [_efl_have_fnmatch="yes"], [_efl_have_fnmatch="no"]) - -if test "x${_efl_have_fnmatch}" = "xyes" ; then - AC_SEARCH_LIBS([fnmatch], - [fnmatch evil iberty], - [_efl_have_fnmatch="yes"], - [_efl_have_fnmatch="no"]) -fi - -EFL_FNMATCH_LIBS="" - -if (! test "x${ac_cv_search_fnmatch}" = "xnone required") && (! test "x${ac_cv_search_fnmatch}" = "xno") && (! test "x${ac_cv_search_fnmatch}" = "x-levil") ; then - EFL_FNMATCH_LIBS=${ac_cv_search_fnmatch} -fi - -if test "x${_efl_have_fnmatch}" != "xyes" -a "x${enable_exotic}" = "xyes"; then - LDFLAGS_SAVE="$LDFLAGS" - LDFLAGS="$LDFLAGS $EXOTIC_LIBS" - AC_CHECK_LIB([exotic], [fnmatch], - [_efl_have_fnmatch="yes"], - [_efl_have_fnmatch="no"]) - - if test "x${_efl_have_fnmatch}" = "xyes"; then - EFL_FNMATCH_LIBS="exotic" - fi -fi - -AC_SUBST(EFL_FNMATCH_LIBS) - -AS_IF([test "x$_efl_have_fnmatch" = "xyes"], [$1], [$2]) - -]) diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 89c68f1..3b83f76 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -8,14 +8,11 @@ AM_CPPFLAGS = \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ -@EET_CPPFLAGS@ \ -@EINA_CFLAGS@ \ -@EVIL_CFLAGS@ +@EET_CFLAGS@ bin_PROGRAMS = @EET_PRG@ EXTRA_PROGRAMS = eet eet_SOURCES = eet_main.c -eet_CFLAGS = @EET_CFLAGS@ -eet_LDADD = $(top_builddir)/src/lib/libeet.la @EINA_LIBS@ @EVIL_LIBS@ @EXOTIC_LIBS@ +eet_LDADD = $(top_builddir)/src/lib/libeet.la @EET_LIBS@ eet_LDFLAGS = @lt_enable_auto_import@ diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index bcd6ceb..71a233f 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -9,13 +9,9 @@ AM_CPPFLAGS = \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ -@EVIL_CFLAGS@ \ -@EINA_CFLAGS@ \ -@EET_CPPFLAGS@ \ +@EET_CFLAGS@ \ @EFL_EET_BUILD@ \ -@EFL_COVERAGE_CFLAGS@ \ -@OPENSSL_CFLAGS@ \ -@GNUTLS_CFLAGS@ +@EFL_COVERAGE_CFLAGS@ includes_HEADERS = Eet.h includesdir = $(includedir)/eet-@VMAJ@ @@ -38,8 +34,8 @@ lz4/lz4.h \ lz4/lz4hc.c \ lz4/lz4hc.h -libeet_la_CFLAGS = @EET_CFLAGS@ @DEBUG_CFLAGS@ -libeet_la_LIBADD = @GNUTLS_LIBS@ @OPENSSL_LIBS@ @EFL_COVERAGE_LIBS@ @EET_LIBS@ @EINA_LIBS@ @EVIL_LIBS@ -lz -ljpeg -lm +libeet_la_CFLAGS = @DEBUG_CFLAGS@ +libeet_la_LIBADD = @EFL_COVERAGE_LIBS@ @EET_LIBS@ -lm libeet_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ EXTRA_DIST = lz4/README diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 61158f7..d318f41 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -4,15 +4,15 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests\" \ @CHECK_CFLAGS@ \ -@EINA_CFLAGS@ +@EET_CFLAGS@ if EFL_ENABLE_TESTS check_PROGRAMS = eet_suite -eet_suite_SOURCES = eet_suite.c eet_data_suite.c -eet_suite_LDADD = $(top_builddir)/src/lib/libeet.la @EINA_LIBS@ @CHECK_LIBS@ +eet_suite_SOURCES = eet_suite.c eet_data_suite.c eet_suite.h +eet_suite_LDADD = $(top_builddir)/src/lib/libeet.la @EET_LIBS@ @CHECK_LIBS@ endif -EXTRA_DIST = eet_suite.h cert.pem key_enc_none.pem key_enc.pem key.pem +EXTRA_DIST = cert.pem key_enc_none.pem key_enc.pem key.pem