From 4bc5efe9f738caaeefeb41bf6761165dba67345b Mon Sep 17 00:00:00 2001
From: Fons Rademakers <Fons.Rademakers@cern.ch>
Date: Fri, 17 Sep 2010 09:54:41 +0000
Subject: [PATCH] accommodate the new Castor (libshift) directory layout to
find the shift includes and libs.
git-svn-id: http://root.cern.ch/svn/root/trunk@35357 27541ba8-7e3a-0410-8455-c3a389f83636
---
configure | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index d9f7d242466..bcdeb1e8509 100755
--- a/configure
+++ b/configure
@@ -2846,7 +2846,8 @@ shiftold=""
if test ! "x$enable_rfio" = "xno" ; then
# Check for RFIO include and library
keepincdir=$shiftincdir
- check_header "rfio_api.h" "$shiftincdir" $RFIO $RFIO/include $RFIO/h \
+ check_header "rfio_api.h" "$shiftincdir" $RFIO $RFIO/include \
+ $RFIO/include/shift $RFIO/h \
/cern/pro/include /cern/new/include /cern/old/include \
/opt/shift/include /usr/local/shift/inlcude /usr/include/shift \
/usr/local/include/shift /usr/include /usr/local/include
@@ -2908,7 +2909,8 @@ castorold=""
if test ! "x$enable_castor" = "xno" ; then
# Check for Castor include and library
keepincdir=$castorincdir
- check_header "rfio_api.h" "$castorincdir" $CASTOR $CASTOR/include $CASTOR/h \
+ check_header "rfio_api.h" "$castorincdir" $CASTOR $CASTOR/include \
+ $CASTOR/include/shift $CASTOR/h \
/cern/pro/include /cern/new/include /cern/old/include \
/opt/shift/include /usr/local/shift/inlcude /usr/include/shift \
/usr/local/include/shift /usr/include /usr/local/include
@@ -2928,7 +2930,8 @@ if test ! "x$enable_castor" = "xno" ; then
fi
fi
- check_header "stager_api.h" "$keepincdir" $CASTOR $CASTOR/include $CASTOR/h \
+ check_header "stager_api.h" "$keepincdir" $CASTOR $CASTOR/include \
+ $CASTOR/include/shift $CASTOR/h \
/cern/pro/include /cern/new/include /cern/old/include \
/opt/shift/include /usr/local/shift/inlcude /usr/include/shift \
/usr/local/include/shift /usr/include /usr/local/include
--
GitLab