kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 16:33:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

menuselect: Add DragonFly BSD.

Browse Source 
In DragonFly BSD, added libraries from ports are placed into /usr/local.
Therefore, this directory must be added for the preprocessor, compiler, and
linker.

Beside that, the script ./configure was updated:
* OSARCH list was outdated and not used, removed.
* AC_CANONICAL_BUILD was not used.
* _REENTRANT, this feature test macro is obsolete.

ASTERISK-27820

Change-Id: I186d88d99cfa4de6569888e12ac97bd2f441c422
This commit is contained in:
Alexander Traud
2018-04-20 12:40:21 +02:00
parent a9c74fdc04
commit d54637373a
4 changed files with 26 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
menuselect/Makefile
View File

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

4
menuselect/autoconfig.h.in
View File

@@ -3,10 +3,6 @@
#ifndef MENUSELECT_AUTOCONFIG_H #ifndef MENUSELECT_AUTOCONFIG_H
#define 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 /* 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. systems. This function is required for `alloca.c' support on those systems.

33
menuselect/configure vendored
View File

@@ -2320,33 +2320,18 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
HOST_OS=${host_os} HOST_OS=${host_os}
PBX_WINARCH=0
case "${host_os}" in 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 esac

40
menuselect/configure.ac
View File

@@ -1,5 +1,3 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59) AC_PREREQ(2.59)
m4_define([MENUSELECT_VERSION], m4_define([MENUSELECT_VERSION],
@@ -16,49 +14,29 @@ AC_CONFIG_HEADER(autoconfig.h)
AC_COPYRIGHT("Menuselect") AC_COPYRIGHT("Menuselect")
AC_CANONICAL_BUILD
AC_CANONICAL_HOST AC_CANONICAL_HOST
HOST_OS=${host_os} HOST_OS=${host_os}
AC_SUBST(HOST_OS) AC_SUBST(HOST_OS)
PBX_WINARCH=0
case "${host_os}" in 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 esac
AH_TOP( AH_TOP(
#ifndef MENUSELECT_AUTOCONFIG_H #ifndef MENUSELECT_AUTOCONFIG_H
#define MENUSELECT_AUTOCONFIG_H #define MENUSELECT_AUTOCONFIG_H
#ifndef _REENTRANT
#define _REENTRANT
#endif
) )
AH_BOTTOM([#endif]) AH_BOTTOM([#endif])