diff --git a/configure.in b/configure.in
index e2ef1ae7de..ec1f691af2 100644
--- a/configure.in
+++ b/configure.in
@@ -105,6 +105,9 @@ 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.*)
+            SOLINK="-dynamic -force-flat-namespace"
+        ;;
         *darwin*)
             SOLINK="-dynamic -bundle -force-flat-namespace"
         ;;
@@ -182,6 +185,13 @@ elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
     APR_ADDTO(SWITCH_AM_CFLAGS, -Werror)
     if test "${enable_64}" = "yes"; then
 	LIBS="$LIBS -m64"
+	case "$host" in
+             *darwin10.*)
+		APR_ADDTO(CFLAGS, -arch x86_64)
+       		APR_ADDTO(LDFLAGS, -arch x86_64)
+       		APR_ADDTO(CXXFLAGS, -arch x86_64)
+		;;
+	 esac
     fi
 fi
 
@@ -308,6 +318,16 @@ ESL_LDFLAGS=
 PLATFORM_CORE_DEPLIBS=
 # tweak platform specific flags
 case "$host" in
+    *darwin10.*)
+        APR_ADDTO(SWITCH_AM_CFLAGS, -DMACOSX)
+        APR_ADDTO(CFLAGS, -pipe -no-cpp-precomp)
+        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_DEPLIBS, --framework CoreFoundation)
+	fi
+    ;;
     *darwin*)
         APR_ADDTO(SWITCH_AM_CFLAGS, -DMACOSX)
         APR_REMOVEFROM(SWITCH_AM_CFLAGS, -fPIC)