[41016] trunk/base/configure
afb at macports.org
afb at macports.org
Mon Oct 20 15:57:00 PDT 2008
Revision: 41016
http://trac.macports.org/changeset/41016
Author: afb at macports.org
Date: 2008-10-20 15:57:00 -0700 (Mon, 20 Oct 2008)
Log Message:
-----------
regenerate configure
Modified Paths:
--------------
trunk/base/configure
Modified: trunk/base/configure
===================================================================
--- trunk/base/configure 2008-10-20 22:56:28 UTC (rev 41015)
+++ trunk/base/configure 2008-10-20 22:57:00 UTC (rev 41016)
@@ -773,6 +773,7 @@
SHLIB_SUFFIX
TCL_DEFS
TCL_CC
+CONDITIONAL_PACKAGES
OUR_INCLUDED_PACKAGES
prefix_expanded
MPCONFIGDIR_EXPANDED
@@ -4464,6 +4465,9 @@
+# Determine if we want to install conditional packages
+CONDITIONAL_PACKAGES=
+
# Foundation checks
@@ -5495,6 +5499,8 @@
;;
apple)
;;
+ no)
+ ;;
*)
{ { echo "$as_me:$LINENO: error: ${with_objc_runtime} is not a valid argument to --with-objc-runtime. Please specify either \"GNU\" or \"apple\"" >&5
echo "$as_me: error: ${with_objc_runtime} is not a valid argument to --with-objc-runtime. Please specify either \"GNU\" or \"apple\"" >&2;}
@@ -5510,6 +5516,8 @@
ac_compiler_gnu=$ac_cv_objc_compiler_gnu
+ if test x"${with_objc_runtime}" != x"no"; then
+
# Check for common header, objc/objc.h
for ac_header in objc/objc.h
@@ -5974,6 +5982,8 @@
mp_cv_objc_runtime_gnu="no"
fi
+ fi
+
# Apple runtime is prefered
if test x"${mp_cv_objc_runtime_apple}" = x"yes"; then
OBJC_RUNTIME="APPLE_RUNTIME"
@@ -5995,6 +6005,10 @@
#define GNU_RUNTIME 1
_ACEOF
+ elif test x"${with_objc_runtime}" = x"no"; then
+ OBJC_RUNTIME="none"
+ { echo "$as_me:$LINENO: Not using Objective-C runtime" >&5
+echo "$as_me: Not using Objective-C runtime" >&6;}
else
{ { echo "$as_me:$LINENO: error: Could not locate a working Objective-C runtime.
See \`config.log' for more details." >&5
@@ -6039,6 +6053,8 @@
;;
apple)
;;
+ no)
+ ;;
*)
{ { echo "$as_me:$LINENO: error: ${with_objc_foundation} is not a valid argument to --with-objc-foundation. Please specify either \"GNU\" or \"apple\"" >&5
echo "$as_me: error: ${with_objc_foundation} is not a valid argument to --with-objc-foundation. Please specify either \"GNU\" or \"apple\"" >&2;}
@@ -6054,6 +6070,8 @@
ac_compiler_gnu=$ac_cv_objc_compiler_gnu
+ if test x"${with_objc_foundation}" != x"no"; then
+
if test x"${with_objc_foundation}" == x || test x"${with_objc_foundation}" == x"apple"; then
# '[' = '['
# ']' = ']'
@@ -6251,6 +6269,8 @@
ac_cv_objc_foundation_gnustep="no"
fi
+ fi
+
# NeXT Foundation is prefered
if test x"${ac_cv_objc_foundation_apple}" == x"yes"; then
OBJC_FOUNDATION="Apple"
@@ -6276,6 +6296,10 @@
{ echo "$as_me:$LINENO: Using GNUstep Foundation library" >&5
echo "$as_me: Using GNUstep Foundation library" >&6;}
+ elif test x"${with_objc_foundation}" = x"no"; then
+ OBJC_FOUNDATION="none"
+ { echo "$as_me:$LINENO: Not using Foundation implementation" >&5
+echo "$as_me: Not using Foundation implementation" >&6;}
else
{ { echo "$as_me:$LINENO: error: Could not find a working Foundation implementation" >&5
echo "$as_me: error: Could not find a working Foundation implementation" >&2;}
@@ -6295,7 +6319,12 @@
+# tclobjc requires objc (runtime and foundation) support
+if test x$OBJC_RUNTIME != xnone -a x$OBJC_FOUNDATION != xnone; then
+ CONDITIONAL_PACKAGES="tclobjc1.0 $CONDITIONAL_PACKAGES"
+fi
+
FRAMEWORK_LIBS="-framework CoreFoundation"
{ echo "$as_me:$LINENO: checking for CoreFoundation framework" >&5
@@ -12354,6 +12383,7 @@
+
# misc variables that need to be expanded for substitution into tcl
oldprefix=$prefix
@@ -13211,6 +13241,7 @@
SHLIB_SUFFIX!$SHLIB_SUFFIX$ac_delim
TCL_DEFS!$TCL_DEFS$ac_delim
TCL_CC!$TCL_CC$ac_delim
+CONDITIONAL_PACKAGES!$CONDITIONAL_PACKAGES$ac_delim
OUR_INCLUDED_PACKAGES!$OUR_INCLUDED_PACKAGES$ac_delim
prefix_expanded!$prefix_expanded$ac_delim
MPCONFIGDIR_EXPANDED!$MPCONFIGDIR_EXPANDED$ac_delim
@@ -13219,7 +13250,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 66; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 67; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20081020/9c24a2e0/attachment.html
More information about the macports-changes
mailing list