From: Russell Bryant Date: Mon, 30 Mar 2009 13:57:30 +0000 (+0000) Subject: Merged revisions 184910 via svnmerge from X-Git-Tag: 1.6.1.0-rc4~29 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9860e60c6027966ae92b295e2b70a8222dea5124;p=thirdparty%2Fasterisk.git Merged revisions 184910 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r184910 | russell | 2009-03-30 08:55:44 -0500 (Mon, 30 Mar 2009) | 4 lines Fix build error when chan_h323 is not being built. (reported by cai1982 in #asterisk-dev) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@184912 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/h323/Makefile.in b/channels/h323/Makefile.in index 083250f554..5f949ca7db 100644 --- a/channels/h323/Makefile.in +++ b/channels/h323/Makefile.in @@ -24,7 +24,9 @@ ifndef OPENH323DIR OPENH323DIR=@OPENH323DIR@ endif +ifneq ($(wildcard $(OPENH323DIR)/openh323u.mak),) include $(OPENH323DIR)/openh323u.mak +endif notrace:: $(MAKE) NOTRACE=1 opt