Applied patches for Debian Linux for ticket 166.

diff --git a/Makefile.in b/Makefile.in
index c7944d537d2b663f0739021c5ab2ddb5991fa3f1..863e18b5cdad73abcac84a67f7b726813b8417c1 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -38,12 +38,13 @@ LT_REVISION=@LT_REVISION@
 LT_AGE=@LT_AGE@
 
 OTHER_OBJS = @OTHER_OBJS@
+INCLUDES = @INCLUDES@
 
 PALIB = libportaudio.la
 PAINC = include/portaudio.h
 
 PA_LDFLAGS = $(LDFLAGS) $(SHARED_FLAGS) -rpath $(libdir) -no-undefined \
-            -export-symbols-regex "(Pa|PaMacCore|PaJack|PaAlsa|PaAsio)_.*" \
+            -export-symbols-regex "(Pa|PaMacCore|PaJack|PaAlsa|PaAsio|PaOSS)_.*" \
             -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 COMMON_OBJS = \
@@ -171,7 +172,9 @@ install: lib/$(PALIB) portaudio-2.0.pc
        $(INSTALL) -d $(DESTDIR)$(libdir)
        $(LIBTOOL) --mode=install $(INSTALL) lib/$(PALIB) $(DESTDIR)$(libdir)
        $(INSTALL) -d $(DESTDIR)$(includedir)
-       $(INSTALL_DATA) -m 644 $(top_srcdir)/$(PAINC) $(DESTDIR)$(includedir)/portaudio.h
+       for include in $(INCLUDES); do \
+               $(INSTALL_DATA) -m 644 $(top_srcdir)/include/$$include $(DESTDIR)$(includedir)/$$include; \
+       done
        $(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
        $(INSTALL) -m 644 portaudio-2.0.pc $(DESTDIR)$(libdir)/pkgconfig/portaudio-2.0.pc
        @echo ""

diff --git a/bindings/cpp/bin/Makefile.am b/bindings/cpp/bin/Makefile.am
index 5f97f9445a9f0994f56fbd5549fdaeb05235683f..dcf3735eb9e24f59207491094a96c9960f8a0f5f 100644 (file)
--- a/bindings/cpp/bin/Makefile.am
+++ b/bindings/cpp/bin/Makefile.am
@@ -3,7 +3,7 @@ LIBDIR = $(top_builddir)/lib
 
 noinst_PROGRAMS = devs sine
 
-LDADD = $(LIBDIR)/libportaudiocpp.la
+LDADD = $(LIBDIR)/libportaudiocpp.la $(top_builddir)/$(PORTAUDIO_ROOT)/lib/libportaudio.la
 
 devs_SOURCES = $(BINDIR)/devs.cxx
 sine_SOURCES = $(BINDIR)/sine.cxx

diff --git a/configure.in b/configure.in
index c71e630d6ff0695b09fdafb9160f95d2b6f2b4df..fe05bc22ba0489c915e2825dbeeeb00477a1d874 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -165,6 +165,7 @@ AC_SUBST(DLL_LIBS)
 AC_SUBST(CXXFLAGS)
 AC_SUBST(NASM)
 AC_SUBST(NASMOPT)
+AC_SUBST(INCLUDES)
 
 dnl -g is optional on darwin
 if ( echo "${host_os}" | grep ^darwin >> /dev/null ) &&
@@ -188,6 +189,8 @@ add_objects()
     done
 }
 
+INCLUDES=portaudio.h
+
 case "${host_os}" in
   darwin* )
         dnl Mac OS X configuration
@@ -317,6 +320,7 @@ case "${host_os}" in
            DLL_LIBS="$DLL_LIBS -lasound"
            LIBS="$LIBS -lasound"
            OTHER_OBJS="$OTHER_OBJS src/hostapi/alsa/pa_linux_alsa.o"
+           INCLUDES="$INCLUDES pa_linux_alsa.h"
            AC_DEFINE(PA_USE_ALSA)
         fi
 
@@ -324,6 +328,7 @@ case "${host_os}" in
            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"
+           INCLUDES="$INCLUDES pa_jack.h"
            AC_DEFINE(PA_USE_JACK)
         fi
 
@@ -332,7 +337,8 @@ case "${host_os}" in
            if [[ "$have_libossaudio" = "yes" ]] ; then
                    DLL_LIBS="$DLL_LIBS -lossaudio"
                    LIBS="$LIBS -lossaudio"
-           fi      
+           fi
+           INCLUDES="$INCLUDES pa_unix_oss.h"
            AC_DEFINE(PA_USE_OSS)
         fi