<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/8839">View Change</a></p><div style="white-space:pre-wrap">Approvals:
George Joseph: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">menuselect: Add DragonFly BSD.<br><br>In DragonFly BSD, added libraries from ports are placed into /usr/local.<br>Therefore, this directory must be added for the preprocessor, compiler, and<br>linker.<br><br>Beside that, the script ./configure was updated:<br>* OSARCH list was outdated and not used, removed.<br>* AC_CANONICAL_BUILD was not used.<br>* _REENTRANT, this feature test macro is obsolete.<br><br>ASTERISK-27820<br><br>Change-Id: I186d88d99cfa4de6569888e12ac97bd2f441c422<br>---<br>M menuselect/Makefile<br>M menuselect/autoconfig.h.in<br>M menuselect/configure<br>M menuselect/configure.ac<br>4 files changed, 26 insertions(+), 59 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/menuselect/Makefile b/menuselect/Makefile<br>index c2c9373..d949efd 100644<br>--- a/menuselect/Makefile<br>+++ b/menuselect/Makefile<br>@@ -24,6 +24,14 @@<br> OBJS:=menuselect.o strcompat.o<br> CFLAGS+=-g -D_GNU_SOURCE -Wall<br> <br>+ifneq ($(findstring dragonfly,$(OSARCH)),)<br>+ CFLAGS += -isystem /usr/local/include<br>+else ifneq ($(findstring netbsd,$(OSARCH)),)<br>+ CFLAGS += -isystem /usr/pkg/include<br>+else ifneq ($(findstring bsd,$(OSARCH)),)<br>+ CFLAGS += -isystem /usr/local/include<br>+endif<br>+<br> ifeq ($(MENUSELECT_DEBUG),yes)<br> CFLAGS += -DMENUSELECT_DEBUG<br> endif<br>diff --git a/menuselect/autoconfig.h.in b/menuselect/autoconfig.h.in<br>index 3e1e189..f174551 100644<br>--- a/menuselect/autoconfig.h.in<br>+++ b/menuselect/autoconfig.h.in<br>@@ -3,10 +3,6 @@<br> #ifndef MENUSELECT_AUTOCONFIG_H<br> #define MENUSELECT_AUTOCONFIG_H<br> <br>-#ifndef _REENTRANT<br>-#define _REENTRANT<br>-#endif<br>-<br> <br> /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP<br> systems. This function is required for `alloca.c' support on those systems.<br>diff --git a/menuselect/configure b/menuselect/configure<br>index a0aa109..7cbe477 100755<br>--- a/menuselect/configure<br>+++ b/menuselect/configure<br>@@ -2320,33 +2320,18 @@<br> HOST_OS=${host_os}<br> <br> <br>-PBX_WINARCH=0<br> case "${host_os}" in<br>- freebsd*)<br>- OSARCH=FreeBSD<br>+ *dragonfly*)<br>+ CPPFLAGS="${CPPFLAGS} -I/usr/local/include"<br>+ LDFLAGS="${LDFLAGS} -L/usr/local/lib"<br> ;;<br>- netbsd*)<br>- OSARCH=NetBSD<br>+ *netbsd*)<br>+ CPPFLAGS="${CPPFLAGS} -I/usr/pkg/include"<br>+ LDFLAGS="${LDFLAGS} -L/usr/pkg/lib"<br> ;;<br>- openbsd*)<br>- OSARCH=OpenBSD<br>- ;;<br>- solaris*)<br>- OSARCH=SunOS<br>- ;;<br>- mingw32)<br>- OSARCH=mingw32<br>- PBX_WINARCH=1<br>- ;;<br>- cygwin)<br>- OSARCH=cygwin<br>- PBX_WINARCH=1<br>- ;;<br>- linux-gnueabi)<br>- OSARCH=linux-gnu<br>- ;;<br>- *)<br>- OSARCH=${host_os}<br>+ *bsd*)<br>+ CPPFLAGS="${CPPFLAGS} -I/usr/local/include"<br>+ LDFLAGS="${LDFLAGS} -L/usr/local/lib"<br> ;;<br> esac<br> <br>diff --git a/menuselect/configure.ac b/menuselect/configure.ac<br>index 2dd4ed6..4a2d0ac 100644<br>--- a/menuselect/configure.ac<br>+++ b/menuselect/configure.ac<br>@@ -1,5 +1,3 @@<br>-# Process this file with autoconf to produce a configure script.<br>-<br> AC_PREREQ(2.59)<br> <br> m4_define([MENUSELECT_VERSION],<br>@@ -16,49 +14,29 @@<br> <br> AC_COPYRIGHT("Menuselect")<br> <br>-AC_CANONICAL_BUILD<br> AC_CANONICAL_HOST<br> <br> HOST_OS=${host_os}<br> AC_SUBST(HOST_OS)<br> <br>-PBX_WINARCH=0<br> case "${host_os}" in<br>- freebsd*)<br>- OSARCH=FreeBSD<br>+ *dragonfly*)<br>+ CPPFLAGS="${CPPFLAGS} -I/usr/local/include"<br>+ LDFLAGS="${LDFLAGS} -L/usr/local/lib"<br> ;;<br>- netbsd*)<br>- OSARCH=NetBSD<br>+ *netbsd*)<br>+ CPPFLAGS="${CPPFLAGS} -I/usr/pkg/include"<br>+ LDFLAGS="${LDFLAGS} -L/usr/pkg/lib"<br> ;;<br>- openbsd*)<br>- OSARCH=OpenBSD<br>- ;;<br>- solaris*)<br>- OSARCH=SunOS<br>- ;;<br>- mingw32)<br>- OSARCH=mingw32<br>- PBX_WINARCH=1<br>- ;;<br>- cygwin)<br>- OSARCH=cygwin<br>- PBX_WINARCH=1<br>- ;;<br>- linux-gnueabi)<br>- OSARCH=linux-gnu<br>- ;;<br>- *)<br>- OSARCH=${host_os}<br>+ *bsd*)<br>+ CPPFLAGS="${CPPFLAGS} -I/usr/local/include"<br>+ LDFLAGS="${LDFLAGS} -L/usr/local/lib"<br> ;;<br> esac<br> <br> AH_TOP(<br> #ifndef MENUSELECT_AUTOCONFIG_H<br> #define MENUSELECT_AUTOCONFIG_H<br>-<br>-#ifndef _REENTRANT<br>-#define _REENTRANT<br>-#endif<br> )<br> <br> AH_BOTTOM([#endif])<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8839">change 8839</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/8839"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I186d88d99cfa4de6569888e12ac97bd2f441c422 </div>
<div style="display:none"> Gerrit-Change-Number: 8839 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Alexander Traud <pabstraud@compuserve.com> </div>
<div style="display:none"> Gerrit-Reviewer: Alexander Traud <pabstraud@compuserve.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>