diff options
| author | Stephen Gallagher <sgallagh@redhat.com> | 2009-06-18 11:27:58 -0400 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2009-06-19 09:25:42 -0400 |
| commit | a8f3c276d5f408d39b2474f62e1f80cc97e5a2b0 (patch) | |
| tree | becddedb1bf211ca3507a6def8d936a2fcaf41c7 | |
| parent | 45e93b29d1016f1cc2c76e30ec9fbb5144452d59 (diff) | |
Allow the use of custom CFLAGS on the make command line
Setting CFLAGS explicitly in configure.ac means that they would be
overwritten when using e.g. make CFLAGS="-O0 -g"
This replaces the explicit setting of CFLAGS with an
AM_CONDITIONAL to have Makefile.am set these instead.
Also fixes a missing #include that was coincidentally obscured
because gcc's -O2 happened to be able to locate it. Setting -O0
revealed the problem.
| -rw-r--r-- | server/Makefile.am | 4 | ||||
| -rw-r--r-- | server/configure.ac | 4 | ||||
| -rw-r--r-- | server/util/sssd-i18n.h | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/server/Makefile.am b/server/Makefile.am index 45f5eec55..bed9060bd 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -18,6 +18,10 @@ AM_CFLAGS = if WANT_AUX_INFO AM_CFLAGS += -aux-info $@.X endif +if HAVE_GCC + AM_CFLAGS += -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith \ + -Wcast-qual -Wcast-align -Wwrite-strings +endif REPLACE_CFLAGS = \ -I $(srcdir)/../replace diff --git a/server/configure.ac b/server/configure.ac index 77f7ec73b..88032766e 100644 --- a/server/configure.ac +++ b/server/configure.ac @@ -26,9 +26,7 @@ AM_GNU_GETTEXT_VERSION([0.17]) m4_pattern_allow([AM_SILENT_RULES]) AM_SILENT_RULES -if test "$ac_cv_prog_gcc" = yes; then - CFLAGS="$CFLAGS -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings" -fi +AM_CONDITIONAL([HAVE_GCC], [test "$ac_cv_prog_gcc" = yes]) AC_CHECK_HEADERS(stdint.h dlfcn.h) AC_CONFIG_HEADER(config.h) diff --git a/server/util/sssd-i18n.h b/server/util/sssd-i18n.h index 74f9bec01..fab1cdd04 100644 --- a/server/util/sssd-i18n.h +++ b/server/util/sssd-i18n.h @@ -1,6 +1,7 @@ #ifndef _SSSD_I18N_H #define _SSSD_I18N_H +#include <locale.h> #include <libintl.h> #define _(STRING) gettext (STRING) #include "config.h" |