Changeset 26709

Timestamp:

2007-07-04 13:37:52 (17 months ago)

Author:

landonf@…

Message:

Avoid modifying CPPFLAGS/LDFLAGS directly when checking for Foundation.
Submitted by: afb@…

Location:

trunk/base

Files:

• Mk/macports.autoconf.mk.in (modified) (1 diff)
• configure (modified) (8 diffs)
• foundation.m4 (modified) (3 diffs)
• src/tclobjc1.0/Makefile.in (modified) (1 diff)

trunk/base/Mk/macports.autoconf.mk.in

@@ -20 +20 @@
 OBJC_RUNTIME_FLAGS      = @OBJC_RUNTIME_FLAGS@
 OBJC_LIBS               = @OBJC_LIBS@
+
+OBJC_FOUNDATION         = @OBJC_FOUNDATION@
+OBJC_FOUNDATION_CPPFLAGS        = @OBJC_FOUNDATION_CPPFLAGS@
+OBJC_FOUNDATION_LDFLAGS = @OBJC_FOUNDATION_LDFLAGS@
+OBJC_FOUNDATION_LIBS            = @OBJC_FOUNDATION_LIBS@
 
 TCL_CC                  = @TCL_CC@

trunk/base/configure

@@ -704 +704 @@
 OBJC_PTHREAD_LIBS
 OBJC_PTHREAD_CFLAGS
+OBJC_FOUNDATION
+OBJC_FOUNDATION_LDFLAGS
+OBJC_FOUNDATION_CPPFLAGS
+OBJC_FOUNDATION_LIBS
 HAVE_FRAMEWORK_COREFOUNDATION
 HAVE_FRAMEWORK_SYSTEMCONFIGURATION
@@ -5387 +5391 @@
         if test x"${ac_cv_objc_foundation_apple}" == x"yes"; then
                 OBJC_FOUNDATION="Apple"
-                CPPFLAGS="${APPLE_FOUNDATION_CPPFLAGS} ${CPPFLAGS}"
-                LIBS="${APPLE_FOUNDATION_LIBS} ${LIBS}"
+                OBJC_FOUNDATION_CPPFLAGS="${APPLE_FOUNDATION_CFLAGS}"
+                OBJC_FOUNDATION_LIBS="${APPLE_FOUNDATION_LIBS}"
+                OBJC_FOUNDATION_LDFLAGS=""
 
 cat >>confdefs.h <<\_ACEOF
@@ -5398 +5403 @@
         elif test x"${ac_cv_objc_foundation_gnustep}" == x"yes"; then
                 OBJC_FOUNDATION="GNUstep"
-                CPPFLAGS="${GNUSTEP_CPPFLAGS} ${CPPFLAGS}"
-                LIBS="${GNUSTEP_LIBS} ${LIBS}"
-                LDFLAGS="${GNUSTEP_LDFLAGS} ${LDFLAGS}"
+                OBJC_FOUNDATION_CPPFLAGS="${GNUSTEP_CPPFLAGS}"
+                OBJC_FOUNDATION_LIBS="${GNUSTEP_LIBS}"
+                OBJC_FOUNDATION_LDFLAGS="${GNUSTEP_LDFLAGS}"
 
 cat >>confdefs.h <<\_ACEOF
@@ -5413 +5418 @@
    { (exit 1); exit 1; }; }
         fi
+
+
+
+
+
 
         ac_ext=c
@@ -11968 +11978 @@
 OBJC_PTHREAD_LIBS!$OBJC_PTHREAD_LIBS$ac_delim
 OBJC_PTHREAD_CFLAGS!$OBJC_PTHREAD_CFLAGS$ac_delim
+OBJC_FOUNDATION!$OBJC_FOUNDATION$ac_delim
+OBJC_FOUNDATION_LDFLAGS!$OBJC_FOUNDATION_LDFLAGS$ac_delim
+OBJC_FOUNDATION_CPPFLAGS!$OBJC_FOUNDATION_CPPFLAGS$ac_delim
+OBJC_FOUNDATION_LIBS!$OBJC_FOUNDATION_LIBS$ac_delim
 HAVE_FRAMEWORK_COREFOUNDATION!$HAVE_FRAMEWORK_COREFOUNDATION$ac_delim
 HAVE_FRAMEWORK_SYSTEMCONFIGURATION!$HAVE_FRAMEWORK_SYSTEMCONFIGURATION$ac_delim
@@ -11974 +11988 @@
 REPLACEMENT_PROGS!$REPLACEMENT_PROGS$ac_delim
 EXTRA_PROGS!$EXTRA_PROGS$ac_delim
-PORTSDIR!$PORTSDIR$ac_delim
-MPCONFIGDIR!$MPCONFIGDIR$ac_delim
-DSTUSR!$DSTUSR$ac_delim
-DSTGRP!$DSTGRP$ac_delim
 _ACEOF
 
@@ -12019 +12029 @@
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+PORTSDIR!$PORTSDIR$ac_delim
+MPCONFIGDIR!$MPCONFIGDIR$ac_delim
+DSTUSR!$DSTUSR$ac_delim
+DSTGRP!$DSTGRP$ac_delim
 DSTMODE!$DSTMODE$ac_delim
 CPP!$CPP$ac_delim
@@ -12064 +12078 @@
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 43; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 47; then
     break
   elif $ac_last_try; then

trunk/base/foundation.m4

@@ -276 +276 @@
 #       Defines one of the following preprocessor macros:
 #               APPLE_FOUNDATION GNUSTEP_FOUNDATION
+#
+#       Substitutes the following variables:
+#               OBJC_FOUNDATION OBJC_FOUNDATION_LDFLAGS
+#               OBJC_FOUNDATION_CPPFLAGS OBJC_FOUNDATION_LIBS
 #------------------------------------------------------------------------
 AC_DEFUN([MP_OBJC_FOUNDATION],[
@@ -390 +394 @@
         if test x"${ac_cv_objc_foundation_apple}" == x"yes"; then
                 OBJC_FOUNDATION="Apple"
-                CPPFLAGS="${APPLE_FOUNDATION_CPPFLAGS} ${CPPFLAGS}"
-                LIBS="${APPLE_FOUNDATION_LIBS} ${LIBS}"
+                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
                 OBJC_FOUNDATION="GNUstep"
-                CPPFLAGS="${GNUSTEP_CPPFLAGS} ${CPPFLAGS}"
-                LIBS="${GNUSTEP_LIBS} ${LIBS}"
-                LDFLAGS="${GNUSTEP_LDFLAGS} ${LDFLAGS}"
+                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])
@@ -405 +410 @@
         fi
 
+        AC_SUBST([OBJC_FOUNDATION])
+        AC_SUBST([OBJC_FOUNDATION_LDFLAGS])
+        AC_SUBST([OBJC_FOUNDATION_CPPFLAGS])
+        AC_SUBST([OBJC_FOUNDATION_LIBS])
+
         AC_LANG_POP([Objective C])
 ])

trunk/base/src/tclobjc1.0/Makefile.in

@@ -7 +7 @@
 include ../../Mk/macports.tea.mk
 
+LDFLAGS+=       ${OBJC_FOUNDATION_LDFLAGS}
+CPPFLAGS+=      ${OBJC_FOUNDATION_CPPFLAGS}
+LIBS+=  ${OBJC_FOUNDATION_LIBS}
+
 distclean::
         rm -f Makefile