[asterisk-commits] mmichelson: branch 10 r368928 - in /branches/10: ./ main/Makefile

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Jun 14 10:25:23 2012
New Revision: 368928

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=368928
Log:
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.
........

Merged revisions 368927 from http://svn.asterisk.org/svn/asterisk/branches/1.8

Modified:
    branches/10/   (props changed)
    branches/10/main/Makefile

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/10/main/Makefile?view=diff&rev=368928&r1=368927&r2=368928
==============================================================================
--- branches/10/main/Makefile (original)
+++ branches/10/main/Makefile Thu Jun 14 10:25:23 2012
@@ -26,6 +26,9 @@
 # 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)