add guards in config.h to avoid multiple inclusions
authorcaro <caro@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Thu, 6 Jan 2011 18:43:21 +0000 (18:43 +0000)
committercaro <caro@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Thu, 6 Jan 2011 18:43:21 +0000 (18:43 +0000)
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/embryo@55945 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

configure.ac

index b82271a..bca98e2 100644 (file)
@@ -22,12 +22,17 @@ AC_INIT([embryo], [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,10 +57,11 @@ AC_SUBST(release_info)
 VMAJ=v_maj
 AC_SUBST(VMAJ)
 
-EFL_CHECK_PATH_MAX
-
 ### Default options with respect to host
 
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+
 requirement_embryo=""
 embryoincludedir="${datadir}/include"
 
@@ -103,6 +109,8 @@ AC_SUBST(EFL_EMBRYO_BUILD)
 
 ### Checks for header files
 
+EFL_CHECK_PATH_MAX
+
 
 ### Checks for types
 
@@ -147,6 +155,8 @@ AC_SUBST(lt_enable_auto_import)
 
 ### Checks for library functions
 
+AC_ISC_POSIX
+
 # alloca
 AC_FUNC_ALLOCA