--- configure.orig Wed Nov 10 12:14:47 2004 +++ configure Wed Nov 10 12:14:52 2004 @@ -27215,11 +27215,16 @@ - LIBPTHREAD="" + LIBPTHREAD="" if test -n "$PTHREAD_LIBS"; then - PTHREAD_LIBS_save="$PTHREAD_LIBS" - PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'` + if test "x$PTHREAD_LIBS" = "x-pthread" ; then + LIBPTHREAD="PTHREAD" + else + PTHREAD_LIBS_save="$PTHREAD_LIBS" + PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'` + echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5 +echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6 kde_save_LDFLAGS="$LDFLAGS" kde_save_LIBS="$LIBS" @@ -27301,7 +27306,8 @@ LDFLAGS="$kde_save_LDFLAGS" LIBS="$kde_save_LIBS" - PTHREAD_LIBS="$PTHREAD_LIBS_save" + PTHREAD_LIBS="$PTHREAD_LIBS_save" + fi fi if test -z "$LIBPTHREAD"; then @@ -27373,6 +27379,69 @@ LIBPTHREAD="-lpthread" fi + fi + + if test -z "$LIBPTHREAD" ; then + echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 +echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 + kde_safe_libs=$LIBS + LIBS="$LIBS -lpthread" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +(void)pthread_create(0,0,0,0); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + LIBPTHREAD="-lpthread" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$kde_safe_libs + fi + + if test "x$LIBPTHREAD" = "xPTHREAD" ; then + LIBPTHREAD="" fi