From b7f964b90c3fb286e4ec0e23cf164253a4da63a2 Mon Sep 17 00:00:00 2001 From: russell Date: Wed, 19 Dec 2007 19:34:39 +0000 Subject: There is an architectural issue with the way menuselect works in zaptel. If the menuselect.makeopts file gets automatically created when running make, then the Makefile does not get the contents of that file included. The bug exposed itself where libnewt was not found, but we tried to build it anyway. This hack prevents that from happening, but the larger issue needs to be addressed. It can be fixed once the actual building of the modules and userspace tools are done by sub Makefiles ... (closes issue #11199) Reported by: dimas Patches: newt_select_makefile.diff uploaded by tzafrir (license 46) git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@3528 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- Makefile | 5 ++++- makeopts.in | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9b5d5e2..213b368 100644 --- a/Makefile +++ b/Makefile @@ -255,7 +255,10 @@ UTILS += patgen pattest patlooptest hdlcstress hdlctest hdlcgen \ UTILSO = $(UTILS:%=%.o) -BINS:=fxotune fxstest sethdlc-new ztcfg ztdiag ztmonitor ztspeed zttest zttool ztscan +BINS:=fxotune fxstest sethdlc-new ztcfg ztdiag ztmonitor ztspeed zttest ztscan +ifeq (1,$(PBX_LIBNEWT)) + BINS+=zttool +endif BINS:=$(filter-out $(MENUSELECT_UTILS),$(BINS)) MAN_PAGES:=$(wildcard $(BINS:%=doc/%.8)) diff --git a/makeopts.in b/makeopts.in index 6af94be..c2bf075 100644 --- a/makeopts.in +++ b/makeopts.in @@ -26,6 +26,7 @@ sysconfdir = @sysconfdir@ DOWNLOAD=@DOWNLOAD@ +PBX_LIBNEWT=@PBX_LIBNEWT@ NEWT_LIB=@NEWT_LIB@ NEWT_INCLUDE=@NEWT_INCLUDE@ -- cgit v1.2.3