rtbuf/rtbuf

diff --git a/config.subr b/config.subr
index 8563ae2..e9174a9 100644
--- a/config.subr
+++ b/config.subr
@@ -160,19 +160,21 @@ check_glfw3() {
     echo "HAVE_GLFW3 = $HAVE_GLFW3" >> ${CONFIG_MK}
 }
 
+check_libbsd() {
+    if pkg-config libbsd-overlay; then
+	HAVE_LIBBSD=Yes
+    else
+	HAVE_LIBBSD=No
+    fi
+}
+
 check_portaudio() {
-    LOG=.lib.portaudio.config.log
-    OLD_CFLAGS=$CFLAGS
-    OLD_LIBS=$LIBS
-    CFLAGS="$CFLAGS $(pkg-config --cflags portaudio-2.0)"
-    LIBS="$LIBS $(pkg-config --libs portaudio-2.0)"
-    echo "$CC" $CPPFLAGS $CFLAGS "${LIB_SRCDIR}/portaudio/config.c" -o /dev/null ${LDFLAGS} ${LIBS} > $LOG
-    if   "$CC" $CPPFLAGS $CFLAGS "${LIB_SRCDIR}/portaudio/config.c" -o /dev/null ${LDFLAGS} ${LIBS} >> $LOG 2>&1; then
+    if pkg-config portaudio-2.0; then
+	CFLAGS="$CFLAGS $(pkg-config --cflags portaudio-2.0)"
+	LIBS="$LIBS $(pkg-config --libs portaudio-2.0)"
         HAVE_PORTAUDIO=Yes
     else
         HAVE_PORTAUDIO=No
-        CFLAGS=$OLD_CFLAGS
-        LIBS=$OLD_LIBS
     fi
     echo "Checking library portaudio: $HAVE_PORTAUDIO" >&2
     echo "HAVE_PORTAUDIO = $HAVE_PORTAUDIO" >> ${CONFIG_MK}
diff --git a/lib/configure b/lib/configure
index fbf6705..416df50 100755
--- a/lib/configure
+++ b/lib/configure
@@ -3,6 +3,10 @@ set -e
 
 . ../config.subr
 
+check_libbsd
+check_portaudio
+check_sndio
+
 LIB_SRCDIR="$(dirname $0)"
 
 SOURCES="$(ls *.c | grep -Ev '_type.c$' | tr '\n' ' ')"
@@ -10,7 +14,9 @@ SOURCES="$(ls *.c | grep -Ev '_type.c$' | tr '\n' ' ')"
 DIRS="$(ls -d */)"
 
 CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE -D__USE_MISC"
+if test "x$HAVE_LIBBSD" = "xYes"; then
+    CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE -D__USE_MISC"
+fi
 echo "CPPFLAGS = $CPPFLAGS" >> ${CONFIG_MK}
 
 if [ x"$DEBUG" = x"yes" ]; then
@@ -22,12 +28,10 @@ CFLAGS="$CFLAGS -W -Wall -Werror -std=c89 -pedantic"
 
 LIBS=""
 
-check_sndio
 if ! test "x$HAVE_SNDIO" = "xYes"; then
     DIRS="$(echo "$DIRS" | grep -v sndio)"
 fi
 
-check_portaudio
 if ! test "x$HAVE_PORTAUDIO" = "xYes"; then
     DIRS="$(echo "$DIRS" | grep -v portaudio)"
 fi
diff --git a/lib/portaudio/configure b/lib/portaudio/configure
index 447e4d5..9e686c7 100755
--- a/lib/portaudio/configure
+++ b/lib/portaudio/configure
@@ -18,9 +18,11 @@ else
 fi
 CFLAGS="$CFLAGS -W -Wall -Werror -std=c89 -pedantic"
 
-check_portaudio 
+LIBS=""
+LIBS="$LIBS ../../librtbuf/librtbuf.la"
+LIBS="$LIBS ../librtbuf_signal.la"
 
-LIBS="../../librtbuf/librtbuf.la ../librtbuf_signal.la"
+check_portaudio
 
 echo "CPPFLAGS = $CPPFLAGS" >> ${CONFIG_MK}
 echo "CFLAGS = $CFLAGS" >> ${CONFIG_MK}
diff --git a/librtbuf/configure b/librtbuf/configure
index d053547..8b8227c 100755
--- a/librtbuf/configure
+++ b/librtbuf/configure
@@ -11,9 +11,13 @@ echo "SOURCES = $SOURCES" >> ${CONFIG_MK}
 OBJECTS="$(c2lo "$SOURCES")"
 echo "OBJECTS = $OBJECTS" >> ${CONFIG_MK}
 
+check_libbsd
+
 CPPFLAGS="$CPPFLAGS -DRTBUF_LIBDIR=\\\"${RTBUF_LIBDIR}\\\""
 CPPFLAGS="$CPPFLAGS -DVER=\\\"${VER}\\\""
-CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE -D__USE_MISC"
+if pkg-config libbsd-overlay; then
+    CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE -D__USE_MISC"
+fi
 echo "CPPFLAGS = $CPPFLAGS" >> ${CONFIG_MK}
 
 if [ x"$DEBUG" = x"yes" ]; then