From 8ed52becc7cb77f44d083d3eef5023c18ca22b8a Mon Sep 17 00:00:00 2001
From: Rene Brun <Rene.Brun@cern.ch>
Date: Wed, 30 Jun 2004 10:40:08 +0000
Subject: [PATCH] From Axel Naumann: Philippe fixed a typo in
Makefile.win32gcc.
The -pthread switch also needs to be removed when linking. Instead of
introducing another if clause in configure I filtered it out in
wingcc_ld.sh. De we need REENTRANT here as well?
configure checks for the X libs, but not for the X headers. At least for
cygwin it has happened several times now that people ran into problems
with that: configure completes successfully, even though only X11 libs
were installed, but no headers. This patch adds a check
for X11/Xlib.h, and tells people to install X11-devel if not found.
git-svn-id: http://root.cern.ch/svn/root/trunk@9350 27541ba8-7e3a-0410-8455-c3a389f83636
---
build/unix/wingcc_ld.sh | 1 +
config/Makefile.win32gcc | 2 +-
configure | 14 +++++++++++++-
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/build/unix/wingcc_ld.sh b/build/unix/wingcc_ld.sh
index 5b962307212..a05664348fe 100755
--- a/build/unix/wingcc_ld.sh
+++ b/build/unix/wingcc_ld.sh
@@ -16,6 +16,7 @@ while [ "$1" != "" ]; do
else
args="$args $1"
fi ;;
+ -pthread) ;;
*) args="$args $1" ;;
esac
shift
diff --git a/config/Makefile.win32gcc b/config/Makefile.win32gcc
index 5118407c12d..ecb93a9cdc2 100755
--- a/config/Makefile.win32gcc
+++ b/config/Makefile.win32gcc
@@ -32,7 +32,7 @@ COMPILER = gnu
# Linker:
LD = build/unix/wingcc_ld.sh
-LDFLAGS = $(OPT) --Wl,--enable-auto-image-base -Wl,--export-all-symbols \
+LDFLAGS = $(OPT) -Wl,--enable-auto-image-base -Wl,--export-all-symbols \
-L/usr/X11R6/lib \
$(EXTRA_LDFLAGS)
SOFLAGS = -shared -Wl,-soname,
diff --git a/configure b/configure
index 1c6c6fbb198..dfd830f7f63 100755
--- a/configure
+++ b/configure
@@ -871,12 +871,24 @@ 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"
exit 1
fi
+ check_header "X11/Xlib.h" \
+ /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"
+ exit 1
+ fi
+
check_library "libXpm" "$enable_shared" "$xpmlibdir" \
$XPM $XPM/lib /usr/lib /usr/local/lib /usr/lib/X11 \
/usr/local/lib/X11 /usr/X11R6/lib /use/local/X11R6/lib \
--
GitLab