From: Enlightenment S. <no-...@en...> - 2011-01-06 18:45:16
|
Log: add guards in config.h to avoid multiple inclusions Author: caro Date: 2011-01-06 10:45:09 -0800 (Thu, 06 Jan 2011) New Revision: 55946 Trac: http://trac.enlightenment.org/e/changeset/55946 Modified: trunk/edje/configure.ac Modified: trunk/edje/configure.ac =================================================================== --- trunk/edje/configure.ac 2011-01-06 18:43:21 UTC (rev 55945) +++ trunk/edje/configure.ac 2011-01-06 18:45:09 UTC (rev 55946) @@ -22,12 +22,17 @@ 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 @@ -54,9 +59,9 @@ AC_DEFINE_UNQUOTED([SHARED_LIB_SUFFIX], ["$shrext_cmds"], [Suffix for shared objects]) -EFL_CHECK_PATH_MAX - ### Default options with respect to host +AC_CANONICAL_BUILD +AC_CANONICAL_HOST case "$host_os" in mingw32ce* | cegcc*) @@ -316,7 +321,9 @@ ### Checks for header files AC_CHECK_HEADERS([locale.h]) +EFL_CHECK_PATH_MAX + ### Checks for types @@ -352,6 +359,9 @@ ### Checks for library functions + +AC_ISC_POSIX + AC_FUNC_ALLOCA case "$host_os" in |