FS-4718: --resolve merge osx 10.8 build fixes

diff --git a/configure.in b/configure.in
index 95b0553de2d23c68b9b0e2c7ed120399ee411198..8031700ac69ad5a9929caccb17a1575d61d1847a 100644 (file)
--- 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)