Changeset 26709


Ignore:
Timestamp:
Jul 4, 2007, 8:37:52 PM (12 years ago)
Author:
landonf@…
Message:

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

Location:
trunk/base
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/Mk/macports.autoconf.mk.in

    r26177 r26709  
    2020OBJC_RUNTIME_FLAGS      = @OBJC_RUNTIME_FLAGS@
    2121OBJC_LIBS               = @OBJC_LIBS@
     22
     23OBJC_FOUNDATION         = @OBJC_FOUNDATION@
     24OBJC_FOUNDATION_CPPFLAGS        = @OBJC_FOUNDATION_CPPFLAGS@
     25OBJC_FOUNDATION_LDFLAGS = @OBJC_FOUNDATION_LDFLAGS@
     26OBJC_FOUNDATION_LIBS            = @OBJC_FOUNDATION_LIBS@
    2227
    2328TCL_CC                  = @TCL_CC@
  • trunk/base/configure

    r26186 r26709  
    704704OBJC_PTHREAD_LIBS
    705705OBJC_PTHREAD_CFLAGS
     706OBJC_FOUNDATION
     707OBJC_FOUNDATION_LDFLAGS
     708OBJC_FOUNDATION_CPPFLAGS
     709OBJC_FOUNDATION_LIBS
    706710HAVE_FRAMEWORK_COREFOUNDATION
    707711HAVE_FRAMEWORK_SYSTEMCONFIGURATION
     
    53875391        if test x"${ac_cv_objc_foundation_apple}" == x"yes"; then
    53885392                OBJC_FOUNDATION="Apple"
    5389                 CPPFLAGS="${APPLE_FOUNDATION_CPPFLAGS} ${CPPFLAGS}"
    5390                 LIBS="${APPLE_FOUNDATION_LIBS} ${LIBS}"
     5393                OBJC_FOUNDATION_CPPFLAGS="${APPLE_FOUNDATION_CFLAGS}"
     5394                OBJC_FOUNDATION_LIBS="${APPLE_FOUNDATION_LIBS}"
     5395                OBJC_FOUNDATION_LDFLAGS=""
    53915396
    53925397cat >>confdefs.h <<\_ACEOF
     
    53985403        elif test x"${ac_cv_objc_foundation_gnustep}" == x"yes"; then
    53995404                OBJC_FOUNDATION="GNUstep"
    5400                 CPPFLAGS="${GNUSTEP_CPPFLAGS} ${CPPFLAGS}"
    5401                 LIBS="${GNUSTEP_LIBS} ${LIBS}"
    5402                 LDFLAGS="${GNUSTEP_LDFLAGS} ${LDFLAGS}"
     5405                OBJC_FOUNDATION_CPPFLAGS="${GNUSTEP_CPPFLAGS}"
     5406                OBJC_FOUNDATION_LIBS="${GNUSTEP_LIBS}"
     5407                OBJC_FOUNDATION_LDFLAGS="${GNUSTEP_LDFLAGS}"
    54035408
    54045409cat >>confdefs.h <<\_ACEOF
     
    54135418   { (exit 1); exit 1; }; }
    54145419        fi
     5420
     5421
     5422
     5423
     5424
    54155425
    54165426        ac_ext=c
     
    1196811978OBJC_PTHREAD_LIBS!$OBJC_PTHREAD_LIBS$ac_delim
    1196911979OBJC_PTHREAD_CFLAGS!$OBJC_PTHREAD_CFLAGS$ac_delim
     11980OBJC_FOUNDATION!$OBJC_FOUNDATION$ac_delim
     11981OBJC_FOUNDATION_LDFLAGS!$OBJC_FOUNDATION_LDFLAGS$ac_delim
     11982OBJC_FOUNDATION_CPPFLAGS!$OBJC_FOUNDATION_CPPFLAGS$ac_delim
     11983OBJC_FOUNDATION_LIBS!$OBJC_FOUNDATION_LIBS$ac_delim
    1197011984HAVE_FRAMEWORK_COREFOUNDATION!$HAVE_FRAMEWORK_COREFOUNDATION$ac_delim
    1197111985HAVE_FRAMEWORK_SYSTEMCONFIGURATION!$HAVE_FRAMEWORK_SYSTEMCONFIGURATION$ac_delim
     
    1197411988REPLACEMENT_PROGS!$REPLACEMENT_PROGS$ac_delim
    1197511989EXTRA_PROGS!$EXTRA_PROGS$ac_delim
    11976 PORTSDIR!$PORTSDIR$ac_delim
    11977 MPCONFIGDIR!$MPCONFIGDIR$ac_delim
    11978 DSTUSR!$DSTUSR$ac_delim
    11979 DSTGRP!$DSTGRP$ac_delim
    1198011990_ACEOF
    1198111991
     
    1201912029for ac_last_try in false false false false false :; do
    1202012030  cat >conf$$subs.sed <<_ACEOF
     12031PORTSDIR!$PORTSDIR$ac_delim
     12032MPCONFIGDIR!$MPCONFIGDIR$ac_delim
     12033DSTUSR!$DSTUSR$ac_delim
     12034DSTGRP!$DSTGRP$ac_delim
    1202112035DSTMODE!$DSTMODE$ac_delim
    1202212036CPP!$CPP$ac_delim
     
    1206412078_ACEOF
    1206512079
    12066   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 43; then
     12080  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 47; then
    1206712081    break
    1206812082  elif $ac_last_try; then
  • trunk/base/foundation.m4

    r26177 r26709  
    276276#       Defines one of the following preprocessor macros:
    277277#               APPLE_FOUNDATION GNUSTEP_FOUNDATION
     278#
     279#       Substitutes the following variables:
     280#               OBJC_FOUNDATION OBJC_FOUNDATION_LDFLAGS
     281#               OBJC_FOUNDATION_CPPFLAGS OBJC_FOUNDATION_LIBS
    278282#------------------------------------------------------------------------
    279283AC_DEFUN([MP_OBJC_FOUNDATION],[
     
    390394        if test x"${ac_cv_objc_foundation_apple}" == x"yes"; then
    391395                OBJC_FOUNDATION="Apple"
    392                 CPPFLAGS="${APPLE_FOUNDATION_CPPFLAGS} ${CPPFLAGS}"
    393                 LIBS="${APPLE_FOUNDATION_LIBS} ${LIBS}"
     396                OBJC_FOUNDATION_CPPFLAGS="${APPLE_FOUNDATION_CFLAGS}"
     397                OBJC_FOUNDATION_LIBS="${APPLE_FOUNDATION_LIBS}"
     398                OBJC_FOUNDATION_LDFLAGS=""
    394399                AC_DEFINE([APPLE_FOUNDATION], 1, [Define if using the Apple Foundation framework])
    395400                AC_MSG_NOTICE([Using Apple Foundation library])
    396401        elif test x"${ac_cv_objc_foundation_gnustep}" == x"yes"; then
    397402                OBJC_FOUNDATION="GNUstep"
    398                 CPPFLAGS="${GNUSTEP_CPPFLAGS} ${CPPFLAGS}"
    399                 LIBS="${GNUSTEP_LIBS} ${LIBS}"
    400                 LDFLAGS="${GNUSTEP_LDFLAGS} ${LDFLAGS}"
     403                OBJC_FOUNDATION_CPPFLAGS="${GNUSTEP_CPPFLAGS}"
     404                OBJC_FOUNDATION_LIBS="${GNUSTEP_LIBS}"
     405                OBJC_FOUNDATION_LDFLAGS="${GNUSTEP_LDFLAGS}"
    401406                AC_DEFINE([GNUSTEP_FOUNDATION], 1, [Define if using the GNUstep Foundation library])
    402407                AC_MSG_NOTICE([Using GNUstep Foundation library])
     
    405410        fi
    406411
     412        AC_SUBST([OBJC_FOUNDATION])
     413        AC_SUBST([OBJC_FOUNDATION_LDFLAGS])
     414        AC_SUBST([OBJC_FOUNDATION_CPPFLAGS])
     415        AC_SUBST([OBJC_FOUNDATION_LIBS])
     416
    407417        AC_LANG_POP([Objective C])
    408418])
  • trunk/base/src/tclobjc1.0/Makefile.in

    r26188 r26709  
    77include ../../Mk/macports.tea.mk
    88
     9LDFLAGS+=       ${OBJC_FOUNDATION_LDFLAGS}
     10CPPFLAGS+=      ${OBJC_FOUNDATION_CPPFLAGS}
     11LIBS+=  ${OBJC_FOUNDATION_LIBS}
     12
    913distclean::
    1014        rm -f Makefile
Note: See TracChangeset for help on using the changeset viewer.