From 9777bd50251d7e72c44bfbee7fbad2d8df148e47 Mon Sep 17 00:00:00 2001
From: "Jay Freeman (saurik)" <saurik@saurik.com>
Date: Sat, 21 May 2011 07:04:39 +0000
Subject: [PATCH] Support SO variable even when not Mach.

---
 configure    | 6 +++---
 configure.ac | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 202e7f6..40cf435 100755
--- a/configure
+++ b/configure
@@ -747,13 +747,13 @@ ac_subst_vars='LTLIBOBJS
 LIBOBJS
 CY_ATTACH_GROUP
 CY_OBJECTIVEC_MACH
-SO
 ac_ct__NM
 _NM
 ac_ct__LIPO
 _LIPO
 ac_ct__OTOOL
 _OTOOL
+SO
 LTLIBICONV
 LIBICONV
 GNUSTEP_CONFIG
@@ -19213,6 +19213,8 @@ 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
 
+SO=$acl_shlibext
+
 if test "x$CY_OBJECTIVEC" = x1; then :
 
 	ac_fn_cxx_check_header_mongrel "$LINENO" "mach/mach.h" "ac_cv_header_mach_mach_h" "$ac_includes_default"
@@ -19527,8 +19529,6 @@ fi
 		if test "x$_NM" = x; then :
   as_fn_error $? "You need nm" "$LINENO" 5
 fi
-		SO=$acl_shlibext
-
 		CY_OBJECTIVEC_MACH=1
 
 		CY_ATTACH_GROUP=procmod
diff --git a/configure.ac b/configure.ac
index 3f2e5b9..43ca975 100644
--- a/configure.ac
+++ b/configure.ac
@@ -197,6 +197,7 @@ AS_CASE([$am_cv_func_iconv], [yes], [], [
 ])
 AS_CASE([$am_cv_func_iconv], [yes], [], [AC_MSG_ERROR([You need iconv])])
 AC_LANG_POP([C])
+AC_SUBST([SO], [$acl_shlibext])
 AS_IF([test "x$CY_OBJECTIVEC" = x1], [
 	AC_CHECK_HEADER([mach/mach.h], [
 		AC_CHECK_TOOLS([_OTOOL], [otool])
@@ -205,7 +206,6 @@ AS_IF([test "x$CY_OBJECTIVEC" = x1], [
 		AS_IF([test "x$_LIPO" = x], [AC_MSG_ERROR([You need lipo])])
 		AC_CHECK_TOOLS([_NM], [nm])
 		AS_IF([test "x$_NM" = x], [AC_MSG_ERROR([You need nm])])
-		AC_SUBST([SO], [$acl_shlibext])
 		AC_SUBST([CY_OBJECTIVEC_MACH], [1])
 		AC_SUBST([CY_ATTACH_GROUP], [procmod])
 	])
-- 
2.45.2