From 6bf2b92729d2e93ed603d34f16b82dfcd6a8de8f Mon Sep 17 00:00:00 2001
From: Jeff Peeler <jpeeler@digium.com>
Date: Fri, 10 Apr 2009 20:27:58 +0000
Subject: [PATCH] Merged revisions 187906 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

........
  r187906 | jpeeler | 2009-04-10 15:26:46 -0500 (Fri, 10 Apr 2009) | 12 lines

  Fix module embedding for chan_h323.

  Include libchanh323.a in the modules.link file so that all the symbols can be
  resolved at link time.

  (closes issue #11966)
  Reported by: dome
  Patches:
        issue_11966.patch uploaded by kpfleming (license 421)
  Tested by: jpeeler
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@187912 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 channels/Makefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/channels/Makefile b/channels/Makefile
index 6fb75bec53..75bb2b01b4 100644
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -60,7 +60,6 @@ endif
 ifneq ($(wildcard h323/Makefile.ast),)
 include h323/Makefile.ast
 endif
-H323LDFLAGS+=-Wl,--version-script=h323/noexport.map
 
 clean::
 	$(MAKE) -C misdn clean
@@ -71,15 +70,19 @@ dist-clean::
 
 $(if $(filter chan_iax2,$(EMBEDDED_MODS)),modules.link,chan_iax2.so): iax2-parser.o iax2-provision.o
 
+ifneq ($(filter chan_h323,$(EMBEDDED_MODS)),)
+modules.link: h323/libchanh323.a
+else
 ifeq ($(OSARCH),linux-gnu)
-chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast
+chan_h323.so: chan_h323.o h323/libchanh323.a
 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
-	$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS)
+	$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(H323LDLIBS)
 else
 chan_h323.so: chan_h323.o h323/libchanh323.a
 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
 	$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
 endif
+endif
 
 chan_misdn.o: ASTCFLAGS+=-Imisdn
 
@@ -94,5 +97,5 @@ $(if $(filter chan_oss,$(EMBEDDED_MODS)),modules.link,chan_oss.so): console_vide
 h323/Makefile.ast:
 	$(CMD_PREFIX) $(MAKE) -C h323 Makefile.ast
  
-h323/libchanh323.a:
+h323/libchanh323.a: h323/Makefile.ast
 	$(CMD_PREFIX) $(MAKE) -C h323 libchanh323.a