[asterisk-commits] mmichelson: trunk r368929 - in /trunk: ./ main/Makefile

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Jun 14 10:28:02 2012
New Revision: 368929

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

Merged revisions 368928 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/main/Makefile

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

Modified: trunk/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/main/Makefile?view=diff&rev=368929&r1=368928&r2=368929
==============================================================================
--- trunk/main/Makefile (original)
+++ trunk/main/Makefile Thu Jun 14 10:28:02 2012
@@ -29,6 +29,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
 
 ASTSSL_LIBS:=$(OPENSSL_LIB)
 AST_LIBS+=$(BKTR_LIB)