diff options
| author | Paul Cadach <paul@odt.east.telecom.kz> | 2007-01-23 06:56:26 +0000 |
|---|---|---|
| committer | Paul Cadach <paul@odt.east.telecom.kz> | 2007-01-23 06:56:26 +0000 |
| commit | cd61f69a83f08fbec25d8376cafb6b36b2611c1a (patch) | |
| tree | 3c7028e5fff0c6d73abc21fafbb3a675dc9b3e52 /channels/Makefile | |
| parent | 1fda861ff8520cb2f16a16f2304fe8ec460ad558 (diff) | |
Merged revisions 51615 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51615 | pcadach | 2007-01-22 22:51:51 -0800 (Пнд, 22 Янв 2007) | 1 line
Do not abort Asterisk startup if h323 configuration file not found (reported by mithraen)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51623 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/Makefile')
| -rw-r--r-- | channels/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/Makefile b/channels/Makefile index 736372514..3515532a1 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -100,11 +100,11 @@ chan_alsa.o: busy.h ringtone.h ifeq ($(OSARCH),linux-gnu) chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast $(ECHO_PREFIX) echo " [LD] $^ -> $@" - $(CMD_PREFIX) $(CXX) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) + $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) else chan_h323.so: chan_h323.o h323/libchanh323.a $(ECHO_PREFIX) echo " [LD] $^ -> $@" - $(CMD_PREFIX) $(CXX) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat + $(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 chan_misdn.o: ASTCFLAGS+=-Imisdn |