[120128] branches/release_2_3
jmr at macports.org
jmr at macports.org
Fri May 16 14:39:19 PDT 2014
Revision: 120128
https://trac.macports.org/changeset/120128
Author: jmr at macports.org
Date: 2014-05-16 14:39:18 -0700 (Fri, 16 May 2014)
Log Message:
-----------
merge r120127 from trunk:
make missing foundation non-fatal on platforms other than OS X, and fix some test(1) syntax
Revision Links:
--------------
https://trac.macports.org/changeset/120127
Modified Paths:
--------------
branches/release_2_3/base/configure
branches/release_2_3/base/m4/foundation.m4
Property Changed:
----------------
branches/release_2_3/
branches/release_2_3/base/
Property changes on: branches/release_2_3
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:118056,118161,118640,119204,119297
+ /trunk:118056,118161,118640,119204,119297,120127
Property changes on: branches/release_2_3/base
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/gsoc11-statistics/base:79520,79666
/branches/gsoc13-tests:106692-111324
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:118038-118039,118056,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
+ /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/gsoc11-statistics/base:79520,79666
/branches/gsoc13-tests:106692-111324
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:118038-118039,118056,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
Modified: branches/release_2_3/base/configure
===================================================================
--- branches/release_2_3/base/configure 2014-05-16 21:31:45 UTC (rev 120127)
+++ branches/release_2_3/base/configure 2014-05-16 21:39:18 UTC (rev 120128)
@@ -7441,7 +7441,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
@@ -7504,10 +7504,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
@@ -7589,7 +7589,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}"
@@ -7599,7 +7599,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}"
@@ -7609,7 +7609,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: branches/release_2_3/base/m4/foundation.m4
===================================================================
--- branches/release_2_3/base/m4/foundation.m4 2014-05-16 21:31:45 UTC (rev 120127)
+++ branches/release_2_3/base/m4/foundation.m4 2014-05-16 21:39:18 UTC (rev 120128)
@@ -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/e6b7fa51/attachment.html>
More information about the macports-changes
mailing list