From: Oliver O. <fr...@us...> - 2007-06-17 12:16:51
|
Update of /cvsroot/simspark/simspark/spark In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv17598 Modified Files: Tag: projectx acinclude.m4 Log Message: added check for boost thread lib Index: acinclude.m4 =================================================================== RCS file: /cvsroot/simspark/simspark/spark/acinclude.m4,v retrieving revision 1.4.2.2.2.1 retrieving revision 1.4.2.2.2.2 diff -C2 -d -r1.4.2.2.2.1 -r1.4.2.2.2.2 *** acinclude.m4 7 Mar 2007 10:01:45 -0000 1.4.2.2.2.1 --- acinclude.m4 17 Jun 2007 12:08:34 -0000 1.4.2.2.2.2 *************** *** 466,470 **** # RCSS_BOOST_REGEX([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # --------------------------------------------------------- ! # Checks for the spades library AC_DEFUN([RCSS_BOOST_REGEX], [AS_VAR_PUSHDEF([rcss_boost_regex], [rcss_cv_boost_regex])dnl --- 466,470 ---- # RCSS_BOOST_REGEX([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # --------------------------------------------------------- ! # Checks for the boost library AC_DEFUN([RCSS_BOOST_REGEX], [AS_VAR_PUSHDEF([rcss_boost_regex], [rcss_cv_boost_regex])dnl *************** *** 483,484 **** --- 483,510 ---- ])# RCSS_BOOST_REGEX + # RCSS_BOOST_THREADS_LIB + # --------------------------------------------------------- + # Checks for the boost threads library under various names + # Substitutes: @BOOST_THREADS_LIB@ + AC_DEFUN([RCSS_BOOST_THREADS_LIB], [ + AC_MSG_CHECKING(boost thread library) + AC_LANG_PUSH(C++) + OLD_LDFLAGS="$LDFLAGS" + LDFLAGS="$OLDLDFLAGS -lboost_thread" + AC_LINK_IFELSE([int main() { return 0; }], + [rcss_boost_threads_lib=boost_thread], + [LDFLAGS="$OLDLDFLAGS -lboost_thread-mt" + AC_LINK_IFELSE([int main() { return 0; }], + [rcss_boost_threads_lib=boost_thread-mt], + [ LDFLAGS="$OLDLDFLAGS -lboost_thread-gcc-mt" + AC_LINK_IFELSE([int main() { return 0; }], + [rcss_boost_threads_lib=boost_thread-gcc-mt], + [rcss_boost_threads_lib=]) + ]) + ]) + LDFLAGS="$OLD_LDFLAGS" + AC_LANG_POP(C++) + BOOST_THREADS_LIB=$rcss_boost_threads_lib + AC_MSG_RESULT($rcss_boost_threads_lib) + AC_SUBST(BOOST_THREADS_LIB) + ])# RCSS_BOOST_THREADS_LIBS |