Changeset 3243


Ignore:
Timestamp:
Jun 29, 2014 3:20:39 PM (5 years ago)
Author:
stefan
Message:

fix cflags/libs pkg-config call from previous commit; dependencies will not work anymore

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/coin.m4

    r3242 r3243  
    571571m4_toupper($1_CFLAGS)=
    572572m4_toupper($1_DATA)=
    573 m4_toupper($1_DEPENDENCIES)=
    574573m4_toupper($1_PCREQUIRES)=
    575574AC_SUBST(m4_toupper($1_LIBS))
    576575AC_SUBST(m4_toupper($1_CFLAGS))
    577576AC_SUBST(m4_toupper($1_DATA))
    578 AC_SUBST(m4_toupper($1_DEPENDENCIES))
    579577m4_foreach_w([myvar], [$3], [
     578  AC_SUBST(m4_toupper(myvar)_LIBS)
    580579  AC_SUBST(m4_toupper(myvar)_CFLAGS)
    581   AC_SUBST(m4_toupper(myvar)_LIBS)
    582580  AC_SUBST(m4_toupper(myvar)_PCREQUIRES)
    583   AC_SUBST(m4_toupper(myvar)_DEPENDENCIES)
    584581])
    585582
     
    713710m4_foreach_w([myvar],[$1],[
    714711  if test -n "${m4_toupper(myvar)_PCREQUIRES}" ; then
    715     m4_toupper(myvar)_CFLAGS=`$PKG_CONFIG --define-variable prefix=${COIN_DESTDIR}${prefix} ${m4_toupper(myvar)_PCREQUIRES}` --cflags ${m4_toupper(myvar)_CFLAGS}
    716     m4_toupper(myvar)_LIBS=`$PKG_CONFIG --define-variable prefix=${COIN_DESTDIR}${prefix} ${m4_toupper(myvar)_PCREQUIRES}` --libs ${m4_toupper(myvar)_LIBS}
    717     #TODO setup _DEPENDENCIES from _LIBS
    718   fi
    719    
     712    m4_toupper(myvar)_CFLAGS=`$PKG_CONFIG --define-variable prefix=${COIN_DESTDIR}${prefix} --cflags ${m4_toupper(myvar)_PCREQUIRES}` ${m4_toupper(myvar)_CFLAGS}
     713    m4_toupper(myvar)_LIBS=`$PKG_CONFIG --define-variable prefix=${COIN_DESTDIR}${prefix} --libs ${m4_toupper(myvar)_PCREQUIRES}` ${m4_toupper(myvar)_LIBS}
     714  fi
     715
    720716  if test 1 = 0 ; then  #change this test to enable a bit of debugging output
    721717    if test -n "${m4_toupper(myvar)_CFLAGS}" ; then
Note: See TracChangeset for help on using the changeset viewer.