Merge "menuselect: Add DragonFly BSD." into 13

menuselect/Makefile

@@ -24,6 +24,14 @@ endif
 OBJS:=menuselect.o strcompat.o
 CFLAGS+=-g -D_GNU_SOURCE -Wall
 
+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)
   CFLAGS += -DMENUSELECT_DEBUG
 endif

menuselect/autoconfig.h.in

@@ -3,10 +3,6 @@
 #ifndef MENUSELECT_AUTOCONFIG_H
 #define MENUSELECT_AUTOCONFIG_H
 
-#ifndef _REENTRANT
-#define _REENTRANT
-#endif
-
 
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
    systems. This function is required for `alloca.c' support on those systems.

menuselect/configure

@@ -2320,33 +2320,18 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 HOST_OS=${host_os}
 
 
-PBX_WINARCH=0
 case "${host_os}" in
-     freebsd*)
+     *dragonfly*)
-     OSARCH=FreeBSD
+     CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
+     LDFLAGS="${LDFLAGS} -L/usr/local/lib"
      ;;
-     netbsd*)
+     *netbsd*)
-     OSARCH=NetBSD
+     CPPFLAGS="${CPPFLAGS} -I/usr/pkg/include"
+     LDFLAGS="${LDFLAGS} -L/usr/pkg/lib"
      ;;
-     openbsd*)
+     *bsd*)
-     OSARCH=OpenBSD
+     CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
-     ;;
+     LDFLAGS="${LDFLAGS} -L/usr/local/lib"
-     solaris*)
-     OSARCH=SunOS
-     ;;
-     mingw32)
-     OSARCH=mingw32
-     PBX_WINARCH=1
-     ;;
-     cygwin)
-     OSARCH=cygwin
-     PBX_WINARCH=1
-     ;;
-     linux-gnueabi)
-     OSARCH=linux-gnu
-     ;;
-     *)
-     OSARCH=${host_os}
      ;;
 esac
 

menuselect/configure.ac

@@ -1,5 +1,3 @@
-# Process this file with autoconf to produce a configure script.
-
 AC_PREREQ(2.59)
 
 m4_define([MENUSELECT_VERSION],
@@ -16,49 +14,29 @@ AC_CONFIG_HEADER(autoconfig.h)
 
 AC_COPYRIGHT("Menuselect")
 
-AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 
 HOST_OS=${host_os}
 AC_SUBST(HOST_OS)
 
-PBX_WINARCH=0
 case "${host_os}" in
-     freebsd*)
+     *dragonfly*)
-     OSARCH=FreeBSD
+     CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
-     ;;
+     LDFLAGS="${LDFLAGS} -L/usr/local/lib"
-     netbsd*)
-     OSARCH=NetBSD
-     ;;
-     openbsd*)
-     OSARCH=OpenBSD
-     ;;
-     solaris*)
-     OSARCH=SunOS
      ;;
-     mingw32)
+     *netbsd*)
-     OSARCH=mingw32
+     CPPFLAGS="${CPPFLAGS} -I/usr/pkg/include"
-     PBX_WINARCH=1
+     LDFLAGS="${LDFLAGS} -L/usr/pkg/lib"
      ;;
-     cygwin)
+     *bsd*)
-     OSARCH=cygwin
+     CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
-     PBX_WINARCH=1
+     LDFLAGS="${LDFLAGS} -L/usr/local/lib"
-     ;;
-     linux-gnueabi)
-     OSARCH=linux-gnu
-     ;;
-     *)
-     OSARCH=${host_os}
      ;;
 esac
 
 AH_TOP(
 #ifndef MENUSELECT_AUTOCONFIG_H
 #define MENUSELECT_AUTOCONFIG_H
-
-#ifndef _REENTRANT
-#define _REENTRANT
-#endif
 )
 
 AH_BOTTOM([#endif])