From 0952a99a76bbbd563fd612cd8e12c552e5218356 Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Mon, 29 Oct 2012 13:20:10 -0400
Subject: [PATCH] FS-4718: --resolve merge osx 10.8 build fixes

---
 configure.in | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 95b0553de2..8031700ac6 100644
--- a/configure.in
+++ b/configure.in
@@ -164,7 +164,7 @@ if test "x${ax_cv_c_compiler_vendor}"  =  "xsun" ; then
     SOLINK="-Bdynamic -dy -G"
 elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
     case "$host" in
-        *darwin10.*)
+        *darwin12.*|*darwin10.*)
             SOLINK="-dynamic -force-flat-namespace"
         ;;
         *darwin*)
@@ -248,7 +248,7 @@ elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
     APR_ADDTO(SWITCH_AM_CFLAGS, -Werror)
     if test "${enable_64}" = "yes"; then
 	case "$host" in
-             *darwin10.*|*darwin9.*|*darwin8.*)
+             *darwin12.*|*darwin10.*|*darwin9.*|*darwin8.*)
 		APR_ADDTO(CFLAGS, -arch x86_64)
        		APR_ADDTO(LDFLAGS, -arch x86_64)
        		APR_ADDTO(CXXFLAGS, -arch x86_64)
@@ -447,6 +447,17 @@ PLATFORM_CORE_LDFLAGS=
 PLATFORM_CORE_LIBS=
 # tweak platform specific flags
 case "$host" in
+    *darwin12.*)
+        APR_ADDTO(SWITCH_AM_CFLAGS, -DMACOSX)
+        APR_ADDTO(CFLAGS, -pipe -no-cpp-precomp -Wno-deprecated-declarations)
+        APR_ADDTO(LDFLAGS, -pipe -bind_at_load)
+        APR_ADDTO(CXXFLAGS, -pipe)
+        APR_REMOVEFROM(SWITCH_AM_CFLAGS, -fPIC)
+	if test "x$enable_core_odbc_support" != "xno"; then
+	        APR_ADDTO([PLATFORM_CORE_LDFLAGS], [--framework CoreFoundation])
+	fi
+	APR_ADDTO([PLATFORM_CORE_LIBS], [-ldl])
+    ;;
     *darwin10.*)
         APR_ADDTO(SWITCH_AM_CFLAGS, -DMACOSX)
         APR_ADDTO(CFLAGS, -pipe -no-cpp-precomp)