Changeset 2277


Ignore:
Timestamp:
Jan 27, 2012 1:51:24 PM (8 years ago)
Author:
bradbell
Message:

Change the order that the boost library names are checked so that first test
fails on test system (just to improve testing).

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure

    r2276 r2277  
    62896289        LDFLAGS_tmp="$LDFLAGS_save"
    62906290fi
    6291 LDFLAGS="$LDFLAGS_tmp -lboost_thread-mt"
     6291LDFLAGS="$LDFLAGS_tmp -lboost_thread"
    62926292
    62936293cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     
    63126312    conftest$ac_exeext conftest.$ac_ext
    63136313if test "$boost_thread" == "yes" ; then
    6314         BTHREAD_LIB="-lboost_thread-mt"
    6315 
    6316 else
    6317         LDFLAGS="$LDFLAGS_tmp -lboost_thread"
     6314        BTHREAD_LIB="-lboost_thread"
     6315
     6316else
     6317        LDFLAGS="$LDFLAGS_tmp -lboost_thread-mt"
    63186318        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    63196319/* end confdefs.h.  */
     
    63376337    conftest$ac_exeext conftest.$ac_ext
    63386338        if test "$boost_thread" == "yes" ; then
    6339                 BTHREAD_LIB="-lboost_thread"
     6339                BTHREAD_LIB="-lboost_thread-mt"
    63406340
    63416341        fi
  • trunk/configure.ac

    r2276 r2277  
    403403        LDFLAGS_tmp="$LDFLAGS_save"
    404404fi
    405 LDFLAGS="$LDFLAGS_tmp -lboost_thread-mt"
     405LDFLAGS="$LDFLAGS_tmp -lboost_thread"
    406406AC_LINK_IFELSE(
    407407        [AC_LANG_PROGRAM(
     
    413413)
    414414if test "$boost_thread" == "yes" ; then
    415         AC_SUBST(BTHREAD_LIB,"-lboost_thread-mt")
    416 else
    417         LDFLAGS="$LDFLAGS_tmp -lboost_thread"
     415        AC_SUBST(BTHREAD_LIB,"-lboost_thread")
     416else
     417        LDFLAGS="$LDFLAGS_tmp -lboost_thread-mt"
    418418        AC_LINK_IFELSE(
    419419                [AC_LANG_PROGRAM(
     
    425425        )
    426426        if test "$boost_thread" == "yes" ; then
    427                 AC_SUBST(BTHREAD_LIB,"-lboost_thread")
     427                AC_SUBST(BTHREAD_LIB,"-lboost_thread-mt")
    428428        fi
    429429fi
Note: See TracChangeset for help on using the changeset viewer.