configure.ac: declare AM_CFLAGS
Moved generic compiler options to AM_CFLAGS. MPD_CFLAGS/MPD_LIBS will hopefully fade away one day, in favor of more fine-grained variables.
This commit is contained in:
parent
6fdaa49668
commit
bdb3129f18
@ -6,7 +6,7 @@ AM_LDFLAGS = $(GLIB_LIBS)
|
||||
|
||||
bin_PROGRAMS = src/mpd
|
||||
|
||||
src_mpd_CFLAGS = $(MPD_CFLAGS)
|
||||
src_mpd_CFLAGS = $(AM_CFLAGS) $(MPD_CFLAGS)
|
||||
src_mpd_CPPFLAGS = $(AM_CPPFLAGS) \
|
||||
$(SQLITE_CFLAGS) \
|
||||
$(ID3TAG_CFLAGS) \
|
||||
|
@ -24,6 +24,8 @@ dnl
|
||||
dnl declare variables
|
||||
dnl
|
||||
|
||||
AC_SUBST(AM_CFLAGS,"")
|
||||
|
||||
AC_SUBST(MPD_LIBS)
|
||||
AC_SUBST(MPD_CFLAGS)
|
||||
MPD_LIBS=""
|
||||
@ -1105,7 +1107,7 @@ AC_ARG_ENABLE(werror,
|
||||
ENABLE_WERROR=no)
|
||||
|
||||
if test "x$ENABLE_WERROR" = xyes; then
|
||||
MPD_CFLAGS="$MPD_CFLAGS -Werror -pedantic-errors"
|
||||
AM_CFLAGS="$AM_CFLAGS -Werror -pedantic-errors"
|
||||
fi
|
||||
|
||||
AC_ARG_ENABLE(debug,
|
||||
@ -1116,7 +1118,7 @@ AC_ARG_ENABLE(debug,
|
||||
|
||||
#if test "x$ENABLE_DEBUG" = xno; then
|
||||
# don't set NDEBUG for now, until MPD is stable
|
||||
#MPD_CFLAGS="$MPD_CFLAGS -DNDEBUG"
|
||||
#AM_CFLAGS="$AM_CFLAGS -DNDEBUG"
|
||||
#fi
|
||||
|
||||
AC_ARG_ENABLE(gprof,
|
||||
|
@ -12,7 +12,7 @@ AC_DEFUN([MPD_CHECK_FLAG],[
|
||||
])
|
||||
if eval "test x`echo '$mpd_check_cflag_'$var` = xyes"
|
||||
then
|
||||
MPD_CFLAGS="$MPD_CFLAGS $1"
|
||||
AM_CFLAGS="$AM_CFLAGS $1"
|
||||
fi
|
||||
])
|
||||
])
|
||||
|
Loading…
Reference in New Issue
Block a user