222 lines
6.3 KiB
Text
222 lines
6.3 KiB
Text
--- configure.orig Wed Nov 10 15:52:42 2004
|
|
+++ configure Wed Nov 10 15:53:45 2004
|
|
@@ -21035,7 +21035,103 @@
|
|
|
|
|
|
|
|
-echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
|
|
+ LIBPTHREAD=""
|
|
+
|
|
+ if test -n "$PTHREAD_LIBS"; then
|
|
+ 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"
|
|
+ LDFLAGS="$LDFLAGS $all_libraries"
|
|
+ case $host_os in
|
|
+ aix*) LDFLAGS="-brtl $LDFLAGS"
|
|
+ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
|
|
+ ;;
|
|
+ esac
|
|
+ as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
|
|
+echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
|
|
+echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6
|
|
+if eval "test \"\${$as_ac_Lib+set}\" = set"; then
|
|
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+else
|
|
+ ac_check_lib_save_LIBS=$LIBS
|
|
+LIBS="-l$PTHREAD_LIBS $LIBS"
|
|
+cat >conftest.$ac_ext <<_ACEOF
|
|
+/* confdefs.h. */
|
|
+_ACEOF
|
|
+cat confdefs.h >>conftest.$ac_ext
|
|
+cat >>conftest.$ac_ext <<_ACEOF
|
|
+/* end confdefs.h. */
|
|
+
|
|
+/* Override any gcc2 internal prototype to avoid an error. */
|
|
+#ifdef __cplusplus
|
|
+extern "C"
|
|
+#endif
|
|
+/* We use char because int might match the return type of a gcc2
|
|
+ builtin and then its argument prototype would still apply. */
|
|
+char pthread_create ();
|
|
+int
|
|
+main ()
|
|
+{
|
|
+pthread_create ();
|
|
+ ;
|
|
+ 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
|
|
+ eval "$as_ac_Lib=yes"
|
|
+else
|
|
+ echo "$as_me: failed program was:" >&5
|
|
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
+
|
|
+eval "$as_ac_Lib=no"
|
|
+fi
|
|
+rm -f conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+LIBS=$ac_check_lib_save_LIBS
|
|
+fi
|
|
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
|
|
+echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
|
|
+if test `eval echo '${'$as_ac_Lib'}'` = yes; then
|
|
+ LIBPTHREAD="$PTHREAD_LIBS_save"
|
|
+fi
|
|
+
|
|
+ LDFLAGS="$kde_save_LDFLAGS"
|
|
+ LIBS="$kde_save_LIBS"
|
|
+
|
|
+ PTHREAD_LIBS="$PTHREAD_LIBS_save"
|
|
+ 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
|
|
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
@@ -21043,7 +21139,6 @@
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
LIBS="-lpthread $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
-/* #line $LINENO "configure" */
|
|
/* confdefs.h. */
|
|
_ACEOF
|
|
cat confdefs.h >>conftest.$ac_ext
|
|
@@ -21067,11 +21162,21 @@
|
|
_ACEOF
|
|
rm -f conftest.$ac_objext conftest$ac_exeext
|
|
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|
- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
|
|
+ { 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=$?
|
|
@@ -21084,7 +21189,8 @@
|
|
|
|
ac_cv_lib_pthread_pthread_create=no
|
|
fi
|
|
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
|
+rm -f conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
LIBS=$ac_check_lib_save_LIBS
|
|
fi
|
|
echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
|
|
@@ -21092,6 +21198,72 @@
|
|
if test $ac_cv_lib_pthread_pthread_create = yes; then
|
|
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 <pthread.h>
|
|
+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
|
|
+
|
|
|
|
|
|
|