[svn-commits] tilghman: branch 1.6.2 r251268 - in /branches/1.6.2: ./ main/Makefile

[SVN commits to the Digium repositories]

Author: tilghman
Date: Sun Mar  7 23:18:03 2010
New Revision: 251268

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=251268
Log:
Merged revisions 251262-251263 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r251262 | tilghman | 2010-03-07 23:12:55 -0600 (Sun, 07 Mar 2010) | 2 lines
  
  Change needed to make Mac OS X 10.6 happy
........
  r251263 | tilghman | 2010-03-07 23:15:01 -0600 (Sun, 07 Mar 2010) | 2 lines
  
  Remove portions that weren't meant to be committed for the OS X compat fix
........

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

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/Makefile?view=diff&rev=251268&r1=251267&r2=251268
==============================================================================
--- branches/1.6.2/main/Makefile (original)
+++ branches/1.6.2/main/Makefile Sun Mar  7 23:18:03 2010
@@ -62,6 +62,9 @@
     ASTLINK=-Wl,-dynamic
   endif
   ASTLINK+=-Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace
+  ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6)
+    ASTLINK+=/usr/lib/bundle1.o
+  endif
 else
 # These are used for all but Darwin
   ifneq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)