[pulseaudio-commits] r1569 - in /branches/lennart: configure.ac src/Makefile.am

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Sat Aug  4 22:20:33 2007
New Revision: 1569

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1569&root=3Dpulseaudio&vi=
ew=3Drev
Log:
merge compat changes from trunk

Modified:
    branches/lennart/configure.ac
    branches/lennart/src/Makefile.am

Modified: branches/lennart/configure.ac
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/configure.ac?r=
ev=3D1569&root=3Dpulseaudio&r1=3D1568&r2=3D1569&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/configure.ac (original)
+++ branches/lennart/configure.ac Sat Aug  4 22:20:33 2007
@@ -67,6 +67,7 @@
 # CC
 =

 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_PROG_GCC_TRADITIONAL
 AC_GNU_SOURCE
 =


Modified: branches/lennart/src/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/Makefile.a=
m?rev=3D1569&root=3Dpulseaudio&r1=3D1568&r2=3D1569&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/Makefile.am (original)
+++ branches/lennart/src/Makefile.am Sat Aug  4 22:20:33 2007
@@ -1267,12 +1267,12 @@
 #module_jack_sink_la_SOURCES =3D modules/module-jack-sink.c
 #module_jack_sink_la_LDFLAGS =3D -module -avoid-version
 #module_jack_sink_la_LIBADD =3D $(AM_LIBADD) libpulsecore.la $(JACK_LIBS)
-#module_jack_sink_la_CFLAGS =3D $(AM_LIBADD) $(JACK_CFLAGS)
+#module_jack_sink_la_CFLAGS =3D $(AM_CFLAGS) $(JACK_CFLAGS)
 =

 #module_jack_source_la_SOURCES =3D modules/module-jack-source.c
 #module_jack_source_la_LDFLAGS =3D -module -avoid-version
 #module_jack_source_la_LIBADD =3D $(AM_LIBADD) libpulsecore.la $(JACK_LIBS)
-#module_jack_source_la_CFLAGS =3D $(AM_LIBADD) $(JACK_CFLAGS)
+#module_jack_source_la_CFLAGS =3D $(AM_CFLAGS) $(JACK_CFLAGS)
 =

 # HAL
 libdbus_util_la_SOURCES =3D modules/dbus-util.c modules/dbus-util.h