configure.ac: pass AM_CXXFLAGS, AM_CPPFLAGS to Makefile.am

d8c829fa · Max Kellermann · 2ed870c8 · d8c829fa · d8c829fa
Commit d8c829fa authored Sep 16, 2011 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

Makefile.am Makefile.am +1 -1

configure.ac configure.ac +2 -0

No files found.
--- a/Makefile.am
+++ b/Makefile.am
 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"'


--- 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)