From: Mark Michelson <mmichelson@digium.com>
Date: Thu, 14 Jun 2012 15:23:10 +0000 (+0000)
Subject: Revert Makefile change to remove embedding res_adsi.so
X-Git-Tag: 1.8.15.0-rc1~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6738e630819458a2c22ec4dceeb0484dd47e400f;p=thirdparty%2Fasterisk.git

Revert Makefile change to remove embedding res_adsi.so

The change has resulted in a linking error for certain versions
of GCC. This is much worse than the original issue, so for now,
temporarily revert the change. A more thorough change will be
sought out.



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@368927 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/Makefile b/main/Makefile
index 72465e56df..67f8b2ea08 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -26,6 +26,9 @@ OBJS=$(filter-out $(OBJSFILTER),$(SRC:.c=.o))
 # otherwise modules will not have them available if none of the static
 # objects use it.
 OBJS+=stdtime/localtime.o
+ifneq ($(firstword $(subst :, ,$(WEAKREF))),1)
+OBJS+=../res/res_adsi.o
+endif
 
 AST_LIBS += $(OPENSSL_LIB)
 AST_LIBS += $(BKTR_LIB)