From: Enlightenment S. <no-...@en...> - 2012-10-10 17:40:44
|
Log: efl: cleanup to remove stuff that is not in single-tree yet. Remove every mention to libraries that are still not in the single-tree build such as emotion, efreet and ethumb. Keep it simple and just add them back when they are merged. Added similar variables for all of evil, eina, eo and eet. Keep them in the same order for now. Author: barbieri Date: 2012-10-10 10:40:35 -0700 (Wed, 10 Oct 2012) New Revision: 77767 Trac: http://trac.enlightenment.org/e/changeset/77767 Modified: trunk/efl/INSTALL trunk/efl/configure.ac Modified: trunk/efl/INSTALL =================================================================== --- trunk/efl/INSTALL 2012-10-10 17:27:11 UTC (rev 77766) +++ trunk/efl/INSTALL 2012-10-10 17:40:35 UTC (rev 77767) @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -226,6 +226,11 @@ and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `<wchar.h>' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-10-10 17:27:11 UTC (rev 77766) +++ trunk/efl/configure.ac 2012-10-10 17:40:35 UTC (rev 77767) @@ -51,106 +51,36 @@ #### Default values -want_evas="yes" -want_ecore="yes" -want_embryo="yes" -want_eio="yes" -want_edje="yes" -want_efreet="yes" -want_e_dbus="yes" -want_eeze="yes" -want_emotion="yes" -want_ethumb="yes" -want_elementary="yes" requirements_libs_evil="" requirements_libs_eina="" +requirements_libs_eo="" requirements_libs_eet="" -requirements_libs_evas="" -requirements_libs_ecore="" -requirements_libs_embryo="" -requirements_libs_eio="" -requirements_libs_edje="" -requirements_libs_efreet="" -requirements_libs_e_dbus="" -requirements_libs_eeze="" -requirements_libs_emotion="" -requirements_libs_ethumb="" -requirements_libs_elementary="" requirements_libs_deps_evil="" requirements_libs_deps_eina="" +requirements_libs_deps_eo="" requirements_libs_deps_eet="" -requirements_libs_deps_evas="" -requirements_libs_deps_ecore="" -requirements_libs_deps_embryo="" -requirements_libs_deps_eio="" -requirements_libs_deps_edje="" -requirements_libs_deps_efreet="" -requirements_libs_deps_e_dbus="" -requirements_libs_deps_eeze="" -requirements_libs_deps_emotion="" -requirements_libs_deps_ethumb="" -requirements_libs_deps_elementary="" +requirements_pc_evil="" requirements_pc_eina="" -requirements_pc_eet="" requirements_pc_eo="" -requirements_pc_evas="" -requirements_pc_ecore="" -requirements_pc_embryo="" -requirements_pc_eio="" -requirements_pc_edje="" -requirements_pc_efreet="" -requirements_pc_e_dbus="" -requirements_pc_eeze="" -requirements_pc_emotion="" -requirements_pc_ethumb="" -requirements_pc_elementary="" +requirements_pc_eet="" +requirements_pc_deps_evil="" requirements_pc_deps_eina="" +requirements_pc_deps_eo="" requirements_pc_deps_eet="" -requirements_pc_deps_evas="" -requirements_pc_deps_ecore="" -requirements_pc_deps_embryo="" -requirements_pc_deps_eio="" -requirements_pc_deps_edje="" -requirements_pc_deps_efreet="" -requirements_pc_deps_e_dbus="" -requirements_pc_deps_eeze="" -requirements_pc_deps_emotion="" -requirements_pc_deps_ethumb="" -requirements_pc_deps_elementary="" AC_SUBST([requirements_libs_evil]) AC_SUBST([requirements_libs_eina]) +AC_SUBST([requirements_libs_eo]) AC_SUBST([requirements_libs_eet]) -AC_SUBST([requirements_libs_evas]) -AC_SUBST([requirements_libs_ecore]) -AC_SUBST([requirements_libs_embryo]) -AC_SUBST([requirements_libs_eio]) -AC_SUBST([requirements_libs_edje]) -AC_SUBST([requirements_libs_efreet]) -AC_SUBST([requirements_libs_e_dbus]) -AC_SUBST([requirements_libs_eeze]) -AC_SUBST([requirements_libs_emotion]) -AC_SUBST([requirements_libs_ethumb]) -AC_SUBST([requirements_libs_elementary]) +AC_SUBST([requirements_pc_evil]) AC_SUBST([requirements_pc_eina]) -AC_SUBST([requirements_pc_eet]) AC_SUBST([requirements_pc_eo]) -AC_SUBST([requirements_pc_evas]) -AC_SUBST([requirements_pc_ecore]) -AC_SUBST([requirements_pc_embryo]) -AC_SUBST([requirements_pc_eio]) -AC_SUBST([requirements_pc_edje]) -AC_SUBST([requirements_pc_efreet]) -AC_SUBST([requirements_pc_e_dbus]) -AC_SUBST([requirements_pc_eeze]) -AC_SUBST([requirements_pc_emotion]) -AC_SUBST([requirements_pc_ethumb]) -AC_SUBST([requirements_pc_elementary]) +AC_SUBST([requirements_pc_eet]) AC_CANONICAL_HOST @@ -165,18 +95,12 @@ mingw32ce*) have_wince="yes" have_windows="yes" - want_efreet="no" - want_e_dbus="no" - want_eeze="no" - want_emotion="no" - want_ethumb="no" MODULE_ARCH="$host_os-$host_cpu" MODULE_EXT=".dll" ;; mingw*) have_win32="yes" have_windows="yes" - want_eeze="no" MODULE_ARCH="$host_os-$host_cpu-v_maj.v_min.v_mic" MODULE_EXT=".dll" ;; @@ -626,10 +550,11 @@ ## Examples -PKG_CHECK_MODULES([ECORE_EVAS], - [ecore-evas ecore evas], - [build_tiler_example="yes"], - [build_tiler_example="no"]) +# TODO: add once ecore-evas is merged: +#PKG_CHECK_MODULES([ECORE_EVAS], +# [ecore-evas ecore evas], +# [build_tiler_example="yes"], +# [build_tiler_example="no"]) AM_CONDITIONAL([BUILD_TILER_EXAMPLE], [test "x${build_tiler_example}" = "xyes"]) @@ -1160,7 +1085,8 @@ # Example (evas one) -PKG_CHECK_MODULES([ELM], [elementary >= 1.7.0], [have_elm="yes"], [have_elm="no"]) +# TODO: add once elementary is merged +#PKG_CHECK_MODULES([ELM], [elementary >= 1.7.0], [have_elm="yes"], [have_elm="no"]) AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"]) ### Checks for header files @@ -1190,24 +1116,6 @@ #### End of Eo -#### Evas - -#AC_MSG_NOTICE([Evas checks]) - -### Default values -### Additional options to configure -### Checks for programs -### Checks for libraries -### Checks for header files -### Checks for types -### Checks for structures -### Checks for compiler characteristics -### Checks for linker characteristics -### Checks for library functions - -#### End of Evas - - AC_CONFIG_FILES([ Makefile doc/Makefile |
From: Enlightenment S. <no-...@en...> - 2012-10-10 17:41:57
|
Log: remove and ignore INSTALL file. it's autogenerated, avoid it in svn. Author: barbieri Date: 2012-10-10 10:41:48 -0700 (Wed, 10 Oct 2012) New Revision: 77768 Trac: http://trac.enlightenment.org/e/changeset/77768 Removed: trunk/efl/INSTALL Modified: trunk/efl/ Property changes on: trunk/efl ___________________________________________________________________ Modified: svn:ignore - Makefile Makefile.in aclocal.m4 autom4te.cache benchmark config.cache config.guess config.h config.h.in config.log config.status config.sub configure coverage depcomp install-sh libtool ltmain.sh missing stamp-h1 + Makefile Makefile.in aclocal.m4 autom4te.cache benchmark config.cache config.guess config.h config.h.in config.log config.status config.sub configure coverage depcomp install-sh libtool ltmain.sh missing stamp-h1 INSTALL |
From: Enlightenment S. <no-...@en...> - 2012-10-10 17:59:21
|
Log: add some TODO/comments for vtorri. Vincent, please check those and take some action. I'm not sure about the windows stuff, but we should find a way to make it more automatic than what it is right now. Author: barbieri Date: 2012-10-10 10:59:15 -0700 (Wed, 10 Oct 2012) New Revision: 77769 Trac: http://trac.enlightenment.org/e/changeset/77769 Modified: trunk/efl/configure.ac Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-10-10 17:41:48 UTC (rev 77768) +++ trunk/efl/configure.ac 2012-10-10 17:59:15 UTC (rev 77769) @@ -85,6 +85,7 @@ AC_CANONICAL_HOST +# TODO: move me to m4 file that setups module/so related variables have_wince="no" have_win32="no" have_windows="no" @@ -113,6 +114,7 @@ AC_DEFINE_UNQUOTED([MODULE_ARCH], ["${MODULE_ARCH}"], ["Module architecture"]) AC_DEFINE_UNQUOTED([SHARED_LIB_SUFFIX], ["${MODULE_EXT}"], [Suffix for shared objects]) +# TODO: move me to m4 file that setups the windows related variables AM_CONDITIONAL([HAVE_WINCE], [test "x${have_wince}" = "xyes"]) AM_CONDITIONAL([HAVE_WIN32], [test "x${have_win32}" = "xyes"]) AM_CONDITIONAL([HAVE_WINDOWS], [test "x${have_windows}" = "xyes"]) @@ -202,6 +204,9 @@ #### Checks for linker characteristics +# TODO: do we really need this? maybe setup in the specific m4 file that +# does the windows related variables? Do we need to manually specify this +# for every module? it's annoying and easy to forget! lt_enable_auto_import="" case "${host_os}" in mingw*) @@ -233,6 +238,7 @@ ### Checks for libraries +# TODO: are these needed here? parts of this are replicated for EVERY LIB :-( EVIL_LIBS="" EVIL_DLFCN_LIBS="" case "$host_os" in @@ -438,7 +444,8 @@ EFL_EINA_BUILD="" case "$host_os" in mingw*) - AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if Evil package is installed]) +# TODO: WHAT? evil was build before, so it should already define this +# AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if Evil package is installed]) requirements_pc_eina="${requirements_pc_eina} evil" EFL_EINA_BUILD="-DEFL_EINA_BUILD" ;; @@ -449,22 +456,24 @@ case "$host_vendor" in ps3*) - PKG_CHECK_EXISTS([escape]) - AC_DEFINE([HAVE_ESCAPE], [1], [Set to 1 if Escape package is installed]) - requirements_pc_eina="${requirements_pc_eina} escape" +# TODO: add back whenever escape is merged into efl single tree +# PKG_CHECK_EXISTS([escape]) +# AC_DEFINE([HAVE_ESCAPE], [1], [Set to 1 if Escape package is installed]) +# requirements_pc_eina="${requirements_pc_eina} escape" ;; esac # 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.]) - EINA_CONFIGURE_HAVE_EXOTIC="#define EINA_HAVE_EXOTIC" - requirements_pc_eina="exotic ${requirements_pc_eina}" - ], - [enable_exotic="no"]) +# TODO: add back whenever exotic is merged into efl single tree +#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"]) AM_CONDITIONAL([EINA_HAVE_EXOTIC], [test "x${enable_exotic}" = "xyes"]) AC_SUBST([EINA_CONFIGURE_HAVE_EXOTIC]) @@ -815,7 +824,8 @@ EFL_EET_BUILD="" case "$host_os" in mingw*) - AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if Evil package is installed]) +# TODO: WHAT? evil was build before, so it should already define this +# 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" ;; @@ -824,13 +834,14 @@ # 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"]) +# TODO: add back whenever exotic is merged into efl single tree +#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 @@ -992,10 +1003,12 @@ case "$host_os" in mingw32ce*) +# TODO: are these needed here? parts of this are replicated for EVERY LIB :-( requirements_libs_eet="${requirements_libs_eet} -lws2" requirements_libs_deps_eet="${requirements_libs_deps_eet} -lws2" ;; mingw*) +# TODO: are these needed here? parts of this are replicated for EVERY LIB :-( requirements_libs_eet="${requirements_libs_eet} -lws2_32" requirements_libs_deps_eet="${requirements_libs_deps_eet} -lws2_32" ;; @@ -1045,6 +1058,7 @@ openbsd*) ;; *) +# TODO: here? Why don't do everywhere or let user specify it? EFL_CHECK_LINKER_FLAGS([EET], [-Wl,--as-needed]) ;; esac @@ -1076,6 +1090,7 @@ # Eina library +# TODO: really? do we need this? it's a local eina! requirements_pc_eo="eina >= 1.7.99" AC_ARG_VAR([EO_CFLAGS], [preprocessor flags for Eo]) |
From: Enlightenment S. <no-...@en...> - 2012-10-10 18:46:37
|
Log: be strict with build profile names. Author: barbieri Date: 2012-10-10 11:46:27 -0700 (Wed, 10 Oct 2012) New Revision: 77772 Trac: http://trac.enlightenment.org/e/changeset/77772 Modified: trunk/efl/configure.ac Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-10-10 18:43:15 UTC (rev 77771) +++ trunk/efl/configure.ac 2012-10-10 18:46:27 UTC (rev 77772) @@ -92,6 +92,15 @@ [build_profile=${withval}], [build_profile=dev]) +case "$build_profile" in + dev|release) + ;; + *) + AC_MSG_ERROR([Unknown build profile --with-profile=${build_profile}]) + ;; +esac + + # TODO: move me to m4 file that setups module/so related variables have_wince="no" have_win32="no" |
From: Enlightenment S. <no-...@en...> - 2012-10-10 19:27:03
|
Log: efl: simplify crypto options. Introduce a new --with-crypto={openssl,gnutls,none} that will allow one to choose the EFL cryptographic system. If set to gnutls or openssl, cipher and signature will be enabled. Otherwise it's disabled. NOTE: gnutls is trying to cope with old API and that sucks. Should we just drop the support for old gnutls and bump the required version? Author: barbieri Date: 2012-10-10 12:26:56 -0700 (Wed, 10 Oct 2012) New Revision: 77789 Trac: http://trac.enlightenment.org/e/changeset/77789 Modified: trunk/efl/configure.ac Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-10-10 19:19:50 UTC (rev 77788) +++ trunk/efl/configure.ac 2012-10-10 19:26:56 UTC (rev 77789) @@ -655,68 +655,22 @@ AC_DEFINE(EET_OLD_EET_FILE_FORMAT, 0, [support old eet file format]) fi -# Openssl support +AC_ARG_WITH([crypto], + [AC_HELP_STRING([--with-crypto=CRYPTO], + [use the predefined build crypto, one of: + openssl, gnutls or none. + @<:@default=openssl@:>@])], + [build_crypto=${withval}], + [build_crypto=openssl]) -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"]) +case "$build_crypto" in + openssl|gnutls|none) + ;; + *) + AC_MSG_ERROR([Unknown build crypto --with-crypto=${build_crypto}]) + ;; +esac -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 @@ -749,150 +703,72 @@ ## Secure layer -# Gnutls library +case "$build_crypto" in + gnutls) + PKG_CHECK_MODULES([GNUTLS], [gnutls >= 1.7.6]) + AC_DEFINE([HAVE_GNUTLS], [1], [Have Gnutls support]) + requirements_pc_eet="gnutls >= 1.7.6 ${requirements_pc_eet}" + requirements_pc_deps_eet="gnutls >= 1.7.6 ${requirements_pc_deps_eet}" -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}" - requirements_pc_deps_eet="gnutls >= 1.7.6 ${requirements_pc_deps_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 + # TODO: do we need this? + # libgcrypt + AC_PATH_GENERIC([libgcrypt], [], [:], + [AC_MSG_ERROR([libgcrypt required but not found])]) requirements_libs_eet="${LIBGCRYPT_LIBS} ${requirements_libs_eet}" requirements_libs_deps_eet="${LIBGCRYPT_LIBS} ${requirements_libs_deps_eet}" - fi -fi -# Specific GNUTLS improvement + # TODO: do we need this? can't we just bump required version? + # Specific GNUTLS improvement + 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]) + ], [AC_MSG_NOTICE([Optional gnutls_x509_crt_verify_hash not present.])]) + CFLAGS="${CFLAGS_save}" + LIBS="${LIBS_save}" -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"]) + # TODO: do we need this? can't we just bump required version? + 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]) + ], [AC_MSG_NOTICE([Optional gnutls_privkey_sign_data not present.])]) + CFLAGS="${CFLAGS_save}" + LIBS="${LIBS_save}" -AC_MSG_CHECKING([whether to use gnutls_x509_crt_verify_hash]) -AC_MSG_RESULT([${new_gnutls_api}]) + # TODO: do we need this? can't we just bump required version? + 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]) + ]) + CFLAGS="${CFLAGS_save}" + LIBS="${LIBS_save}" + ;; -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 + openssl) + PKG_CHECK_MODULES([OPENSSL], [openssl]) + AC_DEFINE([HAVE_OPENSSL], [1], [Have Openssl support]) + requirements_pc_eet="openssl ${requirements_pc_eet}" + requirements_pc_deps_eet="openssl ${requirements_pc_deps_eet}" + ;; +esac -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}" - requirements_pc_deps_eet="openssl ${requirements_pc_deps_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" +if test "$build_crypto" != "none" ; 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]) -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]) @@ -1146,11 +1022,7 @@ else 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 " Secure layer.........: ${build_crypto}" echo echo " Old eet file format..: ${old_eet_file_format}" echo |
From: Enlightenment S. <no-...@en...> - 2012-10-10 19:36:44
|
Log: efl: simplify print of options Author: barbieri Date: 2012-10-10 12:36:36 -0700 (Wed, 10 Oct 2012) New Revision: 77791 Trac: http://trac.enlightenment.org/e/changeset/77791 Modified: trunk/efl/configure.ac Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-10-10 19:30:17 UTC (rev 77790) +++ trunk/efl/configure.ac 2012-10-10 19:36:36 UTC (rev 77791) @@ -947,21 +947,14 @@ echo echo " OS...................: ${host_os}" echo " Build Profile........: ${build_profile}" +echo " Cryptographic System.: ${build_crypto}" if test "x${have_windows}" = "xyes" ; then echo " Windows version......: ${_efl_windows_version}" fi -echo echo " Documentation........: ${build_doc}" echo echo "Eina" echo -echo " Magic debug..........: ${have_magic_debug}" -echo " Safety checks........: ${have_safety_checks}" -echo " Maximum log level....: ${with_max_log_level}" -echo " Report string usage..: ${have_stringshare_usage}" -echo " Valgrind support.....: ${have_valgrind}" -echo " Default mempool......: ${have_default_mempool}" -echo " Log support..........: ${enable_log}" echo " Thread Support.......: ${efl_have_threads}" if test "${efl_have_threads}" = "POSIX" ; then echo " spinlock...........: ${efl_have_posix_threads_spinlock}" @@ -973,16 +966,6 @@ echo " File xattr...........: ${efl_func_setxattr}" echo " shm_open.............: ${efl_func_shm_open}" echo -echo " Tests................: make check (Coverage: ${_efl_enable_coverage})" -echo " Examples.............: make examples" -echo " Tiler Example......: ${build_tiler_example}" -echo " installation.......: make install-examples" -echo " Benchmark............: make benchmark" -if test "x${enable_benchmark}" = "xyes" ; then -echo " Glib...............: ${enable_benchmark_glib}" -echo " E17 real data......: ${enable_benchmark_e17}" -fi -echo echo " Memory pools:" echo " Buddy..............: ${enable_buddy}" echo " Chained pool.......: ${enable_chained_pool}" @@ -992,35 +975,14 @@ echo " One big............: ${enable_one_big}" echo " Pass through.......: ${enable_pass_through}" echo -if test "x${efl_have_eet}" = "xno" ; then -echo "Eet....................: no" -echo -else -echo "Eet" -echo -echo " Secure layer.........: ${build_crypto}" -echo -echo " Tests................: make check (Coverage: ${_efl_enable_coverage})" -echo " Examples.............: make examples" -echo " installation.......: make install-examples" -fi -if test "x${efl_have_eo}" = "xno" ; then -echo "Eo.....................: no" -echo -else -echo "Eo" -echo -echo " Tests................: make check (Coverage: ${_efl_enable_coverage})" -echo " Examples.............: make examples" -echo " installation.......: make install-examples" -fi -echo echo "Compilation............: make (or gmake)" echo " CPPFLAGS.............: $CPPFLAGS" echo " CFLAGS...............: $CFLAGS" echo " CXXFLAGS.............: $CXXFLAGS" echo " LDFLAGS..............: $LDFLAGS" echo +echo "Tests..................: make check (Coverage: ${_efl_enable_coverage})" +echo "Examples...............: make examples (also install-examples)" echo "Installation...........: make install (as root if needed, with 'su' or 'sudo')" echo " prefix...............: $prefix" echo |
From: Enlightenment S. <no-...@en...> - 2012-10-10 20:00:53
|
Log: checking for NULL=0 is too much. particularly if all you do is warning, the whole EFL would stop working due our "if (ptr)" checks. Author: barbieri Date: 2012-10-10 13:00:43 -0700 (Wed, 10 Oct 2012) New Revision: 77793 Trac: http://trac.enlightenment.org/e/changeset/77793 Modified: trunk/efl/configure.ac Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-10-10 19:57:53 UTC (rev 77792) +++ trunk/efl/configure.ac 2012-10-10 20:00:43 UTC (rev 77793) @@ -726,30 +726,6 @@ ### 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 - EFL_CHECK_COMPILER_FLAGS([EET], [-Wshadow -Wpointer-arith]) ### Checks for linker characteristics |
From: Enlightenment S. <no-...@en...> - 2012-10-10 20:06:52
|
Log: efl: libjpeg and zlib are mandatory. TODO: we should have a better way to check those without requiring the check for efl_lib_zlib and efl_lib_libjpeg. Author: barbieri Date: 2012-10-10 13:06:45 -0700 (Wed, 10 Oct 2012) New Revision: 77794 Trac: http://trac.enlightenment.org/e/changeset/77794 Modified: trunk/efl/configure.ac Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-10-10 20:00:43 UTC (rev 77793) +++ trunk/efl/configure.ac 2012-10-10 20:06:45 UTC (rev 77794) @@ -692,7 +692,12 @@ # libjpeg and zlib EFL_CHECK_LIBS([EET], [libjpeg zlib]) +# TODO: better way to force those instead of is secondary check +if test "x${efl_lib_zlib}" != "xyes" -o "x${efl_lib_libjpeg}" != "xyes" ; then + AC_MSG_ERROR([Required EET libraries were not found.]) +fi + # Eina library requirements_pc_eet="eina >= 1.7.99 ${requirements_pc_eet}" @@ -743,10 +748,6 @@ ### Check availability -if test "x${efl_lib_zlib}" = "xyes" && test "x${efl_lib_libjpeg}" = "xyes" ; then - efl_have_eet="yes" -fi - #### End of Eet |
From: Enlightenment S. <no-...@en...> - 2012-10-10 20:09:54
|
Log: efl: do not report specific functions in the summary. iconv, dirfd, xattr can be checked in the whole configure output, config.h or config.log. Author: barbieri Date: 2012-10-10 13:09:43 -0700 (Wed, 10 Oct 2012) New Revision: 77795 Trac: http://trac.enlightenment.org/e/changeset/77795 Modified: trunk/efl/configure.ac Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-10-10 20:06:45 UTC (rev 77794) +++ trunk/efl/configure.ac 2012-10-10 20:09:43 UTC (rev 77795) @@ -878,10 +878,6 @@ echo " debug usage........: ${efl_have_debug_threads}" echo " on/off support.....: ${efl_have_on_off_threads}" fi -echo " Iconv support........: ${efl_func_iconv}" -echo " File dirfd...........: ${efl_func_dirfd}" -echo " File xattr...........: ${efl_func_setxattr}" -echo " shm_open.............: ${efl_func_shm_open}" echo echo "Compilation............: make (or gmake)" echo " CPPFLAGS.............: $CPPFLAGS" |
From: Enlightenment S. <no-...@en...> - 2012-10-10 20:42:10
|
Log: minor improvement to last commit (use an intermediate variable want_debug_threads) Author: barbieri Date: 2012-10-10 13:42:04 -0700 (Wed, 10 Oct 2012) New Revision: 77807 Trac: http://trac.enlightenment.org/e/changeset/77807 Modified: trunk/efl/configure.ac Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-10-10 20:40:34 UTC (rev 77806) +++ trunk/efl/configure.ac 2012-10-10 20:42:04 UTC (rev 77807) @@ -310,6 +310,7 @@ have_stringshare_usage="yes" want_valgrind="no" # TODO: "yes" is not working: relocation R_X86_64_32S against `vgPlain_interim_stack' can not be used when making a shared object; recompile with -fPIC want_debug_malloc="yes" + want_debug_threads="yes" ;; release) @@ -317,6 +318,7 @@ have_stringshare_usage="no" want_valgrind="no" want_debug_malloc="no" + want_debug_threads="no" ;; esac @@ -539,7 +541,7 @@ EINA_CONFIGURE_HAVE_THREADS="#define EINA_HAVE_THREADS" AC_SUBST(EINA_CONFIGURE_HAVE_THREADS) -if test "$build_profile" = "dev"; then +if test "$want_debug_threads" = "yes"; then EINA_CONFIGURE_HAVE_DEBUG_THREADS="#define EINA_HAVE_DEBUG_THREADS" AC_DEFINE([EFL_DEBUG_THREADS], [1], [Assert when forgot to call eina_threads_init]) fi |
From: Enlightenment S. <no-...@en...> - 2012-10-10 20:53:29
|
Log: efl: remove --disable-assert, do it on build_profile. Author: barbieri Date: 2012-10-10 13:53:22 -0700 (Wed, 10 Oct 2012) New Revision: 77809 Trac: http://trac.enlightenment.org/e/changeset/77809 Modified: trunk/efl/configure.ac Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-10-10 20:46:29 UTC (rev 77808) +++ trunk/efl/configure.ac 2012-10-10 20:53:22 UTC (rev 77809) @@ -224,6 +224,14 @@ ###################### EFL ###################### +prefer_assert="no" +case "$build_profile" in + dev) + prefer_assert="yes" + ;; +esac + + #### Evil if test "x${have_windows}" = "xyes" ; then @@ -449,7 +457,6 @@ ### Checks for header files -AC_HEADER_ASSERT AC_HEADER_TIME AC_HEADER_DIRENT |
From: Enlightenment S. <no-...@en...> - 2012-10-10 20:58:03
|
Log: efl: simplify thread summary Author: barbieri Date: 2012-10-10 13:57:53 -0700 (Wed, 10 Oct 2012) New Revision: 77811 Trac: http://trac.enlightenment.org/e/changeset/77811 Modified: trunk/efl/configure.ac Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-10-10 20:56:29 UTC (rev 77810) +++ trunk/efl/configure.ac 2012-10-10 20:57:53 UTC (rev 77811) @@ -864,19 +864,13 @@ echo echo " OS...................: ${host_os}" echo " Build Profile........: ${build_profile}" +echo " Threads Type.........: ${efl_have_threads} (spinlocks: ${efl_have_posix_threads_spinlock})" echo " Cryptographic System.: ${build_crypto}" if test "x${have_windows}" = "xyes" ; then echo " Windows version......: ${_efl_windows_version}" fi echo " Documentation........: ${build_doc}" echo -echo "Eina" -echo -echo " Thread Support.......: ${efl_have_threads}" -if test "${efl_have_threads}" = "POSIX" ; then -echo " spinlock...........: ${efl_have_posix_threads_spinlock}" -fi -echo echo "Compilation............: make (or gmake)" echo " CPPFLAGS.............: $CPPFLAGS" echo " CFLAGS...............: $CFLAGS" |
From: Enlightenment S. <no-...@en...> - 2012-10-10 21:02:36
|
Log: efl: cosmetic change to documentation summary. Author: barbieri Date: 2012-10-10 14:02:23 -0700 (Wed, 10 Oct 2012) New Revision: 77813 Trac: http://trac.enlightenment.org/e/changeset/77813 Modified: trunk/efl/configure.ac Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-10-10 21:00:14 UTC (rev 77812) +++ trunk/efl/configure.ac 2012-10-10 21:02:23 UTC (rev 77813) @@ -869,7 +869,6 @@ if test "x${have_windows}" = "xyes" ; then echo " Windows version......: ${_efl_windows_version}" fi -echo " Documentation........: ${build_doc}" echo echo "Compilation............: make (or gmake)" echo " CPPFLAGS.............: $CPPFLAGS" @@ -879,6 +878,9 @@ echo echo "Tests..................: make check (Coverage: ${_efl_enable_coverage})" echo "Examples...............: make examples (also install-examples)" +if test "x${build_doc}" = "xyes"; then +echo "Documentation..........: make doc" +fi echo "Installation...........: make install (as root if needed, with 'su' or 'sudo')" echo " prefix...............: $prefix" echo |
From: Enlightenment S. <no-...@en...> - 2012-10-10 21:11:23
|
Log: efl: remove unused variables. Author: barbieri Date: 2012-10-10 14:11:14 -0700 (Wed, 10 Oct 2012) New Revision: 77814 Trac: http://trac.enlightenment.org/e/changeset/77814 Modified: trunk/efl/configure.ac Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-10-10 21:02:23 UTC (rev 77813) +++ trunk/efl/configure.ac 2012-10-10 21:11:14 UTC (rev 77814) @@ -564,9 +564,6 @@ #### Eet - -efl_have_eet="no" - AC_MSG_NOTICE([Eet checks]) ### Default values @@ -752,9 +749,6 @@ #### Eo - -efl_have_eo="no" - AC_MSG_NOTICE([Eo checks]) ### Default values @@ -803,8 +797,6 @@ ### Check availability -efl_have_eo="yes" - #### End of Eo |
From: Enlightenment S. <no-...@en...> - 2012-10-10 21:40:30
|
Log: efl: do not define EINA_SAFETY_CHECKS twice. it was being defined in config.h and eina_config.h Author: barbieri Date: 2012-10-10 14:40:24 -0700 (Wed, 10 Oct 2012) New Revision: 77819 Trac: http://trac.enlightenment.org/e/changeset/77819 Modified: trunk/efl/configure.ac Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-10-10 21:37:47 UTC (rev 77818) +++ trunk/efl/configure.ac 2012-10-10 21:40:24 UTC (rev 77819) @@ -328,7 +328,6 @@ AC_SUBST([EINA_CONFIGURE_MAGIC_DEBUG]) if test "x${have_safety_checks}" = "xyes" ; then - AC_DEFINE([EINA_SAFETY_CHECKS], [1], [disable safety checks for NULL pointers and like.]) EINA_CONFIGURE_SAFETY_CHECKS="#define EINA_SAFETY_CHECKS" fi AC_SUBST([EINA_CONFIGURE_SAFETY_CHECKS]) |
From: Enlightenment S. <no-...@en...> - 2012-10-10 21:42:56
|
Log: efl: HAVE_LOG is not used, just EINA_ENABLE_LOG Author: barbieri Date: 2012-10-10 14:42:48 -0700 (Wed, 10 Oct 2012) New Revision: 77820 Trac: http://trac.enlightenment.org/e/changeset/77820 Modified: trunk/efl/configure.ac Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-10-10 21:40:24 UTC (rev 77819) +++ trunk/efl/configure.ac 2012-10-10 21:42:48 UTC (rev 77820) @@ -509,7 +509,6 @@ if test "x${enable_log}" = "xyes"; then EINA_CONFIGURE_ENABLE_LOG="#define EINA_ENABLE_LOG" - AC_DEFINE([HAVE_LOG], [1], [Define to 1 if we log support is on]) fi AC_SUBST([EINA_CONFIGURE_ENABLE_LOG]) |
From: Enlightenment S. <no-...@en...> - 2012-10-10 22:17:10
|
Log: oops, bad copy & paste Author: barbieri Date: 2012-10-10 15:17:03 -0700 (Wed, 10 Oct 2012) New Revision: 77835 Trac: http://trac.enlightenment.org/e/changeset/77835 Modified: trunk/efl/configure.ac Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-10-10 22:12:29 UTC (rev 77834) +++ trunk/efl/configure.ac 2012-10-10 22:17:03 UTC (rev 77835) @@ -432,7 +432,7 @@ CFLAGS="${CFLAGS_save}" EINA_CONFIG(HAVE_INTTYPES_H, test "x${ac_cv_header_inttypes_h}" = "xyes") -EINA_CONFIG(HAVE_STDINT_H, test "x${ac_cv_header_inttypes_h}" = "xyes") +EINA_CONFIG(HAVE_STDINT_H, test "x${ac_cv_header_stdint_h}" = "xyes") ### Checks for types |
From: Enlightenment S. <no-...@en...> - 2012-10-10 22:30:39
|
Log: efl: move all system-level checks to a single place at the top. Author: barbieri Date: 2012-10-10 15:30:33 -0700 (Wed, 10 Oct 2012) New Revision: 77836 Trac: http://trac.enlightenment.org/e/changeset/77836 Modified: trunk/efl/configure.ac Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-10-10 22:17:03 UTC (rev 77835) +++ trunk/efl/configure.ac 2012-10-10 22:30:33 UTC (rev 77836) @@ -223,7 +223,56 @@ ;; esac +# Common Checks (keep names sorted for ease of use): +AC_HEADER_DIRENT +AC_HEADER_TIME +AC_CHECK_HEADERS([ \ +execinfo.h \ +inttypes.h \ +libgen.h \ +mcheck.h \ +netinet/in.h \ +siginfo.h \ +stdint.h \ +strings.h \ +sys/types.h \ +unistd.h \ +]) + +AC_CHECK_FUNCS([\ +backtrace \ +backtrace_symbols \ +execvp \ +fpathconf \ +fstatat \ +malloc_usable_size \ +mtrace \ +openat \ +strlcpy \ +]) + +# wchar_t +AC_CHECK_SIZEOF([wchar_t]) +EINA_SIZEOF_WCHAR_T=$ac_cv_sizeof_wchar_t +AC_SUBST([EINA_SIZEOF_WCHAR_T]) +AC_CHECK_TYPES([siginfo_t], [], [], + [[ +#include <signal.h> +#if HAVE_SIGINFO_H +# include <siginfo.h> +#endif + ]]) + +# struct dirent + +AC_CHECK_TYPES([struct dirent], [have_dirent="yes"], [have_dirent="no"], + [[ +#include <dirent.h> + ]]) + + + #### Evil if test "x${have_windows}" = "xyes" ; then @@ -420,11 +469,6 @@ ### Checks for header files -AC_HEADER_TIME -AC_HEADER_DIRENT - -AC_CHECK_HEADERS([unistd.h libgen.h inttypes.h stdint.h sys/types.h siginfo.h strings.h execinfo.h mcheck.h]) - # sys/mman.h could be provided by evil/escape/exotic so we need to set CFLAGS accordingly CFLAGS_save="${CFLAGS}" CFLAGS="${CFLAGS} ${EINA_CFLAGS}" @@ -435,27 +479,6 @@ EINA_CONFIG(HAVE_STDINT_H, test "x${ac_cv_header_stdint_h}" = "xyes") ### Checks for types - -# wchar_t - -AC_CHECK_SIZEOF([wchar_t]) -EINA_SIZEOF_WCHAR_T=$ac_cv_sizeof_wchar_t -AC_SUBST([EINA_SIZEOF_WCHAR_T]) -AC_CHECK_TYPES([siginfo_t], [], [], - [[ -#include <signal.h> -#if HAVE_SIGINFO_H -# include <siginfo.h> -#endif - ]]) - -# struct dirent - -AC_CHECK_TYPES([struct dirent], [have_dirent="yes"], [have_dirent="no"], - [[ -#include <dirent.h> - ]]) - EINA_CONFIG(HAVE_DIRENT_H, test "x${have_dirent}" = "xyes") AC_DEFINE_IF([HAVE_DIRENT_H], [test "x${have_dirent}" = "xyes"], [1], [Define to 1 if you have a valid <dirent.h> header file.]) @@ -476,9 +499,6 @@ EFL_CHECK_LINKER_FLAGS([EINA], [-fno-strict-aliasing]) ### Checks for library functions - -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]) enable_log="no" @@ -648,8 +668,6 @@ ### Checks for header files -AC_CHECK_HEADERS(netinet/in.h unistd.h) - ### Checks for types ### Checks for structures |
From: Enlightenment S. <no-...@en...> - 2012-10-11 19:17:38
|
Log: efl: document --with-profile and --with-crypto Author: barbieri Date: 2012-10-11 12:17:26 -0700 (Thu, 11 Oct 2012) New Revision: 77899 Trac: http://trac.enlightenment.org/e/changeset/77899 Modified: trunk/efl/README Modified: trunk/efl/README =================================================================== --- trunk/efl/README 2012-10-11 16:41:26 UTC (rev 77898) +++ trunk/efl/README 2012-10-11 19:17:26 UTC (rev 77899) @@ -18,3 +18,19 @@ make (do this as root unless you are installing in your users directories): make install + +EFL build is based on "profiles". It will default to "dev" for +unreleased software and "release" for official tarballs. One can +change it with --with-profile=NAME, where NAME is one of: + + * dev: debug features, assert() and extra checks useful to test + software. + + * release: optimizations and less checks so it runs faster. + + +CRYPTOGRAPHIC SYSTEM: EFL officially uses "openssl" library to do +signature, cipher and related. Alternatively one can use "gnutls" +(some distros are strict about licenses and want gnutls instead of +openssl) or disable it. One can change it with --with-crypto=NAME, +where NAME is one of: "openssl", "gnutls" and "none". |
From: Enlightenment S. <no-...@en...> - 2012-10-17 13:50:22
|
Log: efl: add --with-profile=debug, make dev faster. seems the debug of threads and stringshare could cause major slowdowns, then add another profile to produce debug. Changes: * dev: unlimited log. * debug: same as dev with debug malloc, threads and stringshare. Author: barbieri Date: 2012-10-17 06:50:11 -0700 (Wed, 17 Oct 2012) New Revision: 78120 Trac: http://trac.enlightenment.org/e/changeset/78120 Modified: trunk/efl/README trunk/efl/configure.ac Modified: trunk/efl/README =================================================================== --- trunk/efl/README 2012-10-17 13:13:33 UTC (rev 78119) +++ trunk/efl/README 2012-10-17 13:50:11 UTC (rev 78120) @@ -23,9 +23,10 @@ unreleased software and "release" for official tarballs. One can change it with --with-profile=NAME, where NAME is one of: - * dev: debug features, assert() and extra checks useful to test - software. + * dev: extra checks useful to test software. + * debug: superset of dev, with debug features and assert(). + * release: optimizations and less checks so it runs faster. Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-10-17 13:13:33 UTC (rev 78119) +++ trunk/efl/configure.ac 2012-10-17 13:50:11 UTC (rev 78120) @@ -87,13 +87,13 @@ AC_ARG_WITH([profile], [AC_HELP_STRING([--with-profile=PROFILE], - [use the predefined build profile, one of: dev, release. + [use the predefined build profile, one of: dev, debug and release. @<:@default=dev@:>@])], [build_profile=${withval}], [build_profile=dev]) case "$build_profile" in - dev|release) + dev|debug|release) ;; *) AC_MSG_ERROR([Unknown build profile --with-profile=${build_profile}]) @@ -218,7 +218,7 @@ prefer_assert="no" case "$build_profile" in - dev) + dev|debug) prefer_assert="yes" ;; esac @@ -354,6 +354,14 @@ have_safety_checks="yes" want_log="yes" case "$build_profile" in + debug) + with_max_log_level="" + have_stringshare_usage="no" + want_valgrind="no" # TODO: "yes" is not working: relocation R_X86_64_32S against `vgPlain_interim_stack' can not be used when making a shared object; recompile with -fPIC + want_debug_malloc="no" + want_debug_threads="no" + ;; + dev) with_max_log_level="" have_stringshare_usage="yes" |
From: Enlightenment S. <no-...@en...> - 2012-10-17 13:54:43
|
Log: efl: fix swapped dev/debug. thanks demarchi. Author: barbieri Date: 2012-10-17 06:54:31 -0700 (Wed, 17 Oct 2012) New Revision: 78121 Trac: http://trac.enlightenment.org/e/changeset/78121 Modified: trunk/efl/configure.ac Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-10-17 13:50:11 UTC (rev 78120) +++ trunk/efl/configure.ac 2012-10-17 13:54:31 UTC (rev 78121) @@ -354,7 +354,7 @@ have_safety_checks="yes" want_log="yes" case "$build_profile" in - debug) + dev) with_max_log_level="" have_stringshare_usage="no" want_valgrind="no" # TODO: "yes" is not working: relocation R_X86_64_32S against `vgPlain_interim_stack' can not be used when making a shared object; recompile with -fPIC @@ -362,7 +362,7 @@ want_debug_threads="no" ;; - dev) + debug) with_max_log_level="" have_stringshare_usage="yes" want_valgrind="no" # TODO: "yes" is not working: relocation R_X86_64_32S against `vgPlain_interim_stack' can not be used when making a shared object; recompile with -fPIC |
From: Enlightenment S. <no-...@en...> - 2012-10-22 19:56:14
|
Log: efl: use EINA_CONFIG() instead of manual if-define-endif-AC_SUBST bad cedric, did not look around in the file :-) Author: barbieri Date: 2012-10-22 12:56:05 -0700 (Mon, 22 Oct 2012) New Revision: 78338 Trac: http://trac.enlightenment.org/e/changeset/78338 Modified: trunk/efl/configure.ac Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-10-22 15:59:56 UTC (rev 78337) +++ trunk/efl/configure.ac 2012-10-22 19:56:05 UTC (rev 78338) @@ -517,16 +517,8 @@ EFL_CHECK_THREADS -if ! test "x${efl_have_pthread_barrier}" = "xno" ; then - EINA_CONFIGURE_HAVE_PTHREAD_BARRIER="#define EINA_HAVE_PTHREAD_BARRIER" -fi -AC_SUBST(EINA_CONFIGURE_HAVE_PTHREAD_BARRIER) - -if ! test "x${efl_have_setaffinity}" = "xno" ; then - EINA_CONFIGURE_HAVE_PTHREAD_SETAFFINITY="#define EINA_HAVE_PTHREAD_AFFINITY" -fi -AC_SUBST(EINA_CONFIGURE_HAVE_PTHREAD_SETAFFINITY) - +EINA_CONFIG(HAVE_PTHREAD_BARRIER, test "x${efl_have_pthread_barrier}" = "xyes") +EINA_CONFIG(HAVE_PTHREAD_AFFINITY, test "x${efl_have_setaffinity}" = "xyes") EINA_CONFIG(HAVE_DEBUG_THREADS, test "$want_debug_threads" = "yes") ### Modules |
From: Enlightenment S. <no-...@en...> - 2012-12-05 12:29:03
|
Log: fix EIO_LIBS contents to proper variable. vtorri: I told you these names are very very error prone. I did the mistake while reading it before, raster did the same today and even yourself did a typo. The "pc", "libs" and similar in the middle of a long variable name is easy to miss! Even more if the prefix is "requirements_" :-( Author: barbieri Date: 2012-12-05 04:28:53 -0800 (Wed, 05 Dec 2012) New Revision: 80234 Trac: http://trac.enlightenment.org/e/changeset/80234 Modified: trunk/efl/configure.ac Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-12-05 12:27:32 UTC (rev 80233) +++ trunk/efl/configure.ac 2012-12-05 12:28:53 UTC (rev 80234) @@ -4008,7 +4008,7 @@ requirements_pc_eio="ecore >= ${PACKAGE_VERSION} eet >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_eio}" requirements_libs_eio="${requirements_libs_eio} -lm" -EIO_LIBS=${requirements_pc_eio} +EIO_LIBS=${requirements_libs_eio} AC_SUBST([EIO_LIBS]) ### Checks for header files |
From: Enlightenment S. <no-...@en...> - 2012-12-05 12:34:26
|
Log: efl/evas: do not show pipe rendering if there is no option to set it. Author: barbieri Date: 2012-12-05 04:34:19 -0800 (Wed, 05 Dec 2012) New Revision: 80235 Trac: http://trac.enlightenment.org/e/changeset/80235 Modified: trunk/efl/configure.ac Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-12-05 12:28:53 UTC (rev 80234) +++ trunk/efl/configure.ac 2012-12-05 12:34:19 UTC (rev 80235) @@ -4239,7 +4239,6 @@ echo echo " Features:" echo " Cache Server 2..........: $want_evas_cserve2" -echo " Threaded Pipe Rendering.: $build_pipe_render" echo echo " Optional pixman rendering path:" echo " Pixman..................: $have_pixman" |
From: Enlightenment S. <no-...@en...> - 2012-12-05 23:19:48
|
Log: efl: do not AC_SUBST([CFLAGS]), it's already done. Author: barbieri Date: 2012-12-05 15:19:41 -0800 (Wed, 05 Dec 2012) New Revision: 80285 Trac: http://trac.enlightenment.org/e/changeset/80285 Modified: trunk/efl/configure.ac Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-12-05 23:18:59 UTC (rev 80284) +++ trunk/efl/configure.ac 2012-12-05 23:19:41 UTC (rev 80285) @@ -571,7 +571,6 @@ ;; esac -AC_SUBST([CFLAGS]) AC_SUBST([ALTIVEC_CFLAGS]) AC_SUBST([SSE3_CFLAGS]) |