Changeset 2242


Ignore:
Timestamp:
Jun 9, 2011 1:29:43 PM (9 years ago)
Author:
stefan
Message:

set also PCLIBS/PCREQUIRES variables for first argument of COIN_CHECK_PACKAGE macros; they are not AC_SUBSTed

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/coin.m4

    r2238 r2242  
    31233123m4_toupper($1_CFLAGS)=
    31243124m4_toupper($1_DATA)=
     3125m4_toupper($1_DEPENDENCIES)=
     3126m4_toupper($1_PCLIBS)=
     3127m4_toupper($1_PCREQUIRES)=
     3128m4_toupper($1_DATA)=
    31253129AC_SUBST(m4_toupper($1_LIBS))
    31263130AC_SUBST(m4_toupper($1_CFLAGS))
     
    31503154       m4_tolower(coin_has_$1)=yes
    31513155       m4_toupper($1_LIBS)="$withval"
     3156       m4_toupper($1_PCLIBS)="$withval"
    31523157       coin_foreach_w([myvar], [$3], [
    31533158         m4_toupper(myvar)_PCLIBS="$withval $m4_toupper(myvar)_PCLIBS"
     
    32213226          m4_toupper($1_LIBS)=`echo " $m4_toupper($1_LIBS) " | [sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g']`
    32223227        fi
     3228        m4_toupper($1_PCREQUIRES)="$2"
    32233229   
    32243230        # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in $3
     
    32793285      AC_MSG_NOTICE([$1 DATA   is  $m4_toupper($1)_DATA])
    32803286    fi
    3281     if test -n "$m4_toupper($1)_CFLAGS" ; then
    3282       AC_MSG_NOTICE([$1 CFLAGS are $m4_toupper($1)_CFLAGS])
     3287    if test -n "$m4_toupper($1)_PCLIBS" ; then
     3288      AC_MSG_NOTICE([$1 PCLIBS are $m4_toupper($1)_PCLIBS])
     3289    fi
     3290    if test -n "$m4_toupper($1)_PCREQUIRES" ; then
     3291      AC_MSG_NOTICE([$1 PCREQUIRES are $m4_toupper($1)_PCREQUIRES])
    32833292    fi
    32843293    coin_foreach_w([myvar], [$3], [
     
    33543363m4_toupper($1_DATA)=
    33553364m4_toupper($1_DATA_INSTALLED)=
     3365m4_toupper($1_PCLIBS)=
     3366m4_toupper($1_PCREQUIRES)=
    33563367
    33573368# initial list of dependencies is "$2", but we need to filter out version number specifications (= x, <= x, >= x, != x)
     
    35443555  fi
    35453556
     3557  m4_toupper($1_PCREQUIRES)="$2"
    35463558  coin_foreach_w([myvar], [$3], [
    35473559    m4_toupper(myvar)_PCREQUIRES="$2 $m4_toupper(myvar)_PCREQUIRES"
Note: See TracChangeset for help on using the changeset viewer.