From 8709c1b57d4839d77d0df0d349a594338837fd36 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Thu, 6 Jan 2011 18:47:36 +0000 Subject: [PATCH] add guards in config.h to avoid multiple inclusions SVN revision: 55947 --- legacy/efreet/configure.ac | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/legacy/efreet/configure.ac b/legacy/efreet/configure.ac index 5d20370924..8f810da654 100644 --- a/legacy/efreet/configure.ac +++ b/legacy/efreet/configure.ac @@ -22,11 +22,17 @@ AC_INIT([efreet], [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_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 @@ -53,6 +59,9 @@ AC_SUBST(VMAJ) ### Needed information +AC_CANONICAL_BUILD +AC_CANONICAL_HOST + ### Additional options to configure @@ -172,7 +181,6 @@ AC_CHECK_HEADERS([arpa/inet.h]) ### Checks for compiler characteristics AC_C_CONST -AC_ISC_POSIX AC_C___ATTRIBUTE__ AM_PROG_CC_STDC AC_HEADER_STDC @@ -207,6 +215,7 @@ AC_SUBST(lt_enable_auto_import) ### Checks for library functions +AC_ISC_POSIX AC_FUNC_ALLOCA AC_CHECK_FUNCS(strlcpy)