Changeset 2684


Ignore:
Timestamp:
Dec 2, 2012 1:02:29 PM (7 years ago)
Author:
stefan
Message:

sync with trunk: added --disable-pthread-mumps

Location:
ThirdParty/Mumps/stable/1.4
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Mumps/stable/1.4

  • ThirdParty/Mumps/stable/1.4/configure

    r2635 r2684  
    10831083                          icl/link). Default when mentioned: mingw. Default
    10841084                          when not mentioned: disabled.
     1085  --disable-pthread-mumps disable use of pthread library
    10851086  --enable-static[=PKGS]
    10861087                          build static libraries [default=no]
     
    34663467
    34673468# Provide some information about the compiler.
    3468 echo "$as_me:3468:" \
     3469echo "$as_me:3469:" \
    34693470     "checking for Fortran 77 compiler version" >&5
    34703471ac_compiler=`set X $ac_compile; echo $2`
     
    40374038ac_save_FFLAGS=$FFLAGS
    40384039FFLAGS="$FFLAGS $ac_verb"
    4039 (eval echo $as_me:4039: \"$ac_link\") >&5
     4040(eval echo $as_me:4040: \"$ac_link\") >&5
    40404041ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    40414042echo "$ac_f77_v_output" >&5
     
    41154116ac_save_FFLAGS=$FFLAGS
    41164117FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
    4117 (eval echo $as_me:4117: \"$ac_link\") >&5
     4118(eval echo $as_me:4118: \"$ac_link\") >&5
    41184119ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    41194120echo "$ac_f77_v_output" >&5
     
    49024903esac
    49034904
    4904 # check for pthread.h header file
    4905 ac_ext=c
     4905# Mumps can make use of pthreads
     4906# check for pthread.h header file and library
     4907# Check whether --enable-pthread-mumps or --disable-pthread-mumps was given.
     4908if test "${enable_pthread_mumps+set}" = set; then
     4909  enableval="$enable_pthread_mumps"
     4910  enable_pthread_mumps=$enableval
     4911else
     4912  enable_pthread_mumps=yes
     4913fi;
     4914if test $enable_pthread_mumps = yes ; then
     4915  ac_ext=c
    49064916ac_cpp='$CPP $CPPFLAGS'
    49074917ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     
    54045414#  hdr=""
    54055415#fi
    5406 #AC_CHECK_HEADERS([pthread.h],[],[MY_DEFS="$MY_DEFS -DWITHOUT_PTHREAD=1"],[$hdr])
     5416#AC_CHECK_HEADERS([pthread.h],[],[enable_pthread_mumps=no],[$hdr])
    54075417
    54085418for ac_header in pthread.h
     
    55525562
    55535563else
     5564  enable_pthread_mumps=no
     5565fi
     5566
     5567done
     5568
     5569
     5570fi
     5571if test $enable_pthread_mumps = yes ; then
     5572  echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
     5573echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
     5574if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
     5575  echo $ECHO_N "(cached) $ECHO_C" >&6
     5576else
     5577  ac_check_lib_save_LIBS=$LIBS
     5578LIBS="-lpthread  $LIBS"
     5579cat >conftest.$ac_ext <<_ACEOF
     5580/* confdefs.h.  */
     5581_ACEOF
     5582cat confdefs.h >>conftest.$ac_ext
     5583cat >>conftest.$ac_ext <<_ACEOF
     5584/* end confdefs.h.  */
     5585
     5586/* Override any gcc2 internal prototype to avoid an error.  */
     5587#ifdef __cplusplus
     5588extern "C"
     5589#endif
     5590/* We use char because int might match the return type of a gcc2
     5591   builtin and then its argument prototype would still apply.  */
     5592char pthread_create ();
     5593#ifdef F77_DUMMY_MAIN
     5594
     5595#  ifdef __cplusplus
     5596     extern "C"
     5597#  endif
     5598   int F77_DUMMY_MAIN() { return 1; }
     5599
     5600#endif
     5601int
     5602main ()
     5603{
     5604pthread_create ();
     5605  ;
     5606  return 0;
     5607}
     5608_ACEOF
     5609rm -f conftest.$ac_objext conftest$ac_exeext
     5610if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
     5611  (eval $ac_link) 2>conftest.er1
     5612  ac_status=$?
     5613  grep -v '^ *+' conftest.er1 >conftest.err
     5614  rm -f conftest.er1
     5615  cat conftest.err >&5
     5616  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     5617  (exit $ac_status); } &&
     5618         { ac_try='test -z "$ac_c_werror_flag"
     5619                         || test ! -s conftest.err'
     5620  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     5621  (eval $ac_try) 2>&5
     5622  ac_status=$?
     5623  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     5624  (exit $ac_status); }; } &&
     5625         { ac_try='test -s conftest$ac_exeext'
     5626  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     5627  (eval $ac_try) 2>&5
     5628  ac_status=$?
     5629  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     5630  (exit $ac_status); }; }; then
     5631  ac_cv_lib_pthread_pthread_create=yes
     5632else
     5633  echo "$as_me: failed program was:" >&5
     5634sed 's/^/| /' conftest.$ac_ext >&5
     5635
     5636ac_cv_lib_pthread_pthread_create=no
     5637fi
     5638rm -f conftest.err conftest.$ac_objext \
     5639      conftest$ac_exeext conftest.$ac_ext
     5640LIBS=$ac_check_lib_save_LIBS
     5641fi
     5642echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
     5643echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
     5644if test $ac_cv_lib_pthread_pthread_create = yes; then
     5645  MUMPS_PCLIBS="-lpthread $MUMPS_PCLIBS"
     5646else
     5647  enable_pthread_mumps=no
     5648fi
     5649
     5650fi
     5651if test $enable_pthread_mumps = no ; then
    55545652  MY_DEFS="$MY_DEFS -DWITHOUT_PTHREAD=1"
    55555653fi
    5556 
    5557 done
    5558 
    5559 
    55605654
    55615655MY_DEFS="$MY_DEFS -DALLOW_NON_INIT -DMUMPS_ARITH=MUMPS_ARITH_d"
     
    71867280*-*-irix6*)
    71877281  # Find out which ABI we are using.
    7188   echo '#line 7188 "configure"' > conftest.$ac_ext
     7282  echo '#line 7282 "configure"' > conftest.$ac_ext
    71897283  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    71907284  (eval $ac_compile) 2>&5
     
    91829276   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    91839277   -e 's:$: $lt_compiler_flag:'`
    9184    (eval echo "\"\$as_me:9184: $lt_compile\"" >&5)
     9278   (eval echo "\"\$as_me:9278: $lt_compile\"" >&5)
    91859279   (eval "$lt_compile" 2>conftest.err)
    91869280   ac_status=$?
    91879281   cat conftest.err >&5
    9188    echo "$as_me:9188: \$? = $ac_status" >&5
     9282   echo "$as_me:9282: \$? = $ac_status" >&5
    91899283   if (exit $ac_status) && test -s "$ac_outfile"; then
    91909284     # The compiler can only warn and ignore the option if not recognized
     
    94509544   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    94519545   -e 's:$: $lt_compiler_flag:'`
    9452    (eval echo "\"\$as_me:9452: $lt_compile\"" >&5)
     9546   (eval echo "\"\$as_me:9546: $lt_compile\"" >&5)
    94539547   (eval "$lt_compile" 2>conftest.err)
    94549548   ac_status=$?
    94559549   cat conftest.err >&5
    9456    echo "$as_me:9456: \$? = $ac_status" >&5
     9550   echo "$as_me:9550: \$? = $ac_status" >&5
    94579551   if (exit $ac_status) && test -s "$ac_outfile"; then
    94589552     # The compiler can only warn and ignore the option if not recognized
     
    95549648   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    95559649   -e 's:$: $lt_compiler_flag:'`
    9556    (eval echo "\"\$as_me:9556: $lt_compile\"" >&5)
     9650   (eval echo "\"\$as_me:9650: $lt_compile\"" >&5)
    95579651   (eval "$lt_compile" 2>out/conftest.err)
    95589652   ac_status=$?
    95599653   cat out/conftest.err >&5
    9560    echo "$as_me:9560: \$? = $ac_status" >&5
     9654   echo "$as_me:9654: \$? = $ac_status" >&5
    95619655   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    95629656   then
     
    1197112065  lt_status=$lt_dlunknown
    1197212066  cat > conftest.$ac_ext <<EOF
    11973 #line 11973 "configure"
     12067#line 12067 "configure"
    1197412068#include "confdefs.h"
    1197512069
     
    1207112165  lt_status=$lt_dlunknown
    1207212166  cat > conftest.$ac_ext <<EOF
    12073 #line 12073 "configure"
     12167#line 12167 "configure"
    1207412168#include "confdefs.h"
    1207512169
     
    1443114525   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1443214526   -e 's:$: $lt_compiler_flag:'`
    14433    (eval echo "\"\$as_me:14433: $lt_compile\"" >&5)
     14527   (eval echo "\"\$as_me:14527: $lt_compile\"" >&5)
    1443414528   (eval "$lt_compile" 2>conftest.err)
    1443514529   ac_status=$?
    1443614530   cat conftest.err >&5
    14437    echo "$as_me:14437: \$? = $ac_status" >&5
     14531   echo "$as_me:14531: \$? = $ac_status" >&5
    1443814532   if (exit $ac_status) && test -s "$ac_outfile"; then
    1443914533     # The compiler can only warn and ignore the option if not recognized
     
    1453514629   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1453614630   -e 's:$: $lt_compiler_flag:'`
    14537    (eval echo "\"\$as_me:14537: $lt_compile\"" >&5)
     14631   (eval echo "\"\$as_me:14631: $lt_compile\"" >&5)
    1453814632   (eval "$lt_compile" 2>out/conftest.err)
    1453914633   ac_status=$?
    1454014634   cat out/conftest.err >&5
    14541    echo "$as_me:14541: \$? = $ac_status" >&5
     14635   echo "$as_me:14635: \$? = $ac_status" >&5
    1454214636   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1454314637   then
     
    1610516199   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1610616200   -e 's:$: $lt_compiler_flag:'`
    16107    (eval echo "\"\$as_me:16107: $lt_compile\"" >&5)
     16201   (eval echo "\"\$as_me:16201: $lt_compile\"" >&5)
    1610816202   (eval "$lt_compile" 2>conftest.err)
    1610916203   ac_status=$?
    1611016204   cat conftest.err >&5
    16111    echo "$as_me:16111: \$? = $ac_status" >&5
     16205   echo "$as_me:16205: \$? = $ac_status" >&5
    1611216206   if (exit $ac_status) && test -s "$ac_outfile"; then
    1611316207     # The compiler can only warn and ignore the option if not recognized
     
    1620916303   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1621016304   -e 's:$: $lt_compiler_flag:'`
    16211    (eval echo "\"\$as_me:16211: $lt_compile\"" >&5)
     16305   (eval echo "\"\$as_me:16305: $lt_compile\"" >&5)
    1621216306   (eval "$lt_compile" 2>out/conftest.err)
    1621316307   ac_status=$?
    1621416308   cat out/conftest.err >&5
    16215    echo "$as_me:16215: \$? = $ac_status" >&5
     16309   echo "$as_me:16309: \$? = $ac_status" >&5
    1621616310   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1621716311   then
     
    1841618510   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1841718511   -e 's:$: $lt_compiler_flag:'`
    18418    (eval echo "\"\$as_me:18418: $lt_compile\"" >&5)
     18512   (eval echo "\"\$as_me:18512: $lt_compile\"" >&5)
    1841918513   (eval "$lt_compile" 2>conftest.err)
    1842018514   ac_status=$?
    1842118515   cat conftest.err >&5
    18422    echo "$as_me:18422: \$? = $ac_status" >&5
     18516   echo "$as_me:18516: \$? = $ac_status" >&5
    1842318517   if (exit $ac_status) && test -s "$ac_outfile"; then
    1842418518     # The compiler can only warn and ignore the option if not recognized
     
    1868418778   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1868518779   -e 's:$: $lt_compiler_flag:'`
    18686    (eval echo "\"\$as_me:18686: $lt_compile\"" >&5)
     18780   (eval echo "\"\$as_me:18780: $lt_compile\"" >&5)
    1868718781   (eval "$lt_compile" 2>conftest.err)
    1868818782   ac_status=$?
    1868918783   cat conftest.err >&5
    18690    echo "$as_me:18690: \$? = $ac_status" >&5
     18784   echo "$as_me:18784: \$? = $ac_status" >&5
    1869118785   if (exit $ac_status) && test -s "$ac_outfile"; then
    1869218786     # The compiler can only warn and ignore the option if not recognized
     
    1878818882   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1878918883   -e 's:$: $lt_compiler_flag:'`
    18790    (eval echo "\"\$as_me:18790: $lt_compile\"" >&5)
     18884   (eval echo "\"\$as_me:18884: $lt_compile\"" >&5)
    1879118885   (eval "$lt_compile" 2>out/conftest.err)
    1879218886   ac_status=$?
    1879318887   cat out/conftest.err >&5
    18794    echo "$as_me:18794: \$? = $ac_status" >&5
     18888   echo "$as_me:18888: \$? = $ac_status" >&5
    1879518889   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1879618890   then
     
    2579325887  MY_FDEFS="$MY_FDEFS -Dmetis"
    2579425888fi
    25795 
    25796 # Mumps can make use of pthreads
    25797 echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
    25798 echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
    25799 if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
    25800   echo $ECHO_N "(cached) $ECHO_C" >&6
    25801 else
    25802   ac_check_lib_save_LIBS=$LIBS
    25803 LIBS="-lpthread  $LIBS"
    25804 cat >conftest.$ac_ext <<_ACEOF
    25805 /* confdefs.h.  */
    25806 _ACEOF
    25807 cat confdefs.h >>conftest.$ac_ext
    25808 cat >>conftest.$ac_ext <<_ACEOF
    25809 /* end confdefs.h.  */
    25810 
    25811 /* Override any gcc2 internal prototype to avoid an error.  */
    25812 #ifdef __cplusplus
    25813 extern "C"
    25814 #endif
    25815 /* We use char because int might match the return type of a gcc2
    25816    builtin and then its argument prototype would still apply.  */
    25817 char pthread_create ();
    25818 #ifdef F77_DUMMY_MAIN
    25819 
    25820 #  ifdef __cplusplus
    25821      extern "C"
    25822 #  endif
    25823    int F77_DUMMY_MAIN() { return 1; }
    25824 
    25825 #endif
    25826 int
    25827 main ()
    25828 {
    25829 pthread_create ();
    25830   ;
    25831   return 0;
    25832 }
    25833 _ACEOF
    25834 rm -f conftest.$ac_objext conftest$ac_exeext
    25835 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    25836   (eval $ac_link) 2>conftest.er1
    25837   ac_status=$?
    25838   grep -v '^ *+' conftest.er1 >conftest.err
    25839   rm -f conftest.er1
    25840   cat conftest.err >&5
    25841   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    25842   (exit $ac_status); } &&
    25843          { ac_try='test -z "$ac_c_werror_flag"
    25844                          || test ! -s conftest.err'
    25845   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    25846   (eval $ac_try) 2>&5
    25847   ac_status=$?
    25848   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    25849   (exit $ac_status); }; } &&
    25850          { ac_try='test -s conftest$ac_exeext'
    25851   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    25852   (eval $ac_try) 2>&5
    25853   ac_status=$?
    25854   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    25855   (exit $ac_status); }; }; then
    25856   ac_cv_lib_pthread_pthread_create=yes
    25857 else
    25858   echo "$as_me: failed program was:" >&5
    25859 sed 's/^/| /' conftest.$ac_ext >&5
    25860 
    25861 ac_cv_lib_pthread_pthread_create=no
    25862 fi
    25863 rm -f conftest.err conftest.$ac_objext \
    25864       conftest$ac_exeext conftest.$ac_ext
    25865 LIBS=$ac_check_lib_save_LIBS
    25866 fi
    25867 echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
    25868 echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
    25869 if test $ac_cv_lib_pthread_pthread_create = yes; then
    25870   MUMPS_PCLIBS="-lpthread $MUMPS_PCLIBS"
    25871 fi
    25872 
    2587325889
    2587425890# Verify that we can compile Fortran 90 code
  • ThirdParty/Mumps/stable/1.4/configure.ac

    r2635 r2684  
    8787esac
    8888
    89 # check for pthread.h header file
    90 AC_COIN_CHECK_HEADER([pthread.h],,[MY_DEFS="$MY_DEFS -DWITHOUT_PTHREAD=1"])
     89# Mumps can make use of pthreads
     90# check for pthread.h header file and library
     91AC_ARG_ENABLE([pthread-mumps],
     92  [AC_HELP_STRING([--disable-pthread-mumps],[disable use of pthread library])],
     93  [enable_pthread_mumps=$enableval],
     94  [enable_pthread_mumps=yes])
     95if test $enable_pthread_mumps = yes ; then
     96  AC_COIN_CHECK_HEADER([pthread.h],[],[enable_pthread_mumps=no])
     97fi
     98if test $enable_pthread_mumps = yes ; then
     99  AC_CHECK_LIB([pthread],[pthread_create],
     100    [MUMPS_PCLIBS="-lpthread $MUMPS_PCLIBS"],
     101    [enable_pthread_mumps=no])
     102fi
     103if test $enable_pthread_mumps = no ; then
     104  MY_DEFS="$MY_DEFS -DWITHOUT_PTHREAD=1"
     105fi
    91106
    92107MY_DEFS="$MY_DEFS -DALLOW_NON_INIT -DMUMPS_ARITH=MUMPS_ARITH_d"
     
    103118  MY_FDEFS="$MY_FDEFS -Dmetis"
    104119fi
    105 
    106 # Mumps can make use of pthreads
    107 AC_CHECK_LIB([pthread],[pthread_create],[MUMPS_PCLIBS="-lpthread $MUMPS_PCLIBS"])
    108120
    109121# Verify that we can compile Fortran 90 code
Note: See TracChangeset for help on using the changeset viewer.