From: Karel G. <kg...@us...> - 2001-12-19 18:54:54
|
Update of /cvsroot/micomt/mico In directory usw-pr-cvs1:/tmp/cvs-serv12102 Modified Files: configure.in Log Message: - first attempt to support *BSD Index: configure.in =================================================================== RCS file: /cvsroot/micomt/mico/configure.in,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -r1.29 -r1.30 *** configure.in 2001/11/24 19:45:26 1.29 --- configure.in 2001/12/19 18:54:47 1.30 *************** *** 297,302 **** use_threads=yes else ! echo "" ! AC_MSG_ERROR("Your platform does not support Solaris threads !") fi fi --- 297,314 ---- use_threads=yes else ! AC_CHECK_LIB(c_r, pthread_create, use_pthreads=yes, use_pthreads=no) ! if test X"$use_pthreads" = Xyes; then ! AC_CHECK_HEADERS(pthread.h semaphore.h sched.h,, ! AC_MSG_ERROR(pthread header files incomplete) ! ) ! AC_DEFINE(HAVE_PTHREADS) ! #SHLIBS="-lpthread" ! LDFLAGS="-pthread $LDFLAGS" ! platform_supports_threads=yes ! use_threads=yes ! else ! echo "" ! AC_MSG_ERROR("Your platform does not support POSIX-threads !") ! fi fi fi *************** *** 389,410 **** SHLIBS="-lpthread" else ! AC_CHECK_LIB(cma, open, use_dcethreads=yes, use_dcethreads=no) ! if test X"$use_dcethreads" = Xyes; then ! AC_CHECK_HEADERS(pthread.h semaphore.h sched.h,, ! AC_MSG_ERROR(DCE pthread header files incomplete) ) ! AC_DEFINE(HAVE_DCE_THREADS) ! SHLIBS="-lcma" else ! AC_CHECK_PROG(pth-config, use_pth_threads=yes, use_pth_threads=no) ! SHLIBS="`pth-config --libs`" fi fi fi ! else ! use_pthreads=no ! use_dcethreads=no ! use_solaris_threads=no ! use_pth_threads=no fi fi --- 401,456 ---- SHLIBS="-lpthread" else ! AC_CHECK_LIB(c_r, pthread_create, use_pthreads=yes, use_pthreads=no) ! if test X"$use_pthreads" = Xyes; then ! AC_CHECK_HEADERS(pthread.h semaphore.h sched.h,, ! AC_MSG_ERROR(pthread header files incomplete) ) ! AC_DEFINE(HAVE_PTHREADS) ! #SHLIBS="-lpthread" ! LDFLAGS="-pthread $LDFLAGS" ! platform_supports_threads=yes ! use_threads=yes else ! AC_CHECK_LIB(cma, open, use_dcethreads=yes, use_dcethreads=no) ! if test X"$use_dcethreads" = Xyes; then ! AC_CHECK_HEADERS(pthread.h semaphore.h sched.h,, ! AC_MSG_ERROR(DCE pthread header files incomplete) ! ) ! AC_DEFINE(HAVE_DCE_THREADS) ! SHLIBS="-lcma" ! else ! AC_CHECK_PROG(pth_config_prog, pth-config, yes, no) ! if test X"$pth_config_prog" = Xyes; then ! PTH_HEADERS=`pth-config --cflags` ! PTH_LDFLAGS=`pth-config --ldflags` ! PTH_LIBS=`pth-config --libs` ! CFLAGS="$PTH_HEADERS $CFLAGS" ! CXXFLAGS="$PTH_HEADERS $CXXFLAGS" ! LDFLAGS="$PTH_LDFLAGS $LDFLAGS" ! PTH_INCLUDE_DIR=`pth-config --includedir` ! PTH_LIB_DIR=`pth-config --libdir` ! AC_CHECK_HEADER($PTH_INCLUDE_DIR/pth.h) ! AC_CHECK_LIB(pth, pth_init, pth_lib=yes, pth_lib=no, "-L$PTH_LIB_DIR") ! AC_DEFINE(HAVE_PTH_THREADS) ! AC_DEFINE(HAVE_PTH_H) ! SHLIBS=$PTH_LIBS ! use_pth_threads=yes ! platform_supports_threads=yes ! use_threads=yes ! else ! use_pthreads=no ! use_dcethreads=no ! use_solaris_threads=no ! use_pth_threads=no ! fi ! fi fi fi fi ! # else ! # use_pthreads=no ! # use_dcethreads=no ! # use_solaris_threads=no ! # use_pth_threads=no fi fi *************** *** 412,416 **** --- 458,467 ---- service_disabled=no + if test X"$use_threads" = Xyes; then + if test X"$use_pthreads" = Xno -a X"$use_dcethreads" = Xno -a X"$use_solaris_threads" = Xno -a X"$use_pth_threads" = Xno; then + echo "" + AC_MSG_ERROR([MICO does not support the thread package for your platform, please remove --enable-threads from your configure command-line and run configure again]) + fi if test X"$use_mini_stl" = Xyes; then # don't use mini-stl with treads *************** *** 455,462 **** service_disabled=yes fi - fi - if test X"$use_pthreads" = Xno -a X"$use_dcethreads" = Xno -a X"$use_solaris_threads" = Xno -a X"$use_pth_threads" = Xno; then - AC_MSG_ERROR([MICO does not support the thread package for your platform, - please remove --enable-threads from your configure command-line to build]) fi AC_DEFINE(HAVE_THREADS) --- 506,509 ---- |