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
........

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

diff --git a/main/Makefile b/main/Makefile
index 4b0de7eef8468117dcfea182f9a68904b2083665..24337cf4471aa81600e3817ae6b387299b57054c 100644 (file)
--- a/main/Makefile
+++ b/main/Makefile
@@ -62,6 +62,9 @@ ifneq ($(findstring darwin,$(OSARCH)),)
     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)),)