From eabadc45c204c56a77f4345f9feac72cfa1ed207 Mon Sep 17 00:00:00 2001
From: Vincent Torri <vincent.torri@gmail.com>
Date: Thu, 6 Jan 2011 18:32:20 +0000
Subject: [PATCH] add guards in config.h to avoid multiple inclusions

SVN revision: 55941
---
 legacy/evas/configure.ac | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/legacy/evas/configure.ac b/legacy/evas/configure.ac
index 2d5d03668b..b875fd6279 100644
--- a/legacy/evas/configure.ac
+++ b/legacy/evas/configure.ac
@@ -35,15 +35,21 @@ AC_INIT([evas], [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_GNU_SOURCE
+
+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_GNU_SOURCE
+
 AC_LIBTOOL_WIN32_DLL
 define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
 AC_PROG_LIBTOOL
@@ -65,10 +71,11 @@ AC_SUBST(release_info)
 VMAJ=v_maj
 AC_SUBST(VMAJ)
 
-EFL_CHECK_PATH_MAX
-
 ### Needed information
 
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+
 case "$host_os" in
    mingw32ce* | cegcc*)
       MODULE_ARCH="$host_os-$host_cpu"
@@ -298,6 +305,8 @@ fi
 ### Checks for header files
 AC_HEADER_STDC
 
+EFL_CHECK_PATH_MAX
+
 
 ### Checks for types
 
@@ -344,6 +353,8 @@ AC_SUBST(lt_enable_auto_import)
 
 ### Checks for library functions
 
+AC_ISC_POSIX
+
 # alloca
 AC_FUNC_ALLOCA