@@ -1,3 +1,11 @@ +2008-04-30 Michael Dominic K. <mdk@mdk.am> + + * configure.ac: + * moon.pc.in: Don't put the MOON_CFLAGS and MOON_LIBS in the pc file + as it contains some local garbage. Instead, put stripped-down + MOON_EXTRA_CFLAGS and MOON_EXTRA_LIBS. Make it possible to actually + compile against moon.pc. + 2008-04-25 Andrew Jorgensen <ajorgensen@novell.com> * configure.ac: Hack to remove glitz from the link flags ChangeLog @@ -299,6 +299,11 @@ MOON_LIBS="$(echo $MOON_LIBS | sed -e s/-lglitz//g)" AC_SUBST(MOON_CFLAGS) AC_SUBST(MOON_LIBS) +MOON_EXTRA_CFLAGS="$GTK_CFLAGS $ALSA_CFLAGS" +MOON_EXTRA_LIBS="$GTK_LIBS $ALSA_LIBS" +AC_SUBST(MOON_EXTRA_CFLAGS) +AC_SUBST(MOON_EXTRA_LIBS) + MOON_PROG_CFLAGS="$GTK_CFLAGS $ALSA_CFLAGS -I\$(top_builddir)/src/" MOON_PROG_LIBS="$GTK_LIBS $ALSA_LIBS \$(top_builddir)/src/libmoon.la" AC_SUBST(MOON_PROG_CFLAGS) configure.ac @@ -7,5 +7,5 @@ Name: Moon Description: Moon Version: @VERSION@ Requires: glib-2.0 gthread-2.0 -Libs: -L${libdir} -lmoon @MOON_LIBS@ -Cflags: -I${includedir} @MOON_CFLAGS@ +Libs: -L${libdir} -lmoon @MOON_EXTRA_LIBS@ +Cflags: -I${includedir} @MOON_EXTRA_CFLAGS@ moon.pc.in abf74b35575e50fc09eb420bf55f37cc805f68f8 mdk mdk@e3ebcda4-bce8-0310-ba0a-eca2169e7518 http://github.com/myabc/moonlight/commit/fd847db52a261140ab15e462d58c22c4516a455f fd847db52a261140ab15e462d58c22c4516a455f 2008-04-30T07:51:33-07:00 2008-04-30T07:51:33-07:00 2008-04-30 Michael Dominic K. <mdk@mdk.am> * configure.ac: * moon.pc.in: Don't put the MOON_CFLAGS and MOON_LIBS in the pc file as it contains some local garbage. Instead, put stripped-down MOON_EXTRA_CFLAGS and MOON_EXTRA_LIBS. Make it possible to actually compile against moon.pc. git-svn-id: svn://anonsvn.mono-project.com/source/trunk/moon@102206 e3ebcda4-bce8-0310-ba0a-eca2169e7518 33458cd4b4a1feb136027a1ceef9dc035c85bcf8 mdk mdk@e3ebcda4-bce8-0310-ba0a-eca2169e7518