Index: Makefile.in =================================================================== RCS file: /home/cvs/portaudio/Makefile.in,v retrieving revision 1.4.2.22 diff -u -b -B -w -p -r1.4.2.22 Makefile.in --- Makefile.in 9 Nov 2005 23:13:03 -0000 1.4.2.22 +++ Makefile.in 12 Mar 2006 20:51:18 -0000 @@ -139,13 +139,15 @@ lib/$(PADLLV): lib/ $(OBJS) Makefile $(P $(TESTS): bin/%: lib/$(PALIB) Makefile $(PAINC) pa_tests/%.c $(CC) -o $@ $(CFLAGS) pa_tests/$*.c lib/$(PALIB) $(LIBS) -install: lib/$(PALIB) lib/$(PADLLV) +install: lib/$(PALIB) lib/$(PADLLV) portaudio.pc $(INSTALL) -d $(PREFIX)/lib $(INSTALL) -m 644 lib/$(PADLLV) $(PREFIX)/lib/$(PADLLV) $(INSTALL) -m 644 lib/$(PALIB) $(PREFIX)/lib/$(PALIB) cd $(PREFIX)/lib && rm -f $(PADLL) && ln -s $(PADLLV) $(PADLL) $(INSTALL) -d $(PREFIX)/include $(INSTALL) -m 644 pa_common/portaudio.h $(PREFIX)/include/portaudio.h + $(INSTALL) -d $(PREFIX)/lib/pkgconfig + $(INSTALL) -m 644 portaudio.pc $(PREFIX)/lib/pkgconfig/portaudio.pc @echo "" @echo "------------------------------------------------------------" @echo "PortAudio was successfully installed." Index: configure.in =================================================================== RCS file: /home/cvs/portaudio/configure.in,v retrieving revision 1.4.2.25 diff -u -b -B -w -p -r1.4.2.25 configure.in --- configure.in 27 Feb 2006 15:05:04 -0000 1.4.2.25 +++ configure.in 12 Mar 2006 20:51:41 -0000 @@ -89,6 +89,7 @@ dnl extra variables AC_SUBST(OTHER_OBJS) AC_SUBST(PADLL) AC_SUBST(SHARED_FLAGS) +AC_SUBST(THREAD_CFLAGS) AC_SUBST(DLL_LIBS) AC_SUBST(CXXFLAGS) AC_SUBST(NASM) @@ -139,7 +140,8 @@ case "${host_os}" in OTHER_OBJS="pa_win_ds/pa_win_ds.o pa_win_ds/dsound_wrapper.o pa_win/pa_win_hostapis.o pa_win/pa_win_util.o"; LIBS="-lwinmm -lm -ldsound -lole32"; PADLL="portaudio.dll"; - SHARED_FLAGS="-shared -mthreads"; + THREAD_CFLAGS="-mthreads" + SHARED_FLAGS="-shared"; 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"; @@ -155,7 +157,8 @@ case "${host_os}" in OTHER_OBJS="pa_asio/pa_asio.o pa_win/pa_win_hostapis.o pa_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"; - SHARED_FLAGS="-shared -mthreads"; + THREAD_CFLAGS="-mthreads" + SHARED_FLAGS="-shared"; DLL_LIBS="-lwinmm -lm -lstdc++ -lole32 -luuid"; CFLAGS="$CFLAGS -ffast-math -fomit-frame-pointer -Ipa_common -Ipa_asio -I$ASIODIR/host/pc -I$ASIODIR/common -I$ASIODIR/host -DPA_NO_WMME -DPA_NO_DS -DPA_NO_WDMKS -DWINDOWS"; CXXFLAGS="$CFLAGS"; @@ -169,7 +172,8 @@ case "${host_os}" in OTHER_OBJS="pa_win_wdmks/pa_win_wdmks.o pa_win/pa_win_hostapis.o pa_win/pa_win_util.o"; LIBS="-lwinmm -lm -luuid -lsetupapi -lole32"; PADLL="portaudio.dll"; - SHARED_FLAGS="-shared -mthreads"; + THREAD_CFLAGS="-mthreads" + SHARED_FLAGS="-shared"; 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"; @@ -178,7 +182,8 @@ case "${host_os}" in OTHER_OBJS="pa_win_wmme/pa_win_wmme.o pa_win/pa_win_hostapis.o pa_win/pa_win_util.o"; LIBS="-lwinmm -lm -lstdc++ -lole32 -luuid"; PADLL="portaudio.dll"; - SHARED_FLAGS="-shared -mthreads"; + THREAD_CFLAGS="-mthreads" + SHARED_FLAGS="-shared"; DLL_LIBS="-lwinmm"; CFLAGS="$CFLAGS -Ipa_common -DPA_NO_DS -DPA_NO_ASIO -DPA_NO_WDMKS"; fi @@ -190,7 +195,8 @@ case "${host_os}" in OTHER_OBJS="pa_win_wmme/pa_win_wmme.o"; LIBS="-lwinmm -lm"; PADLL="portaudio.dll"; - SHARED_FLAGS="-shared -mthreads"; + THREAD_CFLAGS="-mthreads" + SHARED_FLAGS="-shared"; DLL_LIBS="-lwinmm"; ;; @@ -209,7 +215,7 @@ case "${host_os}" in dnl The _REENTRANT option for pthread safety. Perhaps not necessary but it 'll do no harm. dnl - CFLAGS="$CFLAGS -D_REENTRANT" + THREAD_CFLAGS="-D_REENTRANT" OTHER_OBJS="pa_sgi/pa_sgi.o pa_unix/pa_unix_hostapis.o pa_unix/pa_unix_util.o"; @@ -246,11 +252,13 @@ case "${host_os}" in OTHER_OBJS="$OTHER_OBJS pa_unix_oss/pa_unix_oss.o" AC_DEFINE(PA_USE_OSS) fi + THREAD_CFLAGS="-pthread" LIBS="$LIBS -lm -lpthread"; PADLL="libportaudio.so"; SHARED_FLAGS="-shared -fPIC"; OTHER_OBJS="$OTHER_OBJS pa_unix/pa_unix_hostapis.o pa_unix/pa_unix_util.o" esac +CFLAGS="$CFLAGS $THREAD_CFLAGS" -AC_OUTPUT([Makefile]) +AC_OUTPUT([Makefile portaudio.pc]) --- /dev/null 2006-03-10 00:02:48.821312048 +0100 +++ portaudio.pc.in 2006-03-11 14:49:17.000000000 +0100 @@ -0,0 +1,12 @@ address@hidden@ address@hidden@ address@hidden@ address@hidden@ + +Name: portaudio +Description: Portable audio I/O +Requires: +Version: 19 + +Libs: -L${libdir} -lportaudio @LIBS@ +Cflags: -I${includedir} @THREAD_CFLAGS@