diff options
| author | <rob.taylor@collabora.co.uk> | 2006-08-29 18:58:54 +0000 |
|---|---|---|
| committer | <rob.taylor@collabora.co.uk> | 2006-08-29 18:58:54 +0000 |
| commit | 6b09548401159161ab4e0b85d663be7e5272551d (patch) | |
| tree | 3626b9ee15758ea5d4157491f7cc291bf1ac0a6b | |
| parent | 51e96a5ea429deba116b3ca432b08c20b5447927 (diff) | |
do ERROR_CFLAGS properly
| -rw-r--r-- | configure.ac | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index defa97418..d6a22245a 100644 --- a/configure.ac +++ b/configure.ac @@ -32,17 +32,14 @@ AC_PROG_CC AC_PROG_CC_STDC AM_PROG_AS +dnl decide error flags +AS_COMPILER_FLAG(-Wall, ERROR_CFLAGS="-Wall", ERROR_CFLAGS="") -dnl decide on error flags -AS_COMPILER_FLAG(-Wall, WALL="yes", WALL="no") - -if test "x$WALL" = "xyes"; then - ERROR_CFLAGS="-Wall" - - if test "x$WERROR" = "xyes"; then - AS_COMPILER_FLAG(-Werror,ERROR_CFLAGS="$ERROR_CFLAGS -Werror",ERROR_CFLAGS="$ERROR_CFLAGS") - fi -fi +ifelse(gabble_nano_version, 0, + [], + [AS_COMPILER_FLAG(-Werror,ERROR_CFLAGS="$ERROR_CFLAGS -Werror",ERROR_CFLAGS="$ERROR_CFLAGS") + ]) +AC_SUBST(ERROR_CFLAGS) AC_ARG_ENABLE(debug, AC_HELP_STRING([--disable-debug],[compile without debug code]), @@ -52,8 +49,6 @@ if test x$enable_debug = xyes; then AC_DEFINE(ENABLE_DEBUG, [], [Enable debug code]) fi -AC_SUBST(ERROR_CFLAGS) - AC_HEADER_STDC([]) AC_C_INLINE |