58 lines
2 KiB
Text
58 lines
2 KiB
Text
--- configure.orig Thu Jun 2 23:03:05 2005
|
|
+++ configure Wed Aug 31 23:48:02 2005
|
|
@@ -23409,6 +23409,7 @@
|
|
|
|
|
|
SEARCH_INCLUDE="\
|
|
+ $X11BASE/include \
|
|
/usr/local/include \
|
|
\
|
|
/usr/Motif-2.1/include \
|
|
@@ -34396,7 +34396,7 @@
|
|
fi
|
|
;;
|
|
*-*-freebsd*)
|
|
- THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
|
|
+ THREAD_OPTS="$PTHREAD_LIBS"
|
|
;;
|
|
*-*-darwin* | *-*-cygwin* )
|
|
THREAD_OPTS=""
|
|
@@ -34433,6 +34433,12 @@
|
|
echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6
|
|
;;
|
|
|
|
+ -pthread|-l*)
|
|
+ echo "$as_me:$LINENO: checking for the pthreads library $flag" >&5
|
|
+echo $ECHO_N "checking for the pthreads library $flag... $ECHO_C" >&6
|
|
+ THREADS_LINK="$flag"
|
|
+ ;;
|
|
+
|
|
-*)
|
|
echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5
|
|
echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6
|
|
@@ -34515,7 +34521,7 @@
|
|
{ echo "$as_me:$LINENO: WARNING: No thread support on this system... disabled" >&5
|
|
echo "$as_me: WARNING: No thread support on this system... disabled" >&2;}
|
|
else
|
|
- LDFLAGS="$THREADS_CFLAGS $LDFLAGS"
|
|
+ LDFLAGS="$THREADS_CFLAGS $THREADS_LINK $LDFLAGS"
|
|
LIBS="$THREADS_LINK $LIBS"
|
|
|
|
echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5
|
|
@@ -35701,6 +35707,7 @@
|
|
fi
|
|
fi
|
|
fi
|
|
+TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} ${PTHREAD_CFLAGS}"
|
|
|
|
if test "$WXGTK20" = 1 ; then
|
|
cat >>confdefs.h <<_ACEOF
|
|
@@ -35823,7 +35830,7 @@
|
|
OPTIMISE="-O"
|
|
fi
|
|
fi
|
|
-
|
|
+OPTIMISE=
|
|
|
|
if test "x$WXWIN_COMPATIBILITY_2_2" = "xyes"; then
|
|
cat >>confdefs.h <<\_ACEOF
|