Changeset 2279


Ignore:
Timestamp:
Jan 30, 2012 11:39:47 AM (8 years ago)
Author:
bradbell
Message:
  1. Another attempt to fix linking a boost library different from one installed

in the system location.

  1. Update version numbers becasue configure.ac changes.
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/AUTHORS

    r2276 r2279  
    22             ===========================================
    33
    4 To date, 2012-01-27, Bradley M. Bell is the sole author of CppAD.
     4To date, 2012-01-30, Bradley M. Bell is the sole author of CppAD.
    55While Bradley M. Bell worked for the University of Washington during
    66the development of CppAD, the following are also true:
  • trunk/configure

    r2277 r2279  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.68 for CppAD 20120127.
     3# Generated by GNU Autoconf 2.68 for CppAD 20120130.
    44#
    55# Report bugs to <cppad@list.coin-or.org>.
     
    561561PACKAGE_NAME='CppAD'
    562562PACKAGE_TARNAME='cppad'
    563 PACKAGE_VERSION='20120127'
    564 PACKAGE_STRING='CppAD 20120127'
     563PACKAGE_VERSION='20120130'
     564PACKAGE_STRING='CppAD 20120130'
    565565PACKAGE_BUGREPORT='cppad@list.coin-or.org'
    566566PACKAGE_URL=''
     
    610610CPPAD_IPOPT_LIBS
    611611CPPAD_IPOPT_LD_PATH
     612BTHREAD_LIB
    612613CppAD_BTHREAD_FALSE
    613614CppAD_BTHREAD_TRUE
    614 BTHREAD_LIB
    615615DL_LIB
    616616PTHREAD_LIB
     
    13351335  # This message is too long to be a string in the A/UX 3.1 sh.
    13361336  cat <<_ACEOF
    1337 \`configure' configures CppAD 20120127 to adapt to many kinds of systems.
     1337\`configure' configures CppAD 20120130 to adapt to many kinds of systems.
    13381338
    13391339Usage: $0 [OPTION]... [VAR=VALUE]...
     
    14011401if test -n "$ac_init_help"; then
    14021402  case $ac_init_help in
    1403      short | recursive ) echo "Configuration of CppAD 20120127:";;
     1403     short | recursive ) echo "Configuration of CppAD 20120130:";;
    14041404   esac
    14051405  cat <<\_ACEOF
     
    15191519if $ac_init_version; then
    15201520  cat <<\_ACEOF
    1521 CppAD configure 20120127
     1521CppAD configure 20120130
    15221522generated by GNU Autoconf 2.68
    15231523
     
    21432143running configure, to aid debugging if configure makes a mistake.
    21442144
    2145 It was created by CppAD $as_me 20120127, which was
     2145It was created by CppAD $as_me 20120130, which was
    21462146generated by GNU Autoconf 2.68.  Invocation command line was
    21472147
     
    47994799# Define the identity of the package.
    48004800 PACKAGE='cppad'
    4801  VERSION='20120127'
     4801 VERSION='20120130'
    48024802
    48034803
     
    62836283LDFLAGS_save=$LDFLAGS
    62846284CXXFLAGS_save=$CXXFLAGS
    6285 if test "$BOOST_DIR" != "" ; then
     6285boost_thread_found='no'
     6286if test "$BOOST_DIR" != '' ; then
    62866287        CXXFLAGS="-I$BOOST_DIR/include $CXXFLAGS"
    6287         LDFLAGS_tmp="$LDFLAGS_save -L$BOOST_DIR/lib"
    6288 else
    6289         LDFLAGS_tmp="$LDFLAGS_save"
    6290 fi
    6291 LDFLAGS="$LDFLAGS_tmp -lboost_thread"
     6288fi
     6289if test "$BOOST_DIR" == '' && test "$boost_thread_found" == 'no' ; then
     6290        bthread_lib='-lboost_thread-mt'
     6291        LDFLAGS="$LDFLAGS_save $bthread_lib"
    62926292
    62936293cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     
    63046304_ACEOF
    63056305if ac_fn_cxx_try_link "$LINENO"; then :
    6306   boost_thread="yes"
    6307 else
    6308   boost_thread="no"
     6306  boost_thread_found='yes'
     6307else
     6308  boost_thread_found='no'
    63096309
    63106310fi
    63116311rm -f core conftest.err conftest.$ac_objext \
    63126312    conftest$ac_exeext conftest.$ac_ext
    6313 if test "$boost_thread" == "yes" ; then
    6314         BTHREAD_LIB="-lboost_thread"
    6315 
    6316 else
    6317         LDFLAGS="$LDFLAGS_tmp -lboost_thread-mt"
     6313fi
     6314if test "$BOOST_DIR" != '' && test "$boost_thread_found" == 'no' ; then
     6315        bthread_lib="$BOOST_DIR/lib/libboost_thread-mt.so"
     6316        LDFLAGS="$LDFLAGS_save $bthread_lib"
    63186317        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    63196318/* end confdefs.h.  */
     
    63296328_ACEOF
    63306329if ac_fn_cxx_try_link "$LINENO"; then :
    6331   boost_thread="yes"
    6332 else
    6333   boost_thread="no"
     6330  boost_thread_found='yes'
     6331else
     6332  boost_thread_found='no'
    63346333
    63356334fi
    63366335rm -f core conftest.err conftest.$ac_objext \
    63376336    conftest$ac_exeext conftest.$ac_ext
    6338         if test "$boost_thread" == "yes" ; then
    6339                 BTHREAD_LIB="-lboost_thread-mt"
    6340 
    6341         fi
    6342 fi
    6343 if test "$boost_thread" == "yes" ; then
     6337fi
     6338if test "$BOOST_DIR" != '' && test "$boost_thread_found" == 'no' ; then
     6339        bthread_lib="$BOOST_DIR/lib/libboost_thread-mt.a"
     6340        LDFLAGS="$LDFLAGS_save $bthread_lib"
     6341        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     6342/* end confdefs.h.  */
     6343# include <boost/thread.hpp>
     6344int
     6345main ()
     6346{
     6347boost::barrier wait(1);
     6348
     6349  ;
     6350  return 0;
     6351}
     6352_ACEOF
     6353if ac_fn_cxx_try_link "$LINENO"; then :
     6354  boost_thread_found='yes'
     6355else
     6356  boost_thread_found='no'
     6357
     6358fi
     6359rm -f core conftest.err conftest.$ac_objext \
     6360    conftest$ac_exeext conftest.$ac_ext
     6361fi
     6362if test "$BOOST_DIR" == '' && test "$boost_thread_found" == 'no' ; then
     6363        bthread_lib='-lboost_thread'
     6364        LDFLAGS="$LDFLAGS_save $bthread_lib"
     6365        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     6366/* end confdefs.h.  */
     6367# include <boost/thread.hpp>
     6368int
     6369main ()
     6370{
     6371boost::barrier wait(1);
     6372
     6373  ;
     6374  return 0;
     6375}
     6376_ACEOF
     6377if ac_fn_cxx_try_link "$LINENO"; then :
     6378  boost_thread_found='yes'
     6379else
     6380  boost_thread_found='no'
     6381
     6382fi
     6383rm -f core conftest.err conftest.$ac_objext \
     6384    conftest$ac_exeext conftest.$ac_ext
     6385fi
     6386if test "$BOOST_DIR" != '' && test "$boost_thread_found" == 'no' ; then
     6387        bthread_lib="$BOOST_DIR/lib/libboost_thread.so"
     6388        LDFLAGS="$LDFLAGS_save $bthread_lib"
     6389        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     6390/* end confdefs.h.  */
     6391# include <boost/thread.hpp>
     6392int
     6393main ()
     6394{
     6395boost::barrier wait(1);
     6396
     6397  ;
     6398  return 0;
     6399}
     6400_ACEOF
     6401if ac_fn_cxx_try_link "$LINENO"; then :
     6402  boost_thread_found='yes'
     6403else
     6404  boost_thread_found='no'
     6405
     6406fi
     6407rm -f core conftest.err conftest.$ac_objext \
     6408    conftest$ac_exeext conftest.$ac_ext
     6409fi
     6410if test "$BOOST_DIR" != '' && test "$boost_thread_found" == 'no' ; then
     6411        bthread_lib="$BOOST_DIR/lib/libboost_thread.a"
     6412        LDFLAGS="$LDFLAGS_save $bthread_lib"
     6413        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     6414/* end confdefs.h.  */
     6415# include <boost/thread.hpp>
     6416int
     6417main ()
     6418{
     6419boost::barrier wait(1);
     6420
     6421  ;
     6422  return 0;
     6423}
     6424_ACEOF
     6425if ac_fn_cxx_try_link "$LINENO"; then :
     6426  boost_thread_found='yes'
     6427else
     6428  boost_thread_found='no'
     6429
     6430fi
     6431rm -f core conftest.err conftest.$ac_objext \
     6432    conftest$ac_exeext conftest.$ac_ext
     6433fi
     6434 if test "$boost_thread_found" = 'yes'; then
     6435  CppAD_BTHREAD_TRUE=
     6436  CppAD_BTHREAD_FALSE='#'
     6437else
     6438  CppAD_BTHREAD_TRUE='#'
     6439  CppAD_BTHREAD_FALSE=
     6440fi
     6441
     6442if test "$boost_thread_found" == 'yes' ; then
     6443        BTHREAD_LIB="$bthread_lib"
     6444
    63446445        { $as_echo "$as_me:${as_lineno-$LINENO}: result: boost::thread library... yes" >&5
    63456446$as_echo "boost::thread library... yes" >&6; }
    63466447else
    6347         BTHREAD_LIB=""
     6448        BTHREAD_LIB=''
    63486449
    63496450        { $as_echo "$as_me:${as_lineno-$LINENO}: result: boost::thread library... no" >&5
    63506451$as_echo "boost::thread library... no" >&6; }
    63516452fi
    6352  if test "$boost_thread" = "yes"; then
    6353   CppAD_BTHREAD_TRUE=
    6354   CppAD_BTHREAD_FALSE='#'
    6355 else
    6356   CppAD_BTHREAD_TRUE='#'
    6357   CppAD_BTHREAD_FALSE=
    6358 fi
    6359 
    63606453LDFLAGS=$LDFLAGS_save
    63616454CXXFLAGS=$CXXFLAGS_save
     
    71647257# values after options handling.
    71657258ac_log="
    7166 This file was extended by CppAD $as_me 20120127, which was
     7259This file was extended by CppAD $as_me 20120130, which was
    71677260generated by GNU Autoconf 2.68.  Invocation command line was
    71687261
     
    72217314ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
    72227315ac_cs_version="\\
    7223 CppAD config.status 20120127
     7316CppAD config.status 20120130
    72247317configured by $0, generated by GNU Autoconf 2.68,
    72257318  with options \\"\$ac_cs_config\\"
  • trunk/configure.ac

    r2277 r2279  
    1313dnl Process this file with autoconf to produce a configure script.
    1414dnl   package   version              bug-report
    15 AC_INIT(CppAD, 20120127, cppad@list.coin-or.org)
     15AC_INIT(CppAD, 20120130, cppad@list.coin-or.org)
    1616AC_SUBST(PACKAGE_URL, "http://www.coin-or.org/CppAD")
    1717AC_SUBST(PACKAGE_DESCRIPTION, "Differentiation of C++ Algorithms")
     
    393393)
    394394dnl --------------------------------------------------------------------------
    395 dnl check for C++ libraries
     395dnl check for boost thread library
    396396AC_LANG_PUSH([C++])
    397397LDFLAGS_save=$LDFLAGS
    398398CXXFLAGS_save=$CXXFLAGS
    399 if test "$BOOST_DIR" != "" ; then
     399boost_thread_found='no'
     400if test "$BOOST_DIR" != '' ; then
    400401        CXXFLAGS="-I$BOOST_DIR/include $CXXFLAGS"
    401         LDFLAGS_tmp="$LDFLAGS_save -L$BOOST_DIR/lib"
    402 else
    403         LDFLAGS_tmp="$LDFLAGS_save"
    404 fi
    405 LDFLAGS="$LDFLAGS_tmp -lboost_thread"
    406 AC_LINK_IFELSE(
    407         [AC_LANG_PROGRAM(
    408                 [# include <boost/thread.hpp>],
    409                 [boost::barrier wait(1);]
    410         )],
    411         [boost_thread="yes"],
    412         [boost_thread="no"]
    413 )
    414 if test "$boost_thread" == "yes" ; then
    415         AC_SUBST(BTHREAD_LIB,"-lboost_thread")
    416 else
    417         LDFLAGS="$LDFLAGS_tmp -lboost_thread-mt"
     402fi
     403if test "$BOOST_DIR" == '' && test "$boost_thread_found" == 'no' ; then
     404        bthread_lib='-lboost_thread-mt'
     405        LDFLAGS="$LDFLAGS_save $bthread_lib"
    418406        AC_LINK_IFELSE(
    419407                [AC_LANG_PROGRAM(
     
    421409                        [boost::barrier wait(1);]
    422410                )],
    423                 [boost_thread="yes"],
    424                 [boost_thread="no"]
    425         )
    426         if test "$boost_thread" == "yes" ; then
    427                 AC_SUBST(BTHREAD_LIB,"-lboost_thread-mt")
    428         fi
    429 fi
    430 if test "$boost_thread" == "yes" ; then
     411                [boost_thread_found='yes'],
     412                [boost_thread_found='no']
     413        )
     414fi
     415if test "$BOOST_DIR" != '' && test "$boost_thread_found" == 'no' ; then
     416        bthread_lib="$BOOST_DIR/lib/libboost_thread-mt.so"
     417        LDFLAGS="$LDFLAGS_save $bthread_lib"
     418        AC_LINK_IFELSE(
     419                [AC_LANG_PROGRAM(
     420                        [# include <boost/thread.hpp>],
     421                        [boost::barrier wait(1);]
     422                )],
     423                [boost_thread_found='yes'],
     424                [boost_thread_found='no']
     425        )
     426fi
     427if test "$BOOST_DIR" != '' && test "$boost_thread_found" == 'no' ; then
     428        bthread_lib="$BOOST_DIR/lib/libboost_thread-mt.a"
     429        LDFLAGS="$LDFLAGS_save $bthread_lib"
     430        AC_LINK_IFELSE(
     431                [AC_LANG_PROGRAM(
     432                        [# include <boost/thread.hpp>],
     433                        [boost::barrier wait(1);]
     434                )],
     435                [boost_thread_found='yes'],
     436                [boost_thread_found='no']
     437        )
     438fi
     439if test "$BOOST_DIR" == '' && test "$boost_thread_found" == 'no' ; then
     440        bthread_lib='-lboost_thread'
     441        LDFLAGS="$LDFLAGS_save $bthread_lib"
     442        AC_LINK_IFELSE(
     443                [AC_LANG_PROGRAM(
     444                        [# include <boost/thread.hpp>],
     445                        [boost::barrier wait(1);]
     446                )],
     447                [boost_thread_found='yes'],
     448                [boost_thread_found='no']
     449        )
     450fi
     451if test "$BOOST_DIR" != '' && test "$boost_thread_found" == 'no' ; then
     452        bthread_lib="$BOOST_DIR/lib/libboost_thread.so"
     453        LDFLAGS="$LDFLAGS_save $bthread_lib"
     454        AC_LINK_IFELSE(
     455                [AC_LANG_PROGRAM(
     456                        [# include <boost/thread.hpp>],
     457                        [boost::barrier wait(1);]
     458                )],
     459                [boost_thread_found='yes'],
     460                [boost_thread_found='no']
     461        )
     462fi
     463if test "$BOOST_DIR" != '' && test "$boost_thread_found" == 'no' ; then
     464        bthread_lib="$BOOST_DIR/lib/libboost_thread.a"
     465        LDFLAGS="$LDFLAGS_save $bthread_lib"
     466        AC_LINK_IFELSE(
     467                [AC_LANG_PROGRAM(
     468                        [# include <boost/thread.hpp>],
     469                        [boost::barrier wait(1);]
     470                )],
     471                [boost_thread_found='yes'],
     472                [boost_thread_found='no']
     473        )
     474fi
     475AM_CONDITIONAL(CppAD_BTHREAD, test "$boost_thread_found" = 'yes')
     476if test "$boost_thread_found" == 'yes' ; then
     477        AC_SUBST(BTHREAD_LIB,"$bthread_lib")
    431478        AC_MSG_RESULT([boost::thread library... yes])
    432479else
    433         AC_SUBST(BTHREAD_LIB,"")
     480        AC_SUBST(BTHREAD_LIB,'')
    434481        AC_MSG_RESULT([boost::thread library... no])
    435482fi
    436 AM_CONDITIONAL(CppAD_BTHREAD, test "$boost_thread" = "yes")
    437483LDFLAGS=$LDFLAGS_save
    438484CXXFLAGS=$CXXFLAGS_save
  • trunk/cppad/configure.hpp

    r2276 r2279  
    4343cppad-yyyymmdd as a C string where yyyy is year, mm is month, and dd is day.
    4444*/
    45 # define CPPAD_PACKAGE_STRING "cppad-20120127"
     45# define CPPAD_PACKAGE_STRING "cppad-20120130"
    4646
    4747/*!
  • trunk/omh/whats_new_12.omh

    r2276 r2279  
    3434The purpose of this section is to
    3535assist you in learning about changes between various versions of CppAD.
     36
     37$head 01-30$$
     38Make another attempt to fix linking with boost threads where the wrong
     39version of the library is in the system include directory; i.e.,
     40to have $cref/BOOST_DIR/InstallUnix/BoostDir/$$ override the default
     41library.
    3642
    3743$head 01-27$$
Note: See TracChangeset for help on using the changeset viewer.