Changeset 6441 for trunk/admin

Show
Ignore:
Timestamp:
07/09/08 21:29:23 (5 months ago)
Author:
flynd
Message:

But boost flags in CPPFLAGS and LDFLAGS where they're actually used instead of just setting BOOST_CPPFLAGS and BOOST_LDFLAGS.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/admin/acinclude.m4.in

    r6423 r6441  
    343343dnl available at <http://randspringer.de/boost/index.html>. 
    344344dnl 
    345 dnl This macro calls: 
    346 dnl 
    347 dnl   AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS) 
    348 dnl 
    349 dnl And sets: 
     345dnl This macro sets: 
    350346dnl 
    351347dnl   HAVE_BOOST 
    … …  
    494490  fi 
    495491 
     492  CPPFLAGS="$CPPFLAGS_SAVED" 
     493  LDFLAGS="$LDFLAGS_SAVED" 
     494 
    496495  if test "$succeeded" != "yes" ; then 
    497496    if test "$_version" = "0" ; then 
    … …  
    501500    fi 
    502501  else 
    503     AC_SUBST(BOOST_CPPFLAGS) 
    504     AC_SUBST(BOOST_LDFLAGS) 
     502    CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" 
     503    LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" 
    505504    AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available]) 
    506505  fi 
    507  
    508   CPPFLAGS="$CPPFLAGS_SAVED" 
    509   LDFLAGS="$LDFLAGS_SAVED" 
    510 ]) 
    511  
     506]) 
     507