aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-01-05 09:31:11 +0100
committerMax Kellermann <max@duempel.org>2009-01-05 09:31:11 +0100
commit283bca752334726cb57ef22d54fb10d3a702dd88 (patch)
tree062051bbaa5f56f905bd4a7dede38feaf04da129
parent0fb21e67ef763c6a83ab8f5a7ed2aa95efdc4ab2 (diff)
downloadmpd-283bca752334726cb57ef22d54fb10d3a702dd88.tar.gz
mpd-283bca752334726cb57ef22d54fb10d3a702dd88.tar.xz
mpd-283bca752334726cb57ef22d54fb10d3a702dd88.zip
configure.ac: moved build options down
Initialize the CFLAGS (warnings, errors) after all the libraries, because some library checks may be broken with -Werror or -pedantic.
-rw-r--r--configure.ac41
1 files changed, 18 insertions, 23 deletions
diff --git a/configure.ac b/configure.ac
index 4f51e32a5..d63dd414b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,29 +106,6 @@ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.4 gthread-2.0],,
dnl
-dnl build options
-dnl
-
-AC_ARG_ENABLE(werror,
- AS_HELP_STRING([--enable-werror],
- [Treat warnings as errors (default: disabled)]),
- ENABLE_WERROR=$enableval,
- ENABLE_WERROR=no)
-
-AC_ARG_ENABLE(debug,
- AS_HELP_STRING([--enable-debug],
- [Enable debugging (default: disabled)]),
- ENABLE_DEBUG=$enableval,
- ENABLE_DEBUG=no)
-
-AC_ARG_ENABLE(gprof,
- AS_HELP_STRING([--enable-gprof],
- [Enable profiling via gprof (default: disabled)]),
- ENABLE_GPROF=$enableval,
- ENABLE_GPROF=no)
-
-
-dnl
dnl protocol options
dnl
@@ -989,15 +966,33 @@ dnl
dnl build options
dnl
+AC_ARG_ENABLE(werror,
+ AS_HELP_STRING([--enable-werror],
+ [Treat warnings as errors (default: disabled)]),
+ ENABLE_WERROR=$enableval,
+ ENABLE_WERROR=no)
+
if test "x$ENABLE_WERROR" = xyes; then
MPD_CFLAGS="$MPD_CFLAGS -Werror -pedantic-errors"
fi
+AC_ARG_ENABLE(debug,
+ AS_HELP_STRING([--enable-debug],
+ [Enable debugging (default: disabled)]),
+ ENABLE_DEBUG=$enableval,
+ ENABLE_DEBUG=no)
+
#if test "x$ENABLE_DEBUG" = xno; then
# don't set NDEBUG for now, until MPD is stable
#MPD_CFLAGS="$MPD_CFLAGS -DNDEBUG"
#fi
+AC_ARG_ENABLE(gprof,
+ AS_HELP_STRING([--enable-gprof],
+ [Enable profiling via gprof (default: disabled)]),
+ ENABLE_GPROF=$enableval,
+ ENABLE_GPROF=no)
+
if test "x$ENABLE_GPROF" = xyes; then
MPD_CFLAGS="$MPD_CFLAGS -pg"
fi