From b816329d1336c0cb4ce15a36dd3d107dd5398724 Mon Sep 17 00:00:00 2001
From: "Jay Freeman (saurik)" <saurik@saurik.com>
Date: Sat, 21 May 2011 06:59:54 +0000
Subject: [PATCH] Support missing universal binary targets.

---
 configure    | 16 ++++++++--------
 configure.ac |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/configure b/configure
index 0afc207..202e7f6 100755
--- a/configure
+++ b/configure
@@ -14465,6 +14465,12 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
 
 # Check whether --enable-universal-binary was given.
 if test "${enable_universal_binary+set}" = set; then :
@@ -14518,7 +14524,7 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
 
 
   for element in $cy_arch; do
@@ -14680,7 +14686,7 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
 
 
   for element in $cy_arch; do
@@ -14874,12 +14880,6 @@ if test "${with_frameworks+set}" = set; then :
 
 fi
 
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
 
   apr_found="no"
 
diff --git a/configure.ac b/configure.ac
index 446e6c6..3f2e5b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,7 @@ AC_CHECK_PROGS([SVN], [svn])
 AC_CHECK_PROGS([SVNVERSION], [svnversion])
 AC_PROG_CXX
 AC_PROG_OBJCXX
+AC_LANG([C++])
 AC_DEFUN([CY_CHECK_UNIVERSAL], [
 	AC_MSG_CHECKING([for universal binary support])
 	AS_CASE([$host_vendor], [apple], [
@@ -93,7 +94,6 @@ AC_ARG_WITH([frameworks], [AS_HELP_STRING(
 		AC_LIB_APPENDTOVAR([OBJCCXXFLAGS], [-F$cy_framework])
 	done
 ])
-AC_LANG([C++])
 APR_FIND_APR([], [], [1], [1])
 AS_CASE([$apr_found], [yes], [
 	AC_LIB_APPENDTOVAR([CPPFLAGS], [`$apr_config --includes`])
-- 
2.47.2