--- configure.in
+++ configure.in
@@ -389,9 +389,5 @@
    AC_DEFINE(USE_PORTAUDIO_V19, 1,
       [Define if PortAudio v19 is being used (instead of v18)])
 
-   BUILDLIBS="$BUILDLIBS portaudio-v19/lib/libportaudio.a"
-   EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio-v19/lib/libportaudio.a"
-   CXXFLAGS="-I\$(top_srcdir)/lib-src/portaudio-v19/include $CXXFLAGS"
-
    AC_CONFIG_SUBDIRS([lib-src/portaudio-v19])
 
@@ -544,5 +540,11 @@
             LIBS="$LIBS -lasound"
          fi
+
+         dnl BUILDLIBS="$BUILDLIBS portaudio-v19/lib/libportaudio.a"
+         dnl EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio-v19/lib/libportaudio.a"
+         dnl CXXFLAGS="-I../lib-src/portaudio-v19/pa_common $CXXFLAGS"
+         LIBS="$LIBS -lportaudio"
+
          PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
          if [[ $have_jack = "yes" ]] ; then
             LIBS="$LIBS $JACK_LIBS"