aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-09-16 07:34:52 +0200
committerMax Kellermann <max@duempel.org>2011-09-16 07:35:46 +0200
commitd8c829fa0ce155ffe22a697250f66b741fc29f09 (patch)
tree33c1022b06551e45a33a7ea54958bc74f41a9851
parent2ed870c8546ce4654f956beea60546260d98a85c (diff)
downloadmpd-d8c829fa0ce155ffe22a697250f66b741fc29f09.tar.gz
mpd-d8c829fa0ce155ffe22a697250f66b741fc29f09.tar.xz
mpd-d8c829fa0ce155ffe22a697250f66b741fc29f09.zip
configure.ac: pass AM_CXXFLAGS, AM_CPPFLAGS to Makefile.am
Diffstat (limited to '')
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac2
2 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index b3620bdeb..5e6747e6d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = foreign 1.10 dist-bzip2 subdir-objects
-AM_CPPFLAGS = -I$(srcdir)/src $(GLIB_CFLAGS)
+AM_CPPFLAGS += -I$(srcdir)/src $(GLIB_CFLAGS)
AM_CPPFLAGS += -DSYSTEM_CONFIG_FILE_LOCATION='"$(sysconfdir)/mpd.conf"'
diff --git a/configure.ac b/configure.ac
index 559284332..24b9a857d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,9 @@ PKG_PROG_PKG_CONFIG
dnl ---------------------------------------------------------------------------
dnl Declare Variables
dnl ---------------------------------------------------------------------------
+AC_SUBST(AM_CPPFLAGS,"")
AC_SUBST(AM_CFLAGS,"")
+AC_SUBST(AM_CXXFLAGS,"")
AC_SUBST(MPD_LIBS)
AC_SUBST(MPD_CFLAGS)