Support missing universal binary targets.

diff --git a/configure b/configure
index 0afc2070f15a413a43968265bc5473cc955f66e3..202e7f68cdc48af3893e2740a5370b8dbe946e45 100755 (executable)
--- 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_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 :
 
 # Check whether --enable-universal-binary was given.
 if test "${enable_universal_binary+set}" = set; then :


@@ -14518,7 +14524,7 @@ main ()
   return 0;
 }
 _ACEOF
   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
 
 
   for element in $cy_arch; do


@@ -14680,7 +14686,7 @@ main ()
   return 0;
 }
 _ACEOF
   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
 
 
   for element in $cy_arch; do


@@ -14874,12 +14880,6 @@ if test "${with_frameworks+set}" = set; then :
 
 fi
 
 
 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"
 
 
   apr_found="no"
 

diff --git a/configure.ac b/configure.ac
index 446e6c6ba9798387d79ee3027ac4592336cc4d91..3f2e5b98db3f32d2dbcc874f1afc0cb200009e75 100644 (file)
--- 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_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], [
 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_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`])
 APR_FIND_APR([], [], [1], [1])
 AS_CASE([$apr_found], [yes], [
        AC_LIB_APPENDTOVAR([CPPFLAGS], [`$apr_config --includes`])