aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-03-30 13:57:30 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-03-30 13:57:30 +0000
commitbf97d734f62da6a6fa2f683f7c28480200af10b2 (patch)
treeb86279840717bda4e9784b4961c662a02e77c240
parent51e3a6fa7229fa8b21f7a4deecf235ec7926cc5f (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.1@184912 f38db490-d61c-443f-a65b-d21fe96a405b
-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