Commit 24855bb3 authored by Maiken's avatar Maiken

Merge branch 'xrootd-tweaks' into 'master'

xrootd tweaks

See merge request nordugrid/arc!659
parents 203e2b67 36c20c75
......@@ -1628,7 +1628,13 @@ if test "x$enables_xrootd" = "xyes"; then
fi
SAVE_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $XROOTD_CPPFLAGS"
AC_CHECK_HEADER(XrdPosix/XrdPosixXrootd.hh, [], [enables_xrootd="no"] [#include <iostream>])
AC_CHECK_HEADER(XrdCl/XrdClBuffer.hh, [], [
XROOTD_CPPFLAGS="-std=c++0x $XROOTD_CPPFLAGS"
CPPFLAGS="$SAVE_CPPFLAGS $XROOTD_CPPFLAGS"
# Disable Autoconf caching
unset ac_cv_header_XrdCl_XrdClBuffer_hh
AC_CHECK_HEADER(XrdCl/XrdClBuffer.hh, [], [enables_xrootd="no"])
])
CPPFLAGS=$SAVE_CPPFLAGS
SAVE_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $XROOTD_LDFLAGS"
......
......@@ -36,7 +36,7 @@
#
# xROOTd
#
%if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0}
%if %{?fedora}%{!?fedora:0} >= 24 || %{?rhel}%{!?rhel:0}
%global with_xrootd %{!?_without_xrootd:1}%{?_without_xrootd:0}
%else
%global with_xrootd 0
......@@ -243,11 +243,7 @@ BuildRequires: globus-gssapi-gsi-devel >= 12.2
BuildRequires: globus-gssapi-gsi-devel < 12.2
%endif
%if %{with_xrootd}
%if %{?fedora}%{!?fedora:0} >= 17 || %{?rhel}%{!?rhel:0} >= 5
BuildRequires: xrootd-client-devel
%else
BuildRequires: xrootd-devel
%endif
BuildRequires: xrootd-client-devel >= 4.5.0
%endif
%if %{with_gfal}
BuildRequires: gfal2-devel
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment