From 81760ad897f309e07ba7edc7f6d0ed6a3a71af9b Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 4 Aug 2007 20:20:33 +0000
Subject: merge compat changes from trunk

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1569 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 configure.ac    | 1 +
 src/Makefile.am | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9a1e6c51..89fcb062 100644
--- 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 4083ea55..8fc0f19c 100644
--- 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
-- 
cgit