Up the minimum OS X version to 10.6.

 * This allows us to remove some special-case build logic.
 * 10.5 is down to less that 8% of the OS X market share. 10.4 is down to
   under 2%.
 * Apple is no longer releasing security updates for 10.5 and earlier.

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

diff --git a/Makefile b/Makefile
index 71c8f00167cce4485a6fbe59b98af50c577c330f..26f00813acc449b35faae1e6ac1b2b45c98a34bd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -252,10 +252,8 @@ MOD_SUBDIRS_MENUSELECT_TREE:=$(MOD_SUBDIRS:%=%-menuselect-tree)
 
 ifneq ($(findstring darwin,$(OSARCH)),)
   _ASTCFLAGS+=-D__Darwin__
-  _SOLINK=-Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup
-  ifeq ($(shell if test `/usr/bin/sw_vers -productVersion | cut -c4` -gt 5; then echo 6; else echo 0; fi),6)
-    _SOLINK+=/usr/lib/bundle1.o
-  endif
+  _SOLINK=-Xlinker -macosx_version_min -Xlinker 10.6 -Xlinker -undefined -Xlinker dynamic_lookup
+  _SOLINK+=/usr/lib/bundle1.o
   SOLINK=-bundle $(_SOLINK)
   DYLINK=-Xlinker -dylib $(_SOLINK)
   _ASTLDFLAGS+=-L/usr/local/lib

diff --git a/configure b/configure
index 5abec2de7a816cfa1c3656d54b94e2d9c26b191d..2284c1b18e5fec8a52600593653d5a4c31bcb6ac 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 378915 .
+# From configure.ac Revision: 379477 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69 for asterisk trunk.
 #
@@ -16419,20 +16419,7 @@ elif test "${prefix}" = /usr || test "${prefix}" = NONE; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: not needed" >&5
 $as_echo "not needed" >&6; }
 else
-       case "${host_os}" in
-               darwin*)
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: result: not supported" >&5
-$as_echo "not supported" >&6; }
-                       # We set macosx_version_min to 10.4, which doesn't
-                       # support rpath. However, we set install_name on our
-                       # dylibs, so it's not strictly necessary.
-                       ;;
-               *)
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: result: required" >&5
-$as_echo "required" >&6; }
-                       AST_RPATH="-Wl,-rpath,${libdir}"
-                       ;;
-       esac
+       AST_RPATH="-Wl,-rpath,${libdir}"
 fi
 
 

diff --git a/configure.ac b/configure.ac
index b5f4d29a2fc4c58f3626bae7960f846316ba7863..e90682754d57e653ad802fa19acc3478b56bb706 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1071,18 +1071,7 @@ if test "${check_rpath}" != yes; then
 elif test "${prefix}" = /usr || test "${prefix}" = NONE; then
        AC_MSG_RESULT(not needed)
 else
-       case "${host_os}" in
-               darwin*)
-                       AC_MSG_RESULT(not supported)
-                       # We set macosx_version_min to 10.4, which doesn't
-                       # support rpath. However, we set install_name on our
-                       # dylibs, so it's not strictly necessary.
-                       ;;
-               *)
-                       AC_MSG_RESULT(required)
-                       AST_RPATH="-Wl,-rpath,${libdir}"
-                       ;;
-       esac
+       AST_RPATH="-Wl,-rpath,${libdir}"
 fi
 AC_SUBST(AST_RPATH)
 

diff --git a/main/Makefile b/main/Makefile
index 5dec42e682dd8e68e879a3ec7df71f51af232fc9..d12fe3f38c5fe29896a6ebb6dcecddbd63d81fb2 100644 (file)
--- a/main/Makefile
+++ b/main/Makefile
@@ -55,10 +55,8 @@ endif
 
 ifneq ($(findstring darwin,$(OSARCH)),)
   AST_LIBS+=-lresolv
-  ASTLINK=-Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace
-  ifeq ($(shell if test `/usr/bin/sw_vers -productVersion | cut -c4` -gt 5; then echo 6; else echo 0; fi),6)
-    ASTLINK+=/usr/lib/bundle1.o
-  endif
+  ASTLINK=-Xlinker -macosx_version_min -Xlinker 10.6 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace
+  ASTLINK+=/usr/lib/bundle1.o
 else
 # These are used for all but Darwin
   ifneq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)