Committer: Diego Biurrun <diego@xxxxxxxxxx> Date: 28/04/2010 at 17:31:43 Revision: 4425 Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Branch nick: trunk Log: Move CFLAGS/CPPFLAGS setting to the top of configure. This simplifies the addition of more flags further down. Modified: M configure.ac === modified file 'configure.ac' --- configure.ac 2010-04-28 12:49:35 +0000 +++ configure.ac 2010-04-28 14:30:45 +0000 @@ -65,6 +65,13 @@ AH_TEMPLATE(HIPL_CONFIG_FILE, [default config file location]) +# Set default AM_CFLAGS for the complete project. +AC_SUBST(AM_CFLAGS, "-std=c99 -Werror -Wall -Wredundant-decls -Wdisabled-optimization -Wundef -Wstrict-prototypes -Wmissing-prototypes -Wno-deprecated-declarations -fno-strict-aliasing") + +# Set the preprocessor flags for the entire project +AC_SUBST(AM_CPPFLAGS, "-D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=500") + + AC_ARG_ENABLE(firewall, AS_HELP_STRING([--enable-firewall], [HIP enabled firewall daemon (default is YES)]), @@ -258,7 +265,7 @@ [ac_cv_use_profiling], [ac_cv_use_profiling=no]) if test x"$ac_cv_use_profiling" = x"yes"; then - AC_SUBST(GPROF_CFLAGS, "-pg") + AC_SUBST(AM_CFLAGS, "$AM_CFLAGS -pg") fi AC_ARG_ENABLE(debug, @@ -319,11 +326,6 @@ AH_TEMPLATE(CONFIG_HIP_DEMO, [Defined to 1 if demo is enabled.]) fi -# Set default AM_CFLAGS for the complete project. -AC_SUBST(AM_CFLAGS, "-std=c99 -Werror -Wall -Wredundant-decls -Wdisabled-optimization -Wundef -Wstrict-prototypes -Wmissing-prototypes -Wno-deprecated-declarations -fno-strict-aliasing $GPROF_CFLAGS") - -# Set the preprocessor flags for the entire project -AC_SUBST(AM_CPPFLAGS, "-D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=500") AC_CONFIG_FILES([ Makefile doc/Doxyfile tools/hipdnskeyparse tools/hipdnsproxy ])