aboutsummaryrefslogtreecommitdiffstats
path: root/channels/h323
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-03-30 13:57:56 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-03-30 13:57:56 +0000
commit8d1eb67b60615c71ef5d5d3ded744b242333baa8 (patch)
treecd5534bec78f4b89d95af1cde3cfc15b107b0014 /channels/h323
parentee3d6f5033a8af2d4b8873ad6262e2d9661655b5 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@184913 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/h323')
-rw-r--r--channels/h323/Makefile.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/h323/Makefile.in b/channels/h323/Makefile.in
index 083250f55..5f949ca7d 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