From: Enlightenment S. <no-...@en...> - 2012-10-23 06:12:47
|
Log: merge: move stuff Author: caro Date: 2012-10-22 23:12:37 -0700 (Mon, 22 Oct 2012) New Revision: 78355 Trac: http://trac.enlightenment.org/e/changeset/78355 Modified: trunk/efl/configure.ac Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-10-23 06:07:30 UTC (rev 78354) +++ trunk/efl/configure.ac 2012-10-23 06:12:37 UTC (rev 78355) @@ -176,12 +176,49 @@ #### Checks for header files +# 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 \ +]) + EFL_CHECK_PATH_MAX #### 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> + ]]) + + #### Checks for structures @@ -208,35 +245,6 @@ #### Checks for library functions -AC_FUNC_ALLOCA - - -###################### EFL ###################### - -prefer_assert="no" -case "$build_profile" in - dev|debug) - prefer_assert="yes" - ;; -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 \ @@ -249,27 +257,12 @@ 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 - ]]) +AC_FUNC_ALLOCA -# struct dirent -AC_CHECK_TYPES([struct dirent], [have_dirent="yes"], [have_dirent="no"], - [[ -#include <dirent.h> - ]]) +###################### EFL ###################### - #### Evil if test "x${have_windows}" = "xyes" ; then @@ -464,6 +457,13 @@ ## Tests +prefer_assert="no" +case "$build_profile" in + dev|debug) + prefer_assert="yes" + ;; +esac + EFL_CHECK_TESTS(EINA) ## Benchmarks |