X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=ecd03a068d4ca51b29a920e12e0a135cf635ec3e;hb=b68fb04c196156799433a502d6bb568b4b0e5ee1;hp=624062e849a9b8cceaa1764a2fd364ec21a0830c;hpb=27cca82e1e65446d2d2bb6949c6dc539aea59755;p=profile%2Fivi%2Feet.git

diff --git a/configure.ac b/configure.ac
index 624062e..ecd03a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,97 +1,94 @@
-# get rid of that stupid cache mechanism
-rm -f config.cache
-
-AC_INIT([eet], [1.2.3], [enlightenment-devel@lists.sourceforge.net])
+##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
+##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
+m4_define([v_maj], [1])
+m4_define([v_min], [7])
+m4_define([v_mic], [0])
+m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
+m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
+##--   When released, remove the dnl on the below line
+m4_undefine([v_rev])
+##--   When doing snapshots - change soname. remove dnl on below line
+dnl m4_define([relname], [ver-pre-svn-05])
+dnl m4_define([v_rel], [-release relname])
+##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
+m4_ifdef([v_rev], [m4_define([v_ver], [v_maj.v_min.v_mic.v_rev])], [m4_define([v_ver], [v_maj.v_min.v_mic])])
+m4_define([lt_cur], m4_eval(v_maj + v_min))
+m4_define([lt_rev], v_mic)
+m4_define([lt_age], v_min)
+##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
+##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
+
+AC_INIT([eet], [v_ver-beta], [enlightenment-devel@lists.sourceforge.net])
 AC_PREREQ([2.52])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])
-AC_CANONICAL_BUILD
-AC_CANONICAL_HOST
-AC_ISC_POSIX
+
+AC_CONFIG_HEADERS([config.h])
+AH_TOP([
+#ifndef EFL_CONFIG_H__
+#define EFL_CONFIG_H__
+])
+AH_BOTTOM([
+#endif /* EFL_CONFIG_H__ */
+])
 
 AM_INIT_AUTOMAKE([1.6 dist-bzip2])
-AM_CONFIG_HEADER([config.h])
 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
 AC_PROG_LIBTOOL
 
-VMAJ=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $1);}'`
-VMIN=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $2);}'`
-VMIC=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $3);}'`
-SNAP=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $4);}'`
-
-VREV="0"
-SVNVERSION=`which svnversion`
-if test -n "$SVNVERSION"; then
-  VREV=`$SVNVERSION . | awk -F : '{printf("%s\n", $1);}' | tr 'A-z' ' '`
-fi
-# When released uncomment the following
-##VREV="0"
-
-AC_SUBST(VREV)
-
-AC_DEFINE_UNQUOTED(VMAJ, $VMAJ, [Major version])
-AC_DEFINE_UNQUOTED(VMIN, $VMIN, [Minor version])
-AC_DEFINE_UNQUOTED(VMIC, $VMIC, [Micro version])
-AC_DEFINE_UNQUOTED(VREV, $VREV, [Revison])
-version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN"
-##release="ver-pre-svn-00"
-##release_info="-release $release"
-release_info=""
+##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
+##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
+m4_ifdef([v_rev], , [m4_define([v_rev], [0])])
+m4_ifdef([v_rel], , [m4_define([v_rel], [])])
+AC_DEFINE_UNQUOTED(VMAJ, [v_maj], [Major version])
+AC_DEFINE_UNQUOTED(VMIN, [v_min], [Minor version])
+AC_DEFINE_UNQUOTED(VMIC, [v_mic], [Micro version])
+AC_DEFINE_UNQUOTED(VREV, [v_rev], [Revison])
+version_info="lt_cur:lt_rev:lt_age"
+release_info="v_rel"
 AC_SUBST(version_info)
 AC_SUBST(release_info)
+##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
+##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
+VMAJ=v_maj
+AC_SUBST(VMAJ)
 
-### Default options with respect to host
 
-case "$host_os" in
-   mingw*)
-      want_gnutls="no"
-      want_openssl="no"
-      want_cipher="no"
-      want_signature="no"
-      ;;
-   *)
-      want_gnutls="auto"
-      want_openssl="auto"
-      want_cipher="yes"
-      want_signature="yes"
-      ;;
-esac
-
-requirement_eet=""
+### Needed information
 
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
 
-### Additional options to configure
+### Default options with respect to host
 
-# Amalgamation
+requirements_pc_eet=""
+requirements_libs_eet=""
 
-AC_ARG_ENABLE([amalgamation],
-   [AC_HELP_STRING([--enable-amalgamation], [enable generation of one single file with all source code in it, helps compiler optimizations.])],
-   [if test "x${enableval}" = "xyes"; then
-       do_amalgamation="yes"
-    else
-       do_amalgamation="no"
-    fi
-   ],
-   [do_amalgamation="no"]
-)
-AM_CONDITIONAL(EET_AMALGAMATION, test "x${do_amalgamation}" = "xyes")
+### 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}])
 
@@ -101,76 +98,70 @@ else
    AC_DEFINE(EET_OLD_EET_FILE_FORMAT, 0, [support old eet file format])
 fi
 
-# Gnutls support
-
-AC_ARG_ENABLE([gnutls],
-   [AC_HELP_STRING([--disable-gnutls], [disable gnutls eet support])],
-   [want_gnutls=$enableval]
-)
-AC_MSG_CHECKING([whether to use Gnutls])
-AC_MSG_RESULT([${want_gnutls}])
-
-# 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]
-)
-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
-   AC_CHECK_LIB(gnutls, gnutls_x509_crt_verify_hash,
-                [ new_gnutls_api="yes" ],
-		[ new_gnutls_api="no" ]
-		)
-
-   if test "x${new_gnutls_api}" = "xyes"; then
-      AC_DEFINE(EET_USE_NEW_GNUTLS_API, 1, [use gnutls_x509_crt_verify_hash])
-   fi
-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"
@@ -179,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"
@@ -194,19 +186,6 @@ AC_ARG_ENABLE([build-examples],
    [build_examples="no"])
 AM_CONDITIONAL([BUILD_EXAMPLES], [test "x${build_examples}" = "xyes"])
 
-# Unit tests, coverage and benchmarking
-
-EFL_CHECK_TESTS([enable_tests="yes"], [enable_tests="no"])
-EFL_CHECK_COVERAGE([${enable_tests}], [enable_coverage="yes"], [enable_coverage="no"])
-
-if test "x${prefer_assert}" = "xno"; then
-   DEBUG_CFLAGS="-DNDEBUG"
-else
-# use debug symbols and set DEBUG if coverage support is enabled
-   DEBUG_CFLAGS="${EFL_DEBUG_CFLAGS}"
-fi
-AC_SUBST(DEBUG_CFLAGS)
-
 
 ### Checks for programs
 AC_PROG_CC
@@ -229,108 +208,210 @@ 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])
-      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)
+# Exotic library for copilation on Coyote
 
-# Eina library
+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"])
 
-PKG_CHECK_MODULES(EINA, [eina-0])
-requirement_eet="eina-0 ${requirement_eet}"
+## Secure layer
 
 # Gnutls library
+
+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}])
+
 have_gnutls="no"
-if test "x${want_gnutls}" = "xyes" -o "x${want_gnutls}" = "xauto" ; then
-   PKG_CHECK_MODULES(GNUTLS, [gnutls >= 1.7.6],
+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])
-       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
+
+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" -o "x${want_openssl}" = "xauto" ; then
-   PKG_CHECK_MODULES(OPENSSL, openssl,
+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])
-       requirement_eet="openssl ${requirement_eet}"
+       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
+
 have_cipher="no"
-if test "x${have_gnutls}" = "xyes" -a "x${want_cipher}" = "xyes" ; then
+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" -a "x${want_cipher}" = "xyes" ; then
+   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" -a "x${want_signature}" = "xyes" ; then
+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" -a "x${want_signature}" = "xyes" ; then
+   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}])
 
-# pthread library
+# libjpeg and zlib
+EFL_CHECK_LIBS([eet], [libjpeg zlib])
 
-EFL_CHECK_PTHREAD(["no"], [have_pthread="yes"], [have_pthread="no"])
+# Eina library
 
+requirements_pc_eet="eina >= 1.2.0 ${requirements_pc_eet}"
+PKG_CHECK_MODULES([EET], [${requirements_pc_eet}])
 
-### Checks for header files
+case "$host_os" in
+   mingw32ce*)
+      requirements_libs_eet="${requirements_libs_eet} -lws2"
+      ;;
+   mingw*)
+      requirements_libs_eet="${requirements_libs_eet} -lws2_32"
+      ;;
+esac
 
-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")])
+EET_LIBS="${EET_LIBS} ${requirements_libs_eet}"
 
-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")])
 
-AC_CHECK_HEADERS(netinet/in.h)
+### Checks for header files
 
+AC_CHECK_HEADERS(netinet/in.h unistd.h)
+EFL_CHECK_PATH_MAX
 
 ### Checks for types
 
@@ -340,7 +421,6 @@ AC_CHECK_HEADERS(netinet/in.h)
 
 ### Checks for compiler characteristics
 AM_PROG_CC_C_O
-AC_C_CONST
 AC_C_INLINE
 AC_PROG_CC_STDC
 AC_C___ATTRIBUTE__
@@ -349,10 +429,11 @@ AC_C___ATTRIBUTE__
 AC_TRY_RUN(
    [
 #include <stdlib.h>
+#include <inttypes.h>
 int main (int argc, char **argv) {
   void *foo = NULL;
-  int bar = (int)foo;
-  return (int)foo;
+  uintptr_t bar = (uintptr_t)foo;
+  return (uintptr_t)foo;
 }
    ],
    [have_null="yes"],
@@ -368,22 +449,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
 
@@ -395,44 +460,43 @@ case "$host_os" in
       lt_enable_auto_import="-Wl,--enable-auto-import"
       ;;
 esac
-AC_SUBST(lt_enable_auto_import)
-
-# use --as-needed if supported
-
-LDFLAGS_SAVE=${LDFLAGS}
-LDFLAGS="${LDFLAGS} -Wl,--as-needed"
+AC_SUBST([lt_enable_auto_import])
 
-AC_LINK_IFELSE(
-   [AC_LANG_PROGRAM([[]], [])],
-   [ld_as_needed="-Wl,--as-needed"],
-   [ld_as_needed=""]
-)
-
-LDFLAGS=${LDFLAGS_SAVE}
-AC_SUBST(ld_as_needed)
+case "${host_os}" in
+   openbsd*)
+      ;;
+   *)
+      EFL_LINKER_FLAG([-Wl,--as-needed])
+      ;;
+esac
 
 
 ### Checks for library functions
+AC_ISC_POSIX
 AC_FUNC_ALLOCA
 
-AC_CHECK_FUNCS(fmemopen open_memstream realpath)
+EFL_CHECK_FUNCS([eet], [fnmatch])
+
+
+### Unit tests, coverage and benchmarking
 
-EFL_CHECK_FNMATCH([], [AC_MSG_ERROR([Cannot find fnmatch()])])
+EFL_CHECK_TESTS([eet], [enable_tests="yes"], [enable_tests="no"])
 
 
-AC_SUBST(requirement_eet)
+AC_SUBST([requirements_pc_eet])
+AC_SUBST([requirements_libs_eet])
 
 AC_OUTPUT([
 Makefile
 eet.pc
 doc/Makefile
+doc/Doxyfile
 doc/eet.dox
 src/Makefile
 src/lib/Makefile
 src/bin/Makefile
 src/tests/Makefile
 src/examples/Makefile
-README
 eet.spec
 ])
 
@@ -449,17 +513,15 @@ echo "------------------------------------------------------------------------"
 echo
 echo "Configuration Options Summary:"
 echo
-echo "  Amalgamation.........: ${do_amalgamation}"
-echo "  Gnutls...............: ${have_gnutls}"
-echo "  Openssl..............: ${have_openssl}"
-echo "    Cipher support.....: ${have_cipher}"
-echo "    Signature..........: ${have_signature}"
-echo "  Thread Support.......: ${have_pthread}"
+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................: ${enable_tests}"
-echo "  Coverage.............: ${enable_coverage}"
+echo "  Tests................: ${enable_tests} (Coverage: ${efl_enable_coverage})"
 echo
 echo "  Build eet............: $have_eet"
 echo
@@ -468,9 +530,7 @@ if test "x${build_doc}" = "xyes" ; then
    echo "    Building...........: make doc"
 fi
 echo "  Examples.............: ${build_examples}"
-if test "x${build_examples}" = "xyes" ; then
-   echo "    Install............: ${install_examples}"
-fi
+echo "  Examples installed...: ${install_examples}"
 echo
 echo "Compilation............: make (or gmake)"
 echo "  CPPFLAGS.............: $CPPFLAGS"