From 28d545e077582859aa65a3ffa418dc1405ddff0e Mon Sep 17 00:00:00 2001
From: Fons Rademakers <Fons.Rademakers@cern.ch>
Date: Wed, 30 Jun 2004 16:52:04 +0000
Subject: [PATCH] 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
---
build/unix/wingcc_ld.sh | 1 -
configure | 16 ++++++++++------
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/build/unix/wingcc_ld.sh b/build/unix/wingcc_ld.sh
index a05664348fe..5b962307212 100755
--- a/build/unix/wingcc_ld.sh
+++ b/build/unix/wingcc_ld.sh
@@ -16,7 +16,6 @@ while [ "$1" != "" ]; do
else
args="$args $1"
fi ;;
- -pthread) ;;
*) args="$args $1" ;;
esac
shift
diff --git a/configure b/configure
index dfd830f7f63..920567fb9a2 100755
--- a/configure
+++ b/configure
@@ -871,9 +871,9 @@ if test ! "$platform" = "win32"; then
/usr/local/lib /usr/local/lib/X11 /use/local/X11R6/lib \
/usr/X11/lib /usr/lib/X11R5
x11libdir=$found_dir
-
+
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
fi
@@ -881,11 +881,9 @@ if test ! "$platform" = "win32"; then
/usr/include /usr/X11R6/include /usr/include/X11 /usr/openwin/include \
/usr/local/include /usr/local/include/X11 /use/local/X11R6/include \
/usr/X11/include /usr/include/X11R5
- x11inc=$found_hdr
- x11incdir=$found_dir
- if test "x$x11incdir" = "x" ; then
- echo "`basename $0`: X11 headers (x11-devel) MUST be installed"
+ if test "x$found_dir" = "x" ; then
+ echo "`basename $0`: X11 headers (package x11-devel) MUST be installed"
exit 1
fi
@@ -934,6 +932,12 @@ linux|fbsd)
fi
;;
esac
+case $arch in
+win32gcc)
+ enable_thread="yes"
+ threadlib=
+ ;;
+esac
if test "x$enable_thread" = "xyes" && \
test ! "$platform" = "win32" && \
test "x$threadlib" = "x" ; then
--
GitLab