From a665b0928c7addca7f5f164e2ee764bd4c5f409f Mon Sep 17 00:00:00 2001
From: rossb <rossb@0f58301d-fd10-0410-b4af-bbb618454e57>
Date: Fri, 11 Nov 2011 04:06:17 +0000
Subject: [PATCH] fixed configure.in and makefile.in. attempt #2. fixes
 incorrect escapes in r1772

---
 Makefile.in  |  3 +--
 configure.in | 11 +++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index d7d02f1..5e1a764 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,8 +18,7 @@ libdir = @libdir@
 includedir = @includedir@
 CC = @CC@
 CXX = @CXX@
-# note platform include directories are added to CFLAGS in configure.in
-CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src/common @CFLAGS@ @DEFS@
+CFLAGS = @CFLAGS@ @DEFS@
 LIBS = @LIBS@
 AR = @AR@
 RANLIB = @RANLIB@
diff --git a/configure.in b/configure.in
index 9618090..792cbba 100644
--- a/configure.in
+++ b/configure.in
@@ -195,13 +195,16 @@ add_objects()
 
 INCLUDES=portaudio.h
 
+dnl Include directories needed by all implementations
+CFLAGS="$CFLAGS -I\$(top_srcdir)/include -I\$(top_srcdir)/src/common"
+
 case "${host_os}" in
   darwin* )
         dnl Mac OS X configuration
 
         AC_DEFINE(PA_USE_COREAUDIO,1)
 
-        CFLAGS="$CFLAGS -I$(top_srcdir)/src/os/unix -Werror"
+        CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix -Werror"
         LIBS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon"
 
         if test "x$enable_mac_universal" = "xyes" ; then
@@ -296,7 +299,7 @@ case "${host_os}" in
         dnl Cygwin configuration
 
         OTHER_OBJS="src/hostapi/wmme/pa_win_wmme.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o src/os/win/pa_win_waveformat.o"
-        CFLAGS="$CFLAGS -I$(top_srcdir)/src/os/unix -DPA_USE_DS=0 -DPA_USE_WDMKS=0 -DPA_USE_ASIO=0 -DPA_USE_WASAPI=0 -DPA_USE_WMME=1"
+        CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/win -DPA_USE_DS=0 -DPA_USE_WDMKS=0 -DPA_USE_ASIO=0 -DPA_USE_WASAPI=0 -DPA_USE_WMME=1"
         LIBS="-lwinmm -lm"
         PADLL="portaudio.dll"
         THREAD_CFLAGS="-mthreads"
@@ -317,7 +320,7 @@ case "${host_os}" in
         dnl
         AC_DEFINE(PA_USE_SGI,1)
 
-        CFLAGS="$CFLAGS -I$(top_srcdir)/src/os/unix"
+        CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix"
 
         dnl The _REENTRANT option for pthread safety. Perhaps not necessary but it 'll do no harm.
         dnl
@@ -335,7 +338,7 @@ case "${host_os}" in
   *)
         dnl Unix configuration
 
-        CFLAGS="$CFLAGS -I$(top_srcdir)/src/os/unix"
+        CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix"
         
         AC_CHECK_LIB(pthread, pthread_create,[have_pthread="yes"],
                 AC_MSG_ERROR([libpthread not found!]))
-- 
2.43.0