Changeset 1326

Timestamp:

02/02/08 10:54:23 (7 months ago)

Author:

bjornroche

Message:

Normalized whitespace (including tab removal) and semicolon usage in configure.in. (patch 1/5 from Peter Grayson: http://techweb.rfa.org/pipermail/portaudio/2008-January/008180.html)

Location:

portaudio/branches/v19-devel

Files:

• configure (modified) (9 diffs)
• configure.in (modified) (6 diffs)

portaudio/branches/v19-devel/configure

@@ -2006 +2006 @@
 _ACEOF
 
-          fi
+             fi
 
 fi
@@ -19154 +19154 @@
     { { echo "$as_me:$LINENO: error: \"Could not find ar - needed to create a library\"" >&5
 echo "$as_me: error: \"Could not find ar - needed to create a library\"" >&2;}
-   { (exit 1); exit 1; }; };
+   { (exit 1); exit 1; }; }
 fi
 
@@ -21264 +21264 @@
 
 if( echo "${host_os}" | grep ^darwin >> /dev/null ) ; then
-        CFLAGS="-O2 -Wall -pedantic -pipe -fPIC"
-        CXXFLAGS="-O2"
-else
-        CFLAGS=${CFLAGS:-"-g -O2 -Wall -pedantic -pipe -fPIC"}
+   CFLAGS="-O2 -Wall -pedantic -pipe -fPIC"
+   CXXFLAGS="-O2"
+else
+   CFLAGS=${CFLAGS:-"-g -O2 -Wall -pedantic -pipe -fPIC"}
 fi
 
@@ -21279 +21279 @@
   darwin* )
 
-        cat >>confdefs.h <<\_ACEOF
+        cat >>confdefs.h <<\_ACEOF
 #define PA_USE_COREAUDIO 1
 _ACEOF
 
         if [ "$enable_mac_debug" = "yes" ] ; then
-                CFLAGS="$CFLAGS -g";
-                CXXFLAGS="$CXXFLAGS -g";
-        else
-                CFLAGS="$CFLAGS -DNDEBUG";
-        fi
+           CFLAGS="$CFLAGS -g"
+           CXXFLAGS="$CXXFLAGS -g"
+        else
+           CFLAGS="$CFLAGS -DNDEBUG"
+        fi
 
         CFLAGS="$CFLAGS -Werror"
 
-        if [ -d /Developer/SDKs/MacOSX10.5.sdk ] ; then
-                SHARED_FLAGS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -dynamiclib -arch x86_64 -arch ppc64 -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.3";
-                CFLAGS="-std=c99 $CFLAGS -arch x86_64 -arch ppc64 -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.3";
-        else
-                SHARED_FLAGS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -dynamiclib  -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.3";
-                CFLAGS="-std=c99 $CFALGS -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.3";
-        fi
-        OTHER_OBJS="src/os/mac_osx/pa_mac_hostapis.o src/os/unix/pa_unix_util.o src/hostapi/coreaudio/pa_mac_core.o src/hostapi/coreaudio/pa_mac_core_utilities.o src/hostapi/coreaudio/pa_mac_core_blocking.o src/common/pa_ringbuffer.o";
-        LIBS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon";
-        PADLL="libportaudio.dylib";
+        if [ -d /Developer/SDKs/MacOSX10.5.sdk ] ; then
+           SHARED_FLAGS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -dynamiclib -arch x86_64 -arch ppc64 -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.3"
+           CFLAGS="-std=c99 $CFLAGS -arch x86_64 -arch ppc64 -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.3"
+        else
+           SHARED_FLAGS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -dynamiclib  -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.3"
+           CFLAGS="-std=c99 $CFALGS -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.3"
+        fi
+        OTHER_OBJS="src/os/mac_osx/pa_mac_hostapis.o src/os/unix/pa_unix_util.o src/hostapi/coreaudio/pa_mac_core.o src/hostapi/coreaudio/pa_mac_core_utilities.o src/hostapi/coreaudio/pa_mac_core_blocking.o src/common/pa_ringbuffer.o"
+        LIBS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon"
+        PADLL="libportaudio.dylib"
         if [ $with_macapi = "asio" ] ; then
             if [ $with_asiodir ] ; then
-              ASIODIR="$with_asiodir";
+              ASIODIR="$with_asiodir"
             else
-              ASIODIR="/usr/local/asiosdk2";
+              ASIODIR="/usr/local/asiosdk2"
             fi
-            echo "ASIODIR: $ASIODIR";
-
-            OTHER_OBJS="$CFLAGS pa_asio/iasiothiscallresolver.o $ASIODIR/host/asiodrivers.o $ASIODIR/common/asio.o $ASIODIR/host/mac/asioshlib.o";
-            CFLAGS="$CFLAGS -I\$(top_srcdir)/pa_asio -I$ASIDIR/host/mac -I$ASIODIR/common";
-            CXXFLAGS="$CFLAGS";
+            echo "ASIODIR: $ASIODIR"
+
+            OTHER_OBJS="$CFLAGS pa_asio/iasiothiscallresolver.o $ASIODIR/host/asiodrivers.o $ASIODIR/common/asio.o $ASIODIR/host/mac/asioshlib.o"
+            CFLAGS="$CFLAGS -I\$(top_srcdir)/pa_asio -I$ASIDIR/host/mac -I$ASIODIR/common"
+            CXXFLAGS="$CFLAGS"
         fi
-        ;;
+        ;;
 
   mingw* )
@@ -21321 +21321 @@
         if [ $with_winapi = "directx" ] ; then
             if [ $with_dxdir ] ; then
-              DXDIR="$with_dxdir";
+              DXDIR="$with_dxdir"
             else
-              DXDIR="/usr/local/dx7sdk";
+              DXDIR="/usr/local/dx7sdk"
             fi
             echo "DXDIR: $DXDIR"
-            OTHER_OBJS="src/hostapi/dsound/pa_win_ds.o src/hostapi/dsound/pa_win_ds_dynlink.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o";
-            LIBS="-lwinmm -lm -ldsound -lole32";
-            PADLL="portaudio.dll";
-            THREAD_CFLAGS="-mthreads"
-            SHARED_FLAGS="-shared";
-            DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L./dx7sdk/lib -ldsound -lole32";
-            #VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\"";
-            #CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO";
-            CFLAGS="$CFLAGS -I\$(top_srcdir)/include -I$DXDIR/include -DPA_NO_WMME -DPA_NO_ASIO" -DPA_NO_WDMKS;
+            OTHER_OBJS="src/hostapi/dsound/pa_win_ds.o src/hostapi/dsound/pa_win_ds_dynlink.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o"
+            LIBS="-lwinmm -lm -ldsound -lole32"
+            PADLL="portaudio.dll"
+            THREAD_CFLAGS="-mthreads"
+            SHARED_FLAGS="-shared"
+            DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L./dx7sdk/lib -ldsound -lole32"
+            #VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\""
+            #CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO"
+            CFLAGS="$CFLAGS -I\$(top_srcdir)/include -I$DXDIR/include -DPA_NO_WMME -DPA_NO_ASIO" -DPA_NO_WDMKS
         elif [ $with_winapi = "asio" ] ; then
             if [ $with_asiodir ] ; then
-              ASIODIR="$with_asiodir";
+              ASIODIR="$with_asiodir"
             else
-              ASIODIR="/usr/local/asiosdk2";
+              ASIODIR="/usr/local/asiosdk2"
             fi
             echo "ASIODIR: $ASIODIR"
 
-            OTHER_OBJS="pa_asio/pa_asio.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o pa_asio/iasiothiscallresolver.o $ASIODIR/common/asio.o $ASIODIR/host/asiodrivers.o $ASIODIR/host/pc/asiolist.o";
-            LIBS="-lwinmm -lm -lstdc++ -lole32 -luuid";
-            PADLL="portaudio.dll";
-            THREAD_CFLAGS="-mthreads"
-            SHARED_FLAGS="-shared";
-            DLL_LIBS="${DLL_LIBS} -lwinmm -lm -lstdc++ -lole32 -luuid";
-            CFLAGS="$CFLAGS -ffast-math -fomit-frame-pointer -I\$(top_srcdir)/src/common -I\$(top_srcdir)/pa_asio -I$ASIODIR/host/pc -I$ASIODIR/common -I$ASIODIR/host -DPA_NO_WMME -DPA_NO_DS -DPA_NO_WDMKS -DWINDOWS";
-            CXXFLAGS="$CFLAGS";
+            OTHER_OBJS="pa_asio/pa_asio.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o pa_asio/iasiothiscallresolver.o $ASIODIR/common/asio.o $ASIODIR/host/asiodrivers.o $ASIODIR/host/pc/asiolist.o"
+            LIBS="-lwinmm -lm -lstdc++ -lole32 -luuid"
+            PADLL="portaudio.dll"
+            THREAD_CFLAGS="-mthreads"
+            SHARED_FLAGS="-shared"
+            DLL_LIBS="${DLL_LIBS} -lwinmm -lm -lstdc++ -lole32 -luuid"
+            CFLAGS="$CFLAGS -ffast-math -fomit-frame-pointer -I\$(top_srcdir)/src/common -I\$(top_srcdir)/pa_asio -I$ASIODIR/host/pc -I$ASIODIR/common -I$ASIODIR/host -DPA_NO_WMME -DPA_NO_DS -DPA_NO_WDMKS -DWINDOWS"
+            CXXFLAGS="$CFLAGS"
         elif [ $with_winapi = "wdmks" ] ; then
             if [ $with_dxdir ] ; then
-              DXDIR="$with_dxdir";
+              DXDIR="$with_dxdir"
             else
-              DXDIR="/usr/local/dx7sdk";
+              DXDIR="/usr/local/dx7sdk"
             fi
             echo "DXDIR: $DXDIR"
-            OTHER_OBJS="src/hostapi/wdmks/pa_win_wdmks.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o";
-            LIBS="-lwinmm -lm -luuid -lsetupapi -lole32";
-            PADLL="portaudio.dll";
-            THREAD_CFLAGS="-mthreads"
-            SHARED_FLAGS="-shared";
-            DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L./dx7sdk/lib -luuid -lsetupapi -lole32";
-            #VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\"";
-            #CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO";
-            CFLAGS="$CFLAGS -I\$(top_srcdir)/src/common -I$DXDIR/include -DPA_NO_WMME -DPA_NO_DS -DPA_NO_ASIO";
+            OTHER_OBJS="src/hostapi/wdmks/pa_win_wdmks.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o"
+            LIBS="-lwinmm -lm -luuid -lsetupapi -lole32"
+            PADLL="portaudio.dll"
+            THREAD_CFLAGS="-mthreads"
+            SHARED_FLAGS="-shared"
+            DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L./dx7sdk/lib -luuid -lsetupapi -lole32"
+            #VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\""
+            #CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO"
+            CFLAGS="$CFLAGS -I\$(top_srcdir)/src/common -I$DXDIR/include -DPA_NO_WMME -DPA_NO_DS -DPA_NO_ASIO"
         else   # WMME default
-            OTHER_OBJS="src/hostapi/wmme/pa_win_wmme.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o";
-            LIBS="-lwinmm -lm -lstdc++ -lole32 -luuid";
-            PADLL="portaudio.dll";
-            THREAD_CFLAGS="-mthreads"
-            SHARED_FLAGS="-shared";
-            DLL_LIBS="${DLL_LIBS} -lwinmm";
-            CFLAGS="$CFLAGS -I\$(top_srcdir)/src/common -DPA_NO_DS -DPA_NO_ASIO -DPA_NO_WDMKS";
+            OTHER_OBJS="src/hostapi/wmme/pa_win_wmme.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o"
+            LIBS="-lwinmm -lm -lstdc++ -lole32 -luuid"
+            PADLL="portaudio.dll"
+            THREAD_CFLAGS="-mthreads"
+            SHARED_FLAGS="-shared"
+            DLL_LIBS="${DLL_LIBS} -lwinmm"
+            CFLAGS="$CFLAGS -I\$(top_srcdir)/src/common -DPA_NO_DS -DPA_NO_ASIO -DPA_NO_WDMKS"
         fi
         ;;
@@ -21380 +21380 @@
   cygwin* )
 
-        OTHER_OBJS="src/hostapi/wmme/pa_win_wmme.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o";
-        CFLAGS="$CFLAGS -DPA_NO_DS -DPA_NO_WDMKS -DPA_NO_ASIO -DPA_NO_WASAPI"
-        LIBS="-lwinmm -lm";
-        PADLL="portaudio.dll";
-        THREAD_CFLAGS="-mthreads"
-        SHARED_FLAGS="-shared";
-        DLL_LIBS="${DLL_LIBS} -lwinmm";
-        ;;
+        OTHER_OBJS="src/hostapi/wmme/pa_win_wmme.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o"
+        CFLAGS="$CFLAGS -DPA_NO_DS -DPA_NO_WDMKS -DPA_NO_ASIO -DPA_NO_WASAPI"
+        LIBS="-lwinmm -lm"
+        PADLL="portaudio.dll"
+        THREAD_CFLAGS="-mthreads"
+        SHARED_FLAGS="-shared"
+        DLL_LIBS="${DLL_LIBS} -lwinmm"
+        ;;
 
   irix* )
@@ -21616 +21616 @@
 
 
-                                cat >>confdefs.h <<\_ACEOF
+                                cat >>confdefs.h <<\_ACEOF
 #define PA_USE_SGI 1
 _ACEOF
 
 
-                        THREAD_CFLAGS="-D_REENTRANT"
-
-        OTHER_OBJS="pa_sgi/pa_sgi.o src/os/unix/pa_unix_hostapis.o src/os/unix/pa_unix_util.o";
-
-                        LIBS="-lm -ldmedia -laudio -lpthread";
-        PADLL="libportaudio.so";
-        SHARED_FLAGS="";
-        ;;
+                        THREAD_CFLAGS="-D_REENTRANT"
+
+        OTHER_OBJS="pa_sgi/pa_sgi.o src/os/unix/pa_unix_hostapis.o src/os/unix/pa_unix_util.o"
+
+                        LIBS="-lm -ldmedia -laudio -lpthread"
+        PADLL="libportaudio.so"
+        SHARED_FLAGS=""
+        ;;
 
   *)
 
-   { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+        { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
 echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
 if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
@@ -21695 +21695 @@
 if test $ac_cv_lib_pthread_pthread_create = yes; then
   have_pthread="yes"
-
 else
   { { echo "$as_me:$LINENO: error: libpthread not found!" >&5
@@ -21703 +21702 @@
 
 
-        if [ $have_alsa = "yes" ] && [ $with_alsa != "no" ] ; then
-                DLL_LIBS="$DLL_LIBS -lasound"
-                OTHER_OBJS="$OTHER_OBJS src/hostapi/alsa/pa_linux_alsa.o"
-                cat >>confdefs.h <<\_ACEOF
+        if [ $have_alsa = "yes" ] && [ $with_alsa != "no" ] ; then
+           DLL_LIBS="$DLL_LIBS -lasound"
+           OTHER_OBJS="$OTHER_OBJS src/hostapi/alsa/pa_linux_alsa.o"
+           cat >>confdefs.h <<\_ACEOF
 #define PA_USE_ALSA 1
 _ACEOF
 
-        fi
-
-        if [ $have_jack = "yes" ] && [ $with_jack != "no" ] ; then
-                DLL_LIBS="$DLL_LIBS $JACK_LIBS"
-                CFLAGS="$CFLAGS $JACK_CFLAGS"
-                OTHER_OBJS="$OTHER_OBJS src/hostapi/jack/pa_jack.o src/common/pa_ringbuffer.o"
-                cat >>confdefs.h <<\_ACEOF
+        fi
+
+        if [ $have_jack = "yes" ] && [ $with_jack != "no" ] ; then
+           DLL_LIBS="$DLL_LIBS $JACK_LIBS"
+           CFLAGS="$CFLAGS $JACK_CFLAGS"
+           OTHER_OBJS="$OTHER_OBJS src/hostapi/jack/pa_jack.o src/common/pa_ringbuffer.o"
+           cat >>confdefs.h <<\_ACEOF
 #define PA_USE_JACK 1
 _ACEOF
 
-        fi
-
-        if [ $with_oss != "no" ] ; then
-                OTHER_OBJS="$OTHER_OBJS src/hostapi/oss/pa_unix_oss.o"
-                cat >>confdefs.h <<\_ACEOF
+        fi
+
+        if [ $with_oss != "no" ] ; then
+           OTHER_OBJS="$OTHER_OBJS src/hostapi/oss/pa_unix_oss.o"
+           cat >>confdefs.h <<\_ACEOF
 #define PA_USE_OSS 1
 _ACEOF
 
-        fi
-
-        if [ $have_asihpi = "yes" ] && [ $with_asihpi != "no" ] ; then
-                LIBS="$LIBS -lhpi"
-                DLL_LIBS="$DLL_LIBS -lhpi"
-                OTHER_OBJS="$OTHER_OBJS src/hostapi/asihpi/pa_linux_asihpi.o"
-                cat >>confdefs.h <<\_ACEOF
+        fi
+
+        if [ $have_asihpi = "yes" ] && [ $with_asihpi != "no" ] ; then
+           LIBS="$LIBS -lhpi"
+           DLL_LIBS="$DLL_LIBS -lhpi"
+           OTHER_OBJS="$OTHER_OBJS src/hostapi/asihpi/pa_linux_asihpi.o"
+           cat >>confdefs.h <<\_ACEOF
 #define PA_USE_ASIHPI 1
 _ACEOF
 
-        fi
-
-        THREAD_CFLAGS="-pthread"
-        DLL_LIBS="$DLL_LIBS -lm -lpthread";
-        LIBS="$LIBS -lm -lpthread";
-        PADLL="libportaudio.so";
-        SHARED_FLAGS="-shared -fPIC";
+        fi
+
+        THREAD_CFLAGS="-pthread"
+        DLL_LIBS="$DLL_LIBS -lm -lpthread"
+        LIBS="$LIBS -lm -lpthread"
+        PADLL="libportaudio.so"
+        SHARED_FLAGS="-shared -fPIC"
 
         OTHER_OBJS="$OTHER_OBJS src/os/unix/pa_unix_hostapis.o src/os/unix/pa_unix_util.o"

portaudio/branches/v19-devel/configure.in

@@ -1 @@
-        dnl
+dnl
 dnl portaudio V19 configure.in script
 dnl
@@ -52 +52 @@
 
 AC_ARG_ENABLE(debug-output,
-        [  --enable-debug-output],
-        [if test x$enableval != xno ; then
-             AC_DEFINE(PA_ENABLE_DEBUG_OUTPUT,,[Enable debugging messages])
-          fi
-        ])
+            [  --enable-debug-output],
+            [if test x$enableval != xno ; then
+                AC_DEFINE(PA_ENABLE_DEBUG_OUTPUT,,[Enable debugging messages])
+             fi
+            ])
 
 AC_ARG_ENABLE(cxx,
-              [  --enable-cxx (default=no)],
-              enable_cxx=$enableval, enable_cxx="no")
+            [  --enable-cxx (default=no)],
+            enable_cxx=$enableval, enable_cxx="no")
 
 AC_ARG_ENABLE(mac-debug,
-              [  --enable-mac-debug (default=no)],
-              enable_mac_debug=$enableval, enable_mac_debug="no")
+            [  --enable-mac-debug (default=no)],
+            enable_mac_debug=$enableval, enable_mac_debug="no")
 
 dnl Checks for programs.
@@ -75 +75 @@
 AC_PATH_PROG(AR, ar, no)
 if [[ $AR = "no" ]] ; then
-    AC_MSG_ERROR("Could not find ar - needed to create a library");
+    AC_MSG_ERROR("Could not find ar - needed to create a library")
 fi
 
@@ -133 +133 @@
 dnl -g is optional on darwin
 if( echo "${host_os}" | grep ^darwin >> /dev/null ) ; then
-        CFLAGS="-O2 -Wall -pedantic -pipe -fPIC"
-        CXXFLAGS="-O2"
+   CFLAGS="-O2 -Wall -pedantic -pipe -fPIC"
+   CXXFLAGS="-O2"
 else
-        CFLAGS=${CFLAGS:-"-g -O2 -Wall -pedantic -pipe -fPIC"}
+   CFLAGS=${CFLAGS:-"-g -O2 -Wall -pedantic -pipe -fPIC"}
 fi
 
@@ -147 +147 @@
 case "${host_os}" in
   darwin* )
-        dnl Mac OS X configuration
-
-        AC_DEFINE(PA_USE_COREAUDIO)
+        dnl Mac OS X configuration
+
+        AC_DEFINE(PA_USE_COREAUDIO)
         if [[ "$enable_mac_debug" = "yes" ]] ; then
-                CFLAGS="$CFLAGS -g";
-                CXXFLAGS="$CXXFLAGS -g";
-        else
-                CFLAGS="$CFLAGS -DNDEBUG";
-        fi
+           CFLAGS="$CFLAGS -g"
+           CXXFLAGS="$CXXFLAGS -g"
+        else
+           CFLAGS="$CFLAGS -DNDEBUG"
+        fi
 
         CFLAGS="$CFLAGS -Werror"
 
-        if [[ -d /Developer/SDKs/MacOSX10.5.sdk ]] ; then
-                SHARED_FLAGS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -dynamiclib -arch x86_64 -arch ppc64 -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.3";
-                CFLAGS="-std=c99 $CFLAGS -arch x86_64 -arch ppc64 -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.3";
-        else
-                SHARED_FLAGS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -dynamiclib  -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.3";
-                CFLAGS="-std=c99 $CFALGS -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.3";
-        fi
-        OTHER_OBJS="src/os/mac_osx/pa_mac_hostapis.o src/os/unix/pa_unix_util.o src/hostapi/coreaudio/pa_mac_core.o src/hostapi/coreaudio/pa_mac_core_utilities.o src/hostapi/coreaudio/pa_mac_core_blocking.o src/common/pa_ringbuffer.o";
-        LIBS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon";
-        PADLL="libportaudio.dylib";
+        if [[ -d /Developer/SDKs/MacOSX10.5.sdk ]] ; then
+           SHARED_FLAGS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -dynamiclib -arch x86_64 -arch ppc64 -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.3"
+           CFLAGS="-std=c99 $CFLAGS -arch x86_64 -arch ppc64 -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.3"
+        else
+           SHARED_FLAGS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -dynamiclib  -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.3"
+           CFLAGS="-std=c99 $CFALGS -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.3"
+        fi
+        OTHER_OBJS="src/os/mac_osx/pa_mac_hostapis.o src/os/unix/pa_unix_util.o src/hostapi/coreaudio/pa_mac_core.o src/hostapi/coreaudio/pa_mac_core_utilities.o src/hostapi/coreaudio/pa_mac_core_blocking.o src/common/pa_ringbuffer.o"
+        LIBS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon"
+        PADLL="libportaudio.dylib"
         if [[ $with_macapi = "asio" ]] ; then
             if [[ $with_asiodir ]] ; then
-              ASIODIR="$with_asiodir";
+              ASIODIR="$with_asiodir"
             else
-              ASIODIR="/usr/local/asiosdk2";
+              ASIODIR="/usr/local/asiosdk2"
             fi
-            echo "ASIODIR: $ASIODIR";
-
-            OTHER_OBJS="$CFLAGS pa_asio/iasiothiscallresolver.o $ASIODIR/host/asiodrivers.o $ASIODIR/common/asio.o $ASIODIR/host/mac/asioshlib.o";
-            CFLAGS="$CFLAGS -I\$(top_srcdir)/pa_asio -I$ASIDIR/host/mac -I$ASIODIR/common";
-            CXXFLAGS="$CFLAGS";
-        fi
-        ;;
+            echo "ASIODIR: $ASIODIR"
+
+            OTHER_OBJS="$CFLAGS pa_asio/iasiothiscallresolver.o $ASIODIR/host/asiodrivers.o $ASIODIR/common/asio.o $ASIODIR/host/mac/asioshlib.o"
+            CFLAGS="$CFLAGS -I\$(top_srcdir)/pa_asio -I$ASIDIR/host/mac -I$ASIODIR/common"
+            CXXFLAGS="$CFLAGS"
+        fi
+        ;;
 
   mingw* )
@@ -189 +189 @@
         if [[ $with_winapi = "directx" ]] ; then
             if [[ $with_dxdir ]] ; then
-              DXDIR="$with_dxdir";
+              DXDIR="$with_dxdir"
             else
-              DXDIR="/usr/local/dx7sdk";
+              DXDIR="/usr/local/dx7sdk"
             fi
             echo "DXDIR: $DXDIR"
-            OTHER_OBJS="src/hostapi/dsound/pa_win_ds.o src/hostapi/dsound/pa_win_ds_dynlink.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o";
-            LIBS="-lwinmm -lm -ldsound -lole32";
-            PADLL="portaudio.dll";
-            THREAD_CFLAGS="-mthreads"
-            SHARED_FLAGS="-shared";
-            DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L./dx7sdk/lib -ldsound -lole32";
-            #VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\"";
-            #CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO";
-            CFLAGS="$CFLAGS -I\$(top_srcdir)/include -I$DXDIR/include -DPA_NO_WMME -DPA_NO_ASIO" -DPA_NO_WDMKS;
+            OTHER_OBJS="src/hostapi/dsound/pa_win_ds.o src/hostapi/dsound/pa_win_ds_dynlink.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o"
+            LIBS="-lwinmm -lm -ldsound -lole32"
+            PADLL="portaudio.dll"
+            THREAD_CFLAGS="-mthreads"
+            SHARED_FLAGS="-shared"
+            DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L./dx7sdk/lib -ldsound -lole32"
+            #VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\""
+            #CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO"
+            CFLAGS="$CFLAGS -I\$(top_srcdir)/include -I$DXDIR/include -DPA_NO_WMME -DPA_NO_ASIO" -DPA_NO_WDMKS
         elif [[ $with_winapi = "asio" ]] ; then
             if [[ $with_asiodir ]] ; then
-              ASIODIR="$with_asiodir";
+              ASIODIR="$with_asiodir"
             else
-              ASIODIR="/usr/local/asiosdk2";
+              ASIODIR="/usr/local/asiosdk2"
             fi
             echo "ASIODIR: $ASIODIR"
 
-            OTHER_OBJS="pa_asio/pa_asio.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o pa_asio/iasiothiscallresolver.o $ASIODIR/common/asio.o $ASIODIR/host/asiodrivers.o $ASIODIR/host/pc/asiolist.o";
-            LIBS="-lwinmm -lm -lstdc++ -lole32 -luuid";
-            PADLL="portaudio.dll";
-            THREAD_CFLAGS="-mthreads"
-            SHARED_FLAGS="-shared";
-            DLL_LIBS="${DLL_LIBS} -lwinmm -lm -lstdc++ -lole32 -luuid";
-            CFLAGS="$CFLAGS -ffast-math -fomit-frame-pointer -I\$(top_srcdir)/src/common -I\$(top_srcdir)/pa_asio -I$ASIODIR/host/pc -I$ASIODIR/common -I$ASIODIR/host -DPA_NO_WMME -DPA_NO_DS -DPA_NO_WDMKS -DWINDOWS";
-            CXXFLAGS="$CFLAGS";
+            OTHER_OBJS="pa_asio/pa_asio.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o pa_asio/iasiothiscallresolver.o $ASIODIR/common/asio.o $ASIODIR/host/asiodrivers.o $ASIODIR/host/pc/asiolist.o"
+            LIBS="-lwinmm -lm -lstdc++ -lole32 -luuid"
+            PADLL="portaudio.dll"
+            THREAD_CFLAGS="-mthreads"
+            SHARED_FLAGS="-shared"
+            DLL_LIBS="${DLL_LIBS} -lwinmm -lm -lstdc++ -lole32 -luuid"
+            CFLAGS="$CFLAGS -ffast-math -fomit-frame-pointer -I\$(top_srcdir)/src/common -I\$(top_srcdir)/pa_asio -I$ASIODIR/host/pc -I$ASIODIR/common -I$ASIODIR/host -DPA_NO_WMME -DPA_NO_DS -DPA_NO_WDMKS -DWINDOWS"
+            CXXFLAGS="$CFLAGS"
         elif [[ $with_winapi = "wdmks" ]] ; then
             if [[ $with_dxdir ]] ; then
-              DXDIR="$with_dxdir";
+              DXDIR="$with_dxdir"
             else
-              DXDIR="/usr/local/dx7sdk";
+              DXDIR="/usr/local/dx7sdk"
             fi
             echo "DXDIR: $DXDIR"
-            OTHER_OBJS="src/hostapi/wdmks/pa_win_wdmks.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o";
-            LIBS="-lwinmm -lm -luuid -lsetupapi -lole32";
-            PADLL="portaudio.dll";
-            THREAD_CFLAGS="-mthreads"
-            SHARED_FLAGS="-shared";
-            DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L./dx7sdk/lib -luuid -lsetupapi -lole32";
-            #VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\"";
-            #CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO";
-            CFLAGS="$CFLAGS -I\$(top_srcdir)/src/common -I$DXDIR/include -DPA_NO_WMME -DPA_NO_DS -DPA_NO_ASIO";
+            OTHER_OBJS="src/hostapi/wdmks/pa_win_wdmks.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o"
+            LIBS="-lwinmm -lm -luuid -lsetupapi -lole32"
+            PADLL="portaudio.dll"
+            THREAD_CFLAGS="-mthreads"
+            SHARED_FLAGS="-shared"
+            DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L./dx7sdk/lib -luuid -lsetupapi -lole32"
+            #VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\""
+            #CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO"
+            CFLAGS="$CFLAGS -I\$(top_srcdir)/src/common -I$DXDIR/include -DPA_NO_WMME -DPA_NO_DS -DPA_NO_ASIO"
         else   # WMME default
-            OTHER_OBJS="src/hostapi/wmme/pa_win_wmme.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o";
-            LIBS="-lwinmm -lm -lstdc++ -lole32 -luuid";
-            PADLL="portaudio.dll";
-            THREAD_CFLAGS="-mthreads"
-            SHARED_FLAGS="-shared";
-            DLL_LIBS="${DLL_LIBS} -lwinmm";
-            CFLAGS="$CFLAGS -I\$(top_srcdir)/src/common -DPA_NO_DS -DPA_NO_ASIO -DPA_NO_WDMKS";
+            OTHER_OBJS="src/hostapi/wmme/pa_win_wmme.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o"
+            LIBS="-lwinmm -lm -lstdc++ -lole32 -luuid"
+            PADLL="portaudio.dll"
+            THREAD_CFLAGS="-mthreads"
+            SHARED_FLAGS="-shared"
+            DLL_LIBS="${DLL_LIBS} -lwinmm"
+            CFLAGS="$CFLAGS -I\$(top_srcdir)/src/common -DPA_NO_DS -DPA_NO_ASIO -DPA_NO_WDMKS"
         fi
         ;;
 
   cygwin* )
-        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";
-        CFLAGS="$CFLAGS -DPA_NO_DS -DPA_NO_WDMKS -DPA_NO_ASIO -DPA_NO_WASAPI"
-        LIBS="-lwinmm -lm";
-        PADLL="portaudio.dll";
-        THREAD_CFLAGS="-mthreads"
-        SHARED_FLAGS="-shared";
-        DLL_LIBS="${DLL_LIBS} -lwinmm";
-        ;;
+        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"
+        CFLAGS="$CFLAGS -DPA_NO_DS -DPA_NO_WDMKS -DPA_NO_ASIO -DPA_NO_WASAPI"
+        LIBS="-lwinmm -lm"
+        PADLL="portaudio.dll"
+        THREAD_CFLAGS="-mthreads"
+        SHARED_FLAGS="-shared"
+        DLL_LIBS="${DLL_LIBS} -lwinmm"
+        ;;
 
   irix* )
-        dnl SGI IRIX audio library (AL) configuration (Pieter, oct 2-13, 2003).
-        dnl The 'dmedia' library is n