pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/comms/asterisk16 Fix build problem when no options are...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7648694383cf
branches:  trunk
changeset: 568999:7648694383cf
user:      jnemeth <jnemeth%pkgsrc.org@localhost>
date:      Sat Jan 02 00:36:54 2010 +0000

description:
Fix build problem when no options are selected.  Thanks to wiz@ for
noticing the problem and seb@ for help with the Makefile contortions.

diffstat:

 comms/asterisk16/options.mk |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (31 lines):

diff -r 3578a4536ecd -r 7648694383cf comms/asterisk16/options.mk
--- a/comms/asterisk16/options.mk       Sat Jan 02 00:20:14 2010 +0000
+++ b/comms/asterisk16/options.mk       Sat Jan 02 00:36:54 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2009/06/12 09:04:56 jnemeth Exp $
+# $NetBSD: options.mk,v 1.2 2010/01/02 00:36:54 jnemeth Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.asterisk
 PKG_SUPPORTED_OPTIONS=         zaptel x11 unixodbc ilbc
@@ -50,6 +50,9 @@
 PLIST.ilbc=            yes
 .endif
 
+.if !empty(PKG_OPTIONS:Mx11) || !empty(PKG_OPTIONS:Munixodbc) || !empty(PKG_OPTIONS:Milbc)
+RUN_MENUSELECT= # defined
+.endif
 post-configure:
 .if !empty(PKG_OPTIONS:Mx11)
        ${ECHO} "MENUSELECT_PBX=-pbx_gtkconsole" >> ${WRKSRC}/pkgsrc.makeopts
@@ -60,8 +63,10 @@
 .if !empty(PKG_OPTIONS:Milbc)
        ${ECHO} "MENUSELECT_CODECS=-codec_ilbc" >> ${WRKSRC}/pkgsrc.makeopts
 .endif
-# this is a hack to work around a bug in menuselect
+.ifdef RUN_MENUSELECT
+       # this is a hack to work around a bug in menuselect
        cd ${WRKSRC} && make menuselect.makeopts
+.endif
 
 post-extract:
 .if !empty(PKG_OPTIONS:Milbc)



Home | Main Index | Thread Index | Old Index