Skip to content
Snippets Groups Projects
Commit 16308771 authored by Fons Rademakers's avatar Fons Rademakers
Browse files

From Gerri:

Unfortunately I forgot that there are AliEns around with old xrootd v3.0.4
which is intermediate and was not detected correctly after the patch.
Now I have checked with all possible variants: 3.0.4, 3.1.0, 3.2.x and trunk.


git-svn-id: http://root.cern.ch/svn/root/trunk@48141 27541ba8-7e3a-0410-8455-c3a389f83636
parent 28ed5576
No related branches found
No related tags found
No related merge requests found
......@@ -4712,7 +4712,11 @@ if test "x$enable_xrootd" = "xyes" ; then
libxrdoucbjr=""
#
# Release date of version 3.1.0 containing the new lib packaging
decrefutils=20111021
decreftre=300000000
decrefutils=300010000
if [ $decver -lt $decreftre ] ; then
decrefutils=20111021
fi
decrefnetut=20100729
if [ $decver -ge $decrefutils ] ; then
xrdlibs="libXrdMain libXrdUtils libXrdClient"
......
......@@ -4,7 +4,7 @@
//
#include "XrdProofdXrdVers.h"
#if ROOTXRDVERS < ROOT_XrdUtils
#if defined(ROOT_XrdNoUtils)
#define XrdSysDNS XrdNetDNS
#include "XrdNet/XrdNetDNS.hh"
#else
......
......@@ -22,6 +22,11 @@
#define ROOT_PhyConnNoReuse 20110126
// This is when the header and library packaging changed (v3.1.0)
#define ROOT_XrdUtils 20111021
#if (ROOTXRDVERS < 30000000 && ROOTXRDVERS < 20111021) || \
(ROOTXRDVERS >= 30000000 && ROOTXRDVERS < 300010000)
# define ROOT_XrdNoUtils
#else
# undef ROOT_XrdNoUtils
#endif
#endif
......@@ -1259,7 +1259,7 @@ XrdSecProtocol *XrdProofConn::Authenticate(char *plist, int plsiz)
// Initialize the security library plugin, if needed
XrdOucString libsec;
if (!fgSecPlugin) {
#if ROOTXRDVERS >= ROOT_XrdUtils
#if !defined(ROOT_XrdNoUtils)
libsec = "libXrdSec";
libsec += LT_MODULE_EXT;
#else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment