[120127] trunk/base

[jmr at macports.org]

Revision: 120127
          https://trac.macports.org/changeset/120127
Author:   jmr at macports.org
Date:     2014-05-16 14:31:45 -0700 (Fri, 16 May 2014)
Log Message:
-----------
make missing foundation non-fatal on platforms other than OS X, and fix some test(1) syntax

Modified Paths:
--------------
    trunk/base/configure
    trunk/base/m4/foundation.m4

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2014-05-16 19:32:30 UTC (rev 120126)
+++ trunk/base/configure	2014-05-16 21:31:45 UTC (rev 120127)
@@ -7530,7 +7530,7 @@
 
 	if test x"${with_objc_foundation}" != x"no"; then
 
-	if test x"${with_objc_foundation}" == x || test x"${with_objc_foundation}" == x"apple"; then
+	if test x"${with_objc_foundation}" = x || test x"${with_objc_foundation}" = x"apple"; then
 		# '[' = '['
 		# ']' = ']'
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Apple Foundation library" >&5
@@ -7593,10 +7593,10 @@
 		ac_cv_objc_foundation_apple="no"
 	fi
 
-	if test x"${with_objc_foundation}" == x || test x${with_objc_foundation} == x"GNUstep"; then
+	if test x"${with_objc_foundation}" = x || test x"${with_objc_foundation}" = x"GNUstep"; then
 		GNUSTEP_CONFIG=/usr/bin/gnustep-config
-		if test ! -x "${GNUSTEP_CONFIG}" -a x"${GNUSTEP_SYSTEM_ROOT}" == x; then
-			if test x"${with_objc_foundation}" == x"GNUstep"; then
+		if test ! -x "${GNUSTEP_CONFIG}" -a x"${GNUSTEP_SYSTEM_ROOT}" = x; then
+			if test x"${with_objc_foundation}" = x"GNUstep"; then
 				as_fn_error $? "GNUSTEP_SYSTEM_ROOT is not defined in your environment, preventing the use of GNUstep's Foundation library" "$LINENO" 5
 			else
 				{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GNUSTEP_SYSTEM_ROOT is not defined in your environment, preventing the use of GNUstep's Foundation library" >&5
@@ -7678,7 +7678,7 @@
 	fi
 
 	# NeXT Foundation is prefered
-	if test x"${ac_cv_objc_foundation_apple}" == x"yes"; then
+	if test x"${ac_cv_objc_foundation_apple}" = x"yes"; then
 		OBJC_FOUNDATION="Apple"
 		OBJC_FOUNDATION_CPPFLAGS="${APPLE_FOUNDATION_CFLAGS}"
 		OBJC_FOUNDATION_LIBS="${APPLE_FOUNDATION_LIBS}"
@@ -7688,7 +7688,7 @@
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: Using Apple Foundation library" >&5
 $as_echo "$as_me: Using Apple Foundation library" >&6;}
-	elif test x"${ac_cv_objc_foundation_gnustep}" == x"yes"; then
+	elif test x"${ac_cv_objc_foundation_gnustep}" = x"yes"; then
 		OBJC_FOUNDATION="GNUstep"
 		OBJC_FOUNDATION_CPPFLAGS="${GNUSTEP_CPPFLAGS}"
 		OBJC_FOUNDATION_LIBS="${GNUSTEP_LIBS}"
@@ -7698,7 +7698,7 @@
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: Using GNUstep Foundation library" >&5
 $as_echo "$as_me: Using GNUstep Foundation library" >&6;}
-	elif test x"${with_objc_foundation}" = x"no"; then
+	elif test x"${with_objc_foundation}" = x"no" || test x"$MACOSX_VERSION" = x; then
 		OBJC_FOUNDATION="none"
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: Not using Foundation implementation" >&5
 $as_echo "$as_me: Not using Foundation implementation" >&6;}

Modified: trunk/base/m4/foundation.m4
===================================================================
--- trunk/base/m4/foundation.m4	2014-05-16 19:32:30 UTC (rev 120126)
+++ trunk/base/m4/foundation.m4	2014-05-16 21:31:45 UTC (rev 120127)
@@ -313,7 +313,7 @@
 
 	if test x"${with_objc_foundation}" != x"no"; then
 	
-	if test x"${with_objc_foundation}" == x || test x"${with_objc_foundation}" == x"apple"; then
+	if test x"${with_objc_foundation}" = x || test x"${with_objc_foundation}" = x"apple"; then
 		# '@<:@' = '['
 		# '@:>@' = ']'
 		AC_MSG_CHECKING([for Apple Foundation library])
@@ -352,10 +352,10 @@
 		ac_cv_objc_foundation_apple="no"
 	fi
 
-	if test x"${with_objc_foundation}" == x || test x${with_objc_foundation} == x"GNUstep"; then
+	if test x"${with_objc_foundation}" = x || test x"${with_objc_foundation}" = x"GNUstep"; then
 		GNUSTEP_CONFIG=/usr/bin/gnustep-config
-		if test ! -x "${GNUSTEP_CONFIG}" -a x"${GNUSTEP_SYSTEM_ROOT}" == x; then
-			if test x"${with_objc_foundation}" == x"GNUstep"; then
+		if test ! -x "${GNUSTEP_CONFIG}" -a x"${GNUSTEP_SYSTEM_ROOT}" = x; then
+			if test x"${with_objc_foundation}" = x"GNUstep"; then
 				AC_MSG_ERROR([GNUSTEP_SYSTEM_ROOT is not defined in your environment, preventing the use of GNUstep's Foundation library])
 			else
 				AC_MSG_WARN([GNUSTEP_SYSTEM_ROOT is not defined in your environment, preventing the use of GNUstep's Foundation library])
@@ -412,21 +412,21 @@
 	fi
 	
 	# NeXT Foundation is prefered
-	if test x"${ac_cv_objc_foundation_apple}" == x"yes"; then
+	if test x"${ac_cv_objc_foundation_apple}" = x"yes"; then
 		OBJC_FOUNDATION="Apple"
 		OBJC_FOUNDATION_CPPFLAGS="${APPLE_FOUNDATION_CFLAGS}"
 		OBJC_FOUNDATION_LIBS="${APPLE_FOUNDATION_LIBS}"
 		OBJC_FOUNDATION_LDFLAGS=""
 		AC_DEFINE([APPLE_FOUNDATION], 1, [Define if using the Apple Foundation framework]) 
 		AC_MSG_NOTICE([Using Apple Foundation library])
-	elif test x"${ac_cv_objc_foundation_gnustep}" == x"yes"; then
+	elif test x"${ac_cv_objc_foundation_gnustep}" = x"yes"; then
 		OBJC_FOUNDATION="GNUstep"
 		OBJC_FOUNDATION_CPPFLAGS="${GNUSTEP_CPPFLAGS}"
 		OBJC_FOUNDATION_LIBS="${GNUSTEP_LIBS}"
 		OBJC_FOUNDATION_LDFLAGS="${GNUSTEP_LDFLAGS}"
 		AC_DEFINE([GNUSTEP_FOUNDATION], 1, [Define if using the GNUstep Foundation library]) 
 		AC_MSG_NOTICE([Using GNUstep Foundation library])
-	elif test x"${with_objc_foundation}" = x"no"; then
+	elif test x"${with_objc_foundation}" = x"no" || test x"$MACOSX_VERSION" = x; then
 		OBJC_FOUNDATION="none"
 		AC_MSG_NOTICE([Not using Foundation implementation])
 	else
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140516/0f7170c6/attachment.html>