From a39fb32bc797751d6180c90ce3a6c67564bfc339 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Thu, 6 Jan 2011 18:27:21 +0000 Subject: [PATCH] add guards in config.h to avoid multiple inclusions SVN revision: 55940 --- legacy/eet/configure.ac | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/legacy/eet/configure.ac b/legacy/eet/configure.ac index 3b49c762e3..653100661f 100644 --- a/legacy/eet/configure.ac +++ b/legacy/eet/configure.ac @@ -22,12 +22,17 @@ AC_INIT([eet], [v_ver.beta3], [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 @@ -52,6 +57,12 @@ AC_SUBST(release_info) VMAJ=v_maj AC_SUBST(VMAJ) + +### Needed information + +AC_CANONICAL_BUILD +AC_CANONICAL_HOST + ### Default options with respect to host want_gnutls="auto" @@ -413,6 +424,7 @@ AC_SUBST(lt_enable_auto_import) EFL_LINKER_FLAG([-Wl,--as-needed]) ### Checks for library functions +AC_ISC_POSIX AC_FUNC_ALLOCA AC_CHECK_FUNCS(fmemopen open_memstream realpath)