-# get rid of that stupid cache mechanism
-rm -f config.cache
-
-AC_INIT([eet], [1.2.3], [enlightenment-devel@lists.sourceforge.net])
+y##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
+##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
+m4_define([v_maj], [1])
+m4_define([v_min], [4])
+m4_define([v_mic], [999])
+m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v export || 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
+dnl 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], [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_LIBTOOL_WIN32_DLL
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);}'`
-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)
+
+
+### Needed information
+
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
### Default options with respect to host
-case "$host_os" in
- mingw* | cegcc*)
- 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
+want_gnutls="auto"
+want_openssl="auto"
+want_cipher="yes"
+want_signature="yes"
requirement_eet=""
EFL_EET_BUILD=""
case "$host_os" in
- mingw* | cegcc*)
+ mingw*)
PKG_CHECK_MODULES([EVIL], [evil])
AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if Evil library is installed])
requirement_eet="evil ${requirement_eet}"
mingw32ce*)
EET_LIBS="-lws2"
;;
- cegcc*)
- EET_LIBS="-lws2"
- ;;
mingw*)
EET_LIBS="-lws2_32"
;;
# Eina library
-PKG_CHECK_MODULES(EINA, [eina-0])
-requirement_eet="eina-0 ${requirement_eet}"
+PKG_CHECK_MODULES(EINA, [eina >= 1.0.0])
+requirement_eet="eina >= 1.0.0 ${requirement_eet}"
# Gnutls library
have_gnutls="no"
-if test "x${want_gnutls}" = "xyes" -o "x${want_gnutls}" = "xauto" ; then
+if test "x${want_gnutls}" = "xyes" || test "x${want_gnutls}" = "xauto" ; then
PKG_CHECK_MODULES(GNUTLS, [gnutls >= 1.7.6],
[
have_gnutls="yes"
# Openssl library
have_openssl="no"
-if test "x${want_openssl}" = "xyes" -o "x${want_openssl}" = "xauto" ; then
+if test "x${want_openssl}" = "xyes" || test "x${want_openssl}" = "xauto" ; then
PKG_CHECK_MODULES(OPENSSL, openssl,
[
have_openssl="yes"
[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
+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_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
+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})
-# pthread library
-
-EFL_CHECK_PTHREAD(["no"], [have_pthread="yes"], [have_pthread="no"])
-
-
### Checks for header files
AC_CHECK_HEADER([zlib.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)
-
+AC_CHECK_HEADERS(netinet/in.h unistd.h)
+EFL_CHECK_PATH_MAX
### Checks for types
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"],
mingw32ce*)
EET_CPPFLAGS="-D_WIN32_WCE=0x0420"
;;
- cegcc*)
- EET_CPPFLAGS="-D_WIN32_WCE=0x0420"
- EET_CFLAGS="-mwin32"
- ;;
mingw*)
- EET_CPPFLAGS="-D_WIN32_WINNT=0x0500"
+ EET_CPPFLAGS="-D_WIN32_WINNT=0x0501"
;;
esac
AC_SUBST(EET_CPPFLAGS)
lt_enable_auto_import=""
case "$host_os" in
- mingw* | cegcc*)
+ mingw*)
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_LINK_IFELSE(
- [AC_LANG_PROGRAM([[]], [])],
- [ld_as_needed="-Wl,--as-needed"],
- [ld_as_needed=""]
-)
-
-LDFLAGS=${LDFLAGS_SAVE}
-AC_SUBST(ld_as_needed)
-
+EFL_LINKER_FLAG([-Wl,--as-needed])
### Checks for library functions
+AC_ISC_POSIX
AC_FUNC_ALLOCA
AC_CHECK_FUNCS(fmemopen open_memstream realpath)
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