Fixed the configure/make scripts to work on Mac OS X

diff --git a/Makefile.in b/Makefile.in
index 6b47156ec479cd1b0946d3d43a1a38104d779b47..e948d74abf1a9b415ac7903fa4117d2c57fa441e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,19 +4,20 @@
 # Dominic Mazzoni
 #
 
+PREFIX = @prefix@
 CC = @CC@
 CFLAGS = @CFLAGS@ -Ipa_common
 LIBS = @LIBS@
 AR = @AR@
 RANLIB = @RANLIB@
 INSTALL = @INSTALL@
-PREFIX = @prefix@
+SHARED_FLAGS = @SHARED_FLAGS@
 
 OTHER_OBJS = @OTHER_OBJS@
 
 PALIB = libportaudio.a
-PADLL = libportaudio.so
-PADLLV = libportaudio.so.0.0.18
+PADLL = @PADLL@
+PADLLV = $(PADLL).0.0.18
 PAINC = pa_common/portaudio.h
 
 COMMON_OBJS = \
@@ -59,7 +60,7 @@ lib/$(PALIB): lib/ $(OBJS) Makefile $(PAINC)
        $(RANLIB) lib/$(PALIB)
 
 lib/$(PADLLV): lib/ $(OBJS) Makefile $(PAINC)
-       $(CC) -shared -o lib/$(PADLLV) $(OBJS)
+       $(CC) $(SHARED_FLAGS) -o lib/$(PADLLV) $(OBJS)
 
 $(TESTS): bin/%: lib/$(PALIB) Makefile $(PAINC) pa_tests/%.c
        $(CC) -o $@ $(CFLAGS) pa_tests/$*.c lib/$(PALIB) $(LIBS)

diff --git a/configure b/configure
index a06d81d8790a7bb252dd78f6028e5b897e899255..5472eb3342c7f51b24aee1531707683cefa3e4f1 100755 (executable)
Binary files a/configure and b/configure differ

diff --git a/configure.in b/configure.in
index 5abd189c344aa9d4f3e1607a7218d64293ae5b3a..8b3a1e2ea69d770ec1b2d32d1ed3e177e20251d0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -22,7 +22,8 @@ fi
 
 dnl Extra variables we want to substitute
 AC_SUBST(OTHER_OBJS)
-TARGETS="tests"
+AC_SUBST(PADLL)
+AC_SUBST(SHARED_FLAGS)
 
 dnl Determine the host operating system / platform
 AC_CANONICAL_HOST
@@ -32,7 +33,9 @@ case "${host_os}" in
        dnl Mac OS X configuration
 
        OTHER_OBJS="pa_mac_core/pa_mac_core.o";
-       LIBS="-lm";
+       LIBS="-framework CoreAudio -lm";
+       PADLL="libportaudio.dylib";
+       SHARED_FLAGS="-framework CoreAudio -dynamiclib";
        ;;
 
   *)
@@ -44,6 +47,8 @@ case "${host_os}" in
 
        OTHER_OBJS="pa_unix_oss/pa_unix_oss.o";
        LIBS="-lm -lpthread";
+       PADLL="libportaudio.so";
+       SHARED_FLAGS="-shared";
 esac
 
 AC_OUTPUT([Makefile])