merge compat changes from trunk

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1569 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/configure.ac b/configure.ac
index 9a1e6c51391526ce33dc3af7464a740482637bde..89fcb0627ea49c9a91ceb25525f7e69622829759 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -67,6 +67,7 @@ esac
 # CC
 
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_PROG_GCC_TRADITIONAL
 AC_GNU_SOURCE
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 4083ea55c518bc6124740fff7f76d5207fc77b48..8fc0f19cd28e9d03887743b753afaa226817b29a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1267,12 +1267,12 @@ module_rtp_recv_la_CFLAGS = $(AM_CFLAGS)
 #module_jack_sink_la_SOURCES = modules/module-jack-sink.c
 #module_jack_sink_la_LDFLAGS = -module -avoid-version
 #module_jack_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la $(JACK_LIBS)
-#module_jack_sink_la_CFLAGS = $(AM_LIBADD) $(JACK_CFLAGS)
+#module_jack_sink_la_CFLAGS = $(AM_CFLAGS) $(JACK_CFLAGS)
 
 #module_jack_source_la_SOURCES = modules/module-jack-source.c
 #module_jack_source_la_LDFLAGS = -module -avoid-version
 #module_jack_source_la_LIBADD = $(AM_LIBADD) libpulsecore.la $(JACK_LIBS)
-#module_jack_source_la_CFLAGS = $(AM_LIBADD) $(JACK_CFLAGS)
+#module_jack_source_la_CFLAGS = $(AM_CFLAGS) $(JACK_CFLAGS)
 
 # HAL
 libdbus_util_la_SOURCES = modules/dbus-util.c modules/dbus-util.h