123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444 |
- --- a/configure
- +++ b/configure
- @@ -888,10 +888,6 @@ BUILD_RIPEMD_TRUE
- BUILD_RIPEMD_FALSE
- BUILD_SHA512_TRUE
- BUILD_SHA512_FALSE
- -acx_pthread_config
- -PTHREAD_CC
- -PTHREAD_LIBS
- -PTHREAD_CFLAGS
- LIBOBJS
- LTLIBOBJS'
- ac_subst_files=''
- @@ -22251,430 +22247,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- -acx_pthread_ok=no
- -
- -# We used to check for pthread.h first, but this fails if pthread.h
- -# requires special compiler flags (e.g. on True64 or Sequent).
- -# It gets checked for in the link test anyway.
- -
- -# First of all, check if the user has set any of the PTHREAD_LIBS,
- -# etcetera environment variables, and if threads linking works using
- -# them:
- -if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
- - save_CFLAGS="$CFLAGS"
- - CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- - save_LIBS="$LIBS"
- - LIBS="$PTHREAD_LIBS $LIBS"
- - { echo "$as_me:$LINENO: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5
- -echo $ECHO_N "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... $ECHO_C" >&6; }
- - cat >conftest.$ac_ext <<_ACEOF
- -/* confdefs.h. */
- -_ACEOF
- -cat confdefs.h >>conftest.$ac_ext
- -cat >>conftest.$ac_ext <<_ACEOF
- -/* end confdefs.h. */
- -
- -/* Override any GCC internal prototype to avoid an error.
- - Use char because int might match the return type of a GCC
- - builtin and then its argument prototype would still apply. */
- -#ifdef __cplusplus
- -extern "C"
- -#endif
- -char pthread_join ();
- -int
- -main ()
- -{
- -return pthread_join ();
- - ;
- - return 0;
- -}
- -_ACEOF
- -rm -f conftest.$ac_objext conftest$ac_exeext
- -if { (ac_try="$ac_link"
- -case "(($ac_try" in
- - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- - *) ac_try_echo=$ac_try;;
- -esac
- -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- - (eval "$ac_link") 2>conftest.er1
- - ac_status=$?
- - grep -v '^ *+' conftest.er1 >conftest.err
- - rm -f conftest.er1
- - cat conftest.err >&5
- - echo "$as_me:$LINENO: \$? = $ac_status" >&5
- - (exit $ac_status); } && {
- - test -z "$ac_c_werror_flag" ||
- - test ! -s conftest.err
- - } && test -s conftest$ac_exeext &&
- - $as_test_x conftest$ac_exeext; then
- - acx_pthread_ok=yes
- -else
- - echo "$as_me: failed program was:" >&5
- -sed 's/^/| /' conftest.$ac_ext >&5
- -
- -
- -fi
- -
- -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- - conftest$ac_exeext conftest.$ac_ext
- - { echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5
- -echo "${ECHO_T}$acx_pthread_ok" >&6; }
- - if test x"$acx_pthread_ok" = xno; then
- - PTHREAD_LIBS=""
- - PTHREAD_CFLAGS=""
- - fi
- - LIBS="$save_LIBS"
- - CFLAGS="$save_CFLAGS"
- -fi
- -
- -# We must check for the threads library under a number of different
- -# names; the ordering is very important because some systems
- -# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
- -# libraries is broken (non-POSIX).
- -
- -# Create a list of thread flags to try. Items starting with a "-" are
- -# C compiler flags, and other items are library names, except for "none"
- -# which indicates that we try without any flags at all, and "pthread-config"
- -# which is a program returning the flags for the Pth emulation library.
- -
- -acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
- -
- -# The ordering *is* (sometimes) important. Some notes on the
- -# individual items follow:
- -
- -# pthreads: AIX (must check this before -lpthread)
- -# none: in case threads are in libc; should be tried before -Kthread and
- -# other compiler flags to prevent continual compiler warnings
- -# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
- -# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
- -# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
- -# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
- -# -pthreads: Solaris/gcc
- -# -mthreads: Mingw32/gcc, Lynx/gcc
- -# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
- -# doesn't hurt to check since this sometimes defines pthreads too;
- -# also defines -D_REENTRANT)
- -# ... -mt is also the pthreads flag for HP/aCC
- -# pthread: Linux, etcetera
- -# --thread-safe: KAI C++
- -# pthread-config: use pthread-config program (for GNU Pth library)
- -
- -case "${host_cpu}-${host_os}" in
- - *solaris*)
- -
- - # On Solaris (at least, for some versions), libc contains stubbed
- - # (non-functional) versions of the pthreads routines, so link-based
- - # tests will erroneously succeed. (We need to link with -pthreads/-mt/
- - # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather
- - # a function called by this macro, so we could check for that, but
- - # who knows whether they'll stub that too in a future libc.) So,
- - # we'll just look for -pthreads and -lpthread first:
- -
- - acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags"
- - ;;
- -esac
- -
- -if test x"$acx_pthread_ok" = xno; then
- -for flag in $acx_pthread_flags; do
- -
- - case $flag in
- - none)
- - { echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5
- -echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6; }
- - ;;
- -
- - -*)
- - { echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5
- -echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6; }
- - PTHREAD_CFLAGS="$flag"
- - ;;
- -
- - pthread-config)
- - # Extract the first word of "pthread-config", so it can be a program name with args.
- -set dummy pthread-config; ac_word=$2
- -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
- -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- -if test "${ac_cv_prog_acx_pthread_config+set}" = set; then
- - echo $ECHO_N "(cached) $ECHO_C" >&6
- -else
- - if test -n "$acx_pthread_config"; then
- - ac_cv_prog_acx_pthread_config="$acx_pthread_config" # Let the user override the test.
- -else
- -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- -for as_dir in $PATH
- -do
- - IFS=$as_save_IFS
- - test -z "$as_dir" && as_dir=.
- - for ac_exec_ext in '' $ac_executable_extensions; do
- - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- - ac_cv_prog_acx_pthread_config="yes"
- - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- - break 2
- - fi
- -done
- -done
- -IFS=$as_save_IFS
- -
- - test -z "$ac_cv_prog_acx_pthread_config" && ac_cv_prog_acx_pthread_config="no"
- -fi
- -fi
- -acx_pthread_config=$ac_cv_prog_acx_pthread_config
- -if test -n "$acx_pthread_config"; then
- - { echo "$as_me:$LINENO: result: $acx_pthread_config" >&5
- -echo "${ECHO_T}$acx_pthread_config" >&6; }
- -else
- - { echo "$as_me:$LINENO: result: no" >&5
- -echo "${ECHO_T}no" >&6; }
- -fi
- -
- -
- - if test x"$acx_pthread_config" = xno; then continue; fi
- - PTHREAD_CFLAGS="`pthread-config --cflags`"
- - PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
- - ;;
- -
- - *)
- - { echo "$as_me:$LINENO: checking for the pthreads library -l$flag" >&5
- -echo $ECHO_N "checking for the pthreads library -l$flag... $ECHO_C" >&6; }
- - PTHREAD_LIBS="-l$flag"
- - ;;
- - esac
- -
- - save_LIBS="$LIBS"
- - save_CFLAGS="$CFLAGS"
- - LIBS="$PTHREAD_LIBS $LIBS"
- - CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- -
- - # Check for various functions. We must include pthread.h,
- - # since some functions may be macros. (On the Sequent, we
- - # need a special flag -Kthread to make this header compile.)
- - # We check for pthread_join because it is in -lpthread on IRIX
- - # while pthread_create is in libc. We check for pthread_attr_init
- - # due to DEC craziness with -lpthreads. We check for
- - # pthread_cleanup_push because it is one of the few pthread
- - # functions on Solaris that doesn't have a non-functional libc stub.
- - # We try pthread_create on general principles.
- - cat >conftest.$ac_ext <<_ACEOF
- -/* confdefs.h. */
- -_ACEOF
- -cat confdefs.h >>conftest.$ac_ext
- -cat >>conftest.$ac_ext <<_ACEOF
- -/* end confdefs.h. */
- -#include <pthread.h>
- -int
- -main ()
- -{
- -pthread_t th; pthread_join(th, 0);
- - pthread_attr_init(0); pthread_cleanup_push(0, 0);
- - pthread_create(0,0,0,0); pthread_cleanup_pop(0);
- - ;
- - return 0;
- -}
- -_ACEOF
- -rm -f conftest.$ac_objext conftest$ac_exeext
- -if { (ac_try="$ac_link"
- -case "(($ac_try" in
- - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- - *) ac_try_echo=$ac_try;;
- -esac
- -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- - (eval "$ac_link") 2>conftest.er1
- - ac_status=$?
- - grep -v '^ *+' conftest.er1 >conftest.err
- - rm -f conftest.er1
- - cat conftest.err >&5
- - echo "$as_me:$LINENO: \$? = $ac_status" >&5
- - (exit $ac_status); } && {
- - test -z "$ac_c_werror_flag" ||
- - test ! -s conftest.err
- - } && test -s conftest$ac_exeext &&
- - $as_test_x conftest$ac_exeext; then
- - acx_pthread_ok=yes
- -else
- - echo "$as_me: failed program was:" >&5
- -sed 's/^/| /' conftest.$ac_ext >&5
- -
- -
- -fi
- -
- -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- - conftest$ac_exeext conftest.$ac_ext
- -
- - LIBS="$save_LIBS"
- - CFLAGS="$save_CFLAGS"
- -
- - { echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5
- -echo "${ECHO_T}$acx_pthread_ok" >&6; }
- - if test "x$acx_pthread_ok" = xyes; then
- - break;
- - fi
- -
- - PTHREAD_LIBS=""
- - PTHREAD_CFLAGS=""
- -done
- -fi
- -
- -# Various other checks:
- -if test "x$acx_pthread_ok" = xyes; then
- - save_LIBS="$LIBS"
- - LIBS="$PTHREAD_LIBS $LIBS"
- - save_CFLAGS="$CFLAGS"
- - CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- -
- - # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
- - { echo "$as_me:$LINENO: checking for joinable pthread attribute" >&5
- -echo $ECHO_N "checking for joinable pthread attribute... $ECHO_C" >&6; }
- - attr_name=unknown
- - for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
- - cat >conftest.$ac_ext <<_ACEOF
- -/* confdefs.h. */
- -_ACEOF
- -cat confdefs.h >>conftest.$ac_ext
- -cat >>conftest.$ac_ext <<_ACEOF
- -/* end confdefs.h. */
- -#include <pthread.h>
- -int
- -main ()
- -{
- -int attr=$attr; return attr;
- - ;
- - return 0;
- -}
- -_ACEOF
- -rm -f conftest.$ac_objext conftest$ac_exeext
- -if { (ac_try="$ac_link"
- -case "(($ac_try" in
- - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- - *) ac_try_echo=$ac_try;;
- -esac
- -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- - (eval "$ac_link") 2>conftest.er1
- - ac_status=$?
- - grep -v '^ *+' conftest.er1 >conftest.err
- - rm -f conftest.er1
- - cat conftest.err >&5
- - echo "$as_me:$LINENO: \$? = $ac_status" >&5
- - (exit $ac_status); } && {
- - test -z "$ac_c_werror_flag" ||
- - test ! -s conftest.err
- - } && test -s conftest$ac_exeext &&
- - $as_test_x conftest$ac_exeext; then
- - attr_name=$attr; break
- -else
- - echo "$as_me: failed program was:" >&5
- -sed 's/^/| /' conftest.$ac_ext >&5
- -
- -
- -fi
- -
- -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- - conftest$ac_exeext conftest.$ac_ext
- - done
- - { echo "$as_me:$LINENO: result: $attr_name" >&5
- -echo "${ECHO_T}$attr_name" >&6; }
- - if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
- -
- -cat >>confdefs.h <<_ACEOF
- -#define PTHREAD_CREATE_JOINABLE $attr_name
- -_ACEOF
- -
- - fi
- -
- - { echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5
- -echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6; }
- - flag=no
- - case "${host_cpu}-${host_os}" in
- - *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
- - *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
- - esac
- - { echo "$as_me:$LINENO: result: ${flag}" >&5
- -echo "${ECHO_T}${flag}" >&6; }
- - if test "x$flag" != xno; then
- - PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
- - fi
- -
- - LIBS="$save_LIBS"
- - CFLAGS="$save_CFLAGS"
- -
- - # More AIX lossage: must compile with xlc_r or cc_r
- - if test x"$GCC" != xyes; then
- - for ac_prog in xlc_r cc_r
- -do
- - # Extract the first word of "$ac_prog", so it can be a program name with args.
- -set dummy $ac_prog; ac_word=$2
- -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
- -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- -if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then
- - echo $ECHO_N "(cached) $ECHO_C" >&6
- -else
- - if test -n "$PTHREAD_CC"; then
- - ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test.
- -else
- -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- -for as_dir in $PATH
- -do
- - IFS=$as_save_IFS
- - test -z "$as_dir" && as_dir=.
- - for ac_exec_ext in '' $ac_executable_extensions; do
- - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- - ac_cv_prog_PTHREAD_CC="$ac_prog"
- - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- - break 2
- - fi
- -done
- -done
- -IFS=$as_save_IFS
- -
- -fi
- -fi
- -PTHREAD_CC=$ac_cv_prog_PTHREAD_CC
- -if test -n "$PTHREAD_CC"; then
- - { echo "$as_me:$LINENO: result: $PTHREAD_CC" >&5
- -echo "${ECHO_T}$PTHREAD_CC" >&6; }
- -else
- - { echo "$as_me:$LINENO: result: no" >&5
- -echo "${ECHO_T}no" >&6; }
- -fi
- -
- -
- - test -n "$PTHREAD_CC" && break
- -done
- -test -n "$PTHREAD_CC" || PTHREAD_CC="${CC}"
- -
- - else
- - PTHREAD_CC=$CC
- - fi
- -else
- - PTHREAD_CC="$CC"
- -fi
- -
- -
- -
- -
- -
- -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
- -if test x"$acx_pthread_ok" = xyes; then
- -
- -cat >>confdefs.h <<\_ACEOF
- -#define HAVE_PTHREAD 1
- -_ACEOF
- -
- - :
- -else
- - acx_pthread_ok=no
- -
- -fi
- -ac_ext=c
- -ac_cpp='$CPP $CPPFLAGS'
- -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- -ac_compiler_gnu=$ac_cv_c_compiler_gnu
- -
- -
- -
- -LIBS="$PTHREAD_LIBS $LIBS"
- -CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- -
-
- { echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5
- echo $ECHO_N "checking for library containing gethostbyname... $ECHO_C" >&6; }
|