File tree Expand file tree Collapse file tree 1 file changed +3
-6
lines changed Expand file tree Collapse file tree 1 file changed +3
-6
lines changed Original file line number Diff line number Diff line change 590
590
591
591
if test x$use_boost = xyes; then
592
592
593
- BOOST_LIBS="$BOOST_LDFLAGS $BOOST_SYSTEM_LIB $BOOST_FILESYSTEM_LIB $BOOST_PROGRAM_OPTIONS_LIB $BOOST_THREAD_LIB"
593
+ BOOST_LIBS="$BOOST_LDFLAGS $BOOST_SYSTEM_LIB $BOOST_FILESYSTEM_LIB $BOOST_PROGRAM_OPTIONS_LIB $BOOST_THREAD_LIB $BOOST_CHRONO_LIB "
594
594
595
595
dnl Boost >= 1.50 uses sleep_for rather than the now-deprecated sleep, however
596
596
dnl it was broken from 1.50 to 1.52 when backed by nanosleep. Use sleep_for if
597
597
dnl a working version is available, else fall back to sleep. sleep was removed
598
598
dnl after 1.56.
599
599
dnl If neither is available, abort.
600
- dnl If sleep_for is used, boost_chrono becomes a requirement.
601
- if test x$ax_cv_boost_chrono = xyes; then
602
600
TEMP_LIBS="$LIBS"
603
- LIBS="$BOOST_LIBS $BOOST_CHRONO_LIB $ LIBS"
601
+ LIBS="$BOOST_LIBS $LIBS"
604
602
TEMP_CPPFLAGS="$CPPFLAGS"
605
603
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
606
604
AC_LINK_IFELSE ( [ AC_LANG_PROGRAM ( [ [
@@ -613,12 +611,11 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
613
611
choke me
614
612
#endif
615
613
] ] ) ] ,
616
- [ boost_sleep=yes; BOOST_LIBS="$BOOST_LIBS $BOOST_CHRONO_LIB";
614
+ [ boost_sleep=yes;
617
615
AC_DEFINE ( HAVE_WORKING_BOOST_SLEEP_FOR , 1 , [ Define this symbol if boost sleep_for works] ) ] ,
618
616
[ boost_sleep=no] )
619
617
LIBS="$TEMP_LIBS"
620
618
CPPFLAGS="$TEMP_CPPFLAGS"
621
- fi
622
619
623
620
if test x$boost_sleep != xyes; then
624
621
TEMP_LIBS="$LIBS"
You can’t perform that action at this time.
0 commit comments