--- menuselect/Makefile	(Asterisk 13.20)
+++ menuselect/Makefile	(working copy)
@@ -26,2 +26,10 @@
 
+ifneq ($(findstring dragonfly,$(OSARCH)),)
+  CFLAGS += -isystem /usr/local/include
+else ifneq ($(findstring netbsd,$(OSARCH)),)
+  CFLAGS += -isystem /usr/pkg/include
+else ifneq ($(findstring bsd,$(OSARCH)),)
+  CFLAGS += -isystem /usr/local/include
+endif
+
 ifeq ($(MENUSELECT_DEBUG),yes)
--- menuselect/configure.ac	(Asterisk 13.20)
+++ menuselect/configure.ac	(working copy)
@@ -1,3 +1 @@
-# Process this file with autoconf to produce a configure script.
-
 AC_PREREQ(2.59)
@@ -18,3 +16,2 @@
 
-AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
@@ -24,29 +21,14 @@
 
-PBX_WINARCH=0
 case "${host_os}" in
-     freebsd*)
-     OSARCH=FreeBSD
-     ;;
-     netbsd*)
-     OSARCH=NetBSD
-     ;;
-     openbsd*)
-     OSARCH=OpenBSD
-     ;;
-     solaris*)
-     OSARCH=SunOS
-     ;;
-     mingw32)
-     OSARCH=mingw32
-     PBX_WINARCH=1
-     ;;
-     cygwin)
-     OSARCH=cygwin
-     PBX_WINARCH=1
-     ;;
-     linux-gnueabi)
-     OSARCH=linux-gnu
-     ;;
-     *)
-     OSARCH=${host_os}
+     *dragonfly*)
+     CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
+     LDFLAGS="${LDFLAGS} -L/usr/local/lib"
+     ;;
+     *netbsd*)
+     CPPFLAGS="${CPPFLAGS} -I/usr/pkg/include"
+     LDFLAGS="${LDFLAGS} -L/usr/pkg/lib"
+     ;;
+     *bsd*)
+     CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
+     LDFLAGS="${LDFLAGS} -L/usr/local/lib"
      ;;
@@ -57,6 +39,2 @@
 #define MENUSELECT_AUTOCONFIG_H
-
-#ifndef _REENTRANT
-#define _REENTRANT
-#endif
 )