Skip to content
Snippets Groups Projects
Commit 28d545e0 authored by Fons Rademakers's avatar Fons Rademakers
Browse files

put special thread detection case for win32gcc in configure and not

in wingcc_ld.sh to avoid spread of special cases over too many files.


git-svn-id: http://root.cern.ch/svn/root/trunk@9354 27541ba8-7e3a-0410-8455-c3a389f83636
parent 3679af35
No related branches found
No related tags found
No related merge requests found
...@@ -16,7 +16,6 @@ while [ "$1" != "" ]; do ...@@ -16,7 +16,6 @@ while [ "$1" != "" ]; do
else else
args="$args $1" args="$args $1"
fi ;; fi ;;
-pthread) ;;
*) args="$args $1" ;; *) args="$args $1" ;;
esac esac
shift shift
......
...@@ -871,9 +871,9 @@ if test ! "$platform" = "win32"; then ...@@ -871,9 +871,9 @@ if test ! "$platform" = "win32"; then
/usr/local/lib /usr/local/lib/X11 /use/local/X11R6/lib \ /usr/local/lib /usr/local/lib/X11 /use/local/X11R6/lib \
/usr/X11/lib /usr/lib/X11R5 /usr/X11/lib /usr/lib/X11R5
x11libdir=$found_dir x11libdir=$found_dir
if test "x$found_lib" = "x" ; then if test "x$found_lib" = "x" ; then
echo "`basename $0`: libX11 MUST be installed" echo "`basename $0`: libX11 (package x11-devel) MUST be installed"
exit 1 exit 1
fi fi
...@@ -881,11 +881,9 @@ if test ! "$platform" = "win32"; then ...@@ -881,11 +881,9 @@ if test ! "$platform" = "win32"; then
/usr/include /usr/X11R6/include /usr/include/X11 /usr/openwin/include \ /usr/include /usr/X11R6/include /usr/include/X11 /usr/openwin/include \
/usr/local/include /usr/local/include/X11 /use/local/X11R6/include \ /usr/local/include /usr/local/include/X11 /use/local/X11R6/include \
/usr/X11/include /usr/include/X11R5 /usr/X11/include /usr/include/X11R5
x11inc=$found_hdr
x11incdir=$found_dir
if test "x$x11incdir" = "x" ; then if test "x$found_dir" = "x" ; then
echo "`basename $0`: X11 headers (x11-devel) MUST be installed" echo "`basename $0`: X11 headers (package x11-devel) MUST be installed"
exit 1 exit 1
fi fi
...@@ -934,6 +932,12 @@ linux|fbsd) ...@@ -934,6 +932,12 @@ linux|fbsd)
fi fi
;; ;;
esac esac
case $arch in
win32gcc)
enable_thread="yes"
threadlib=
;;
esac
if test "x$enable_thread" = "xyes" && \ if test "x$enable_thread" = "xyes" && \
test ! "$platform" = "win32" && \ test ! "$platform" = "win32" && \
test "x$threadlib" = "x" ; then test "x$threadlib" = "x" ; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment