From e830c2f0c02b0a23b1e2d49c7a454eb27127bf47 Mon Sep 17 00:00:00 2001
From: Fons Rademakers <Fons.Rademakers@cern.ch>
Date: Fri, 16 Feb 2007 12:14:56 +0000
Subject: [PATCH] remove the --disable-thread otpion. ROOT needs system thread
(pthread) to build. Refine the Oracle instantclient occi.h include search
path.
git-svn-id: http://root.cern.ch/svn/root/trunk@17986 27541ba8-7e3a-0410-8455-c3a389f83636
---
configure | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index d575f7f0a87..85cc5d3ef8f 100755
--- a/configure
+++ b/configure
@@ -75,7 +75,6 @@ options=" \
enable_srp \
enable_ssl \
enable_table \
- enable_thread \
enable_unuran \
enable_winrtdebug \
enable_xml \
@@ -102,6 +101,7 @@ enable_ruby=no
enable_shadowpw=
enable_soversion=no
enable_table=no
+enable_thread=yes # cannot be disabled (not in above options list)
enable_unuran=no
enable_winrtdebug=
enable_xrootd= # must be set explicitely via --enable-xrootd
@@ -881,7 +881,6 @@ enable/disable options, prefix with either --enable- or --disable-
srp SRP support, requires SRP source tree
ssl SSL encryption support, requires openssl
table Build libTable contrib library
- thread Thread support
unuran UNURAN - package for generating non-uniform random numbers
winrtdebug Link against the Windows debug runtime library
xml XML parser interface
@@ -1622,8 +1621,8 @@ check_explicit "$enable_mysql" "$enable_mysql_explicit" \
if test ! "x$enable_oracle" = "xno"; then
# Check for oracle include and library
check_header "occi.h" "$oracleincdir" \
- $ORACLE $ORACLE/include $ORACLEINCDIR /usr/local/include \
- /usr/include /usr/include/oracle/*/client
+ $ORACLE $ORACLE/include $ORACLE/sdk/include $ORACLEINCDIR \
+ /usr/local/include /usr/include /usr/include/oracle/*/client
oracleinc=$found_hdr
oracleincdir=$found_dir
@@ -2738,7 +2737,7 @@ else
else
if test "x$enable_xrootd" = "xyes"; then
enable_xrootd="no"
- xrdcomm=", needs thread support (rerun with --enable-thread)"
+ xrdcomm=", needs thread support (make sure pthread lib is found)"
else
enable_xrootd="no"
fi
--
GitLab