X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=HLT%2Fconfigure.ac;h=22ace9d92eb27400c1545de5e200db463529fbc2;hb=4b1c3976e861776aaec32efe206d834b5f8c5015;hp=ef30c26cb5d9cf2975766fb34005fcde3cc57231;hpb=aec1b04c8f76bdcfd25dc9d40ac392c009a57865;p=u%2Fmrichter%2FAliRoot.git

diff --git a/HLT/configure.ac b/HLT/configure.ac
index ef30c26cb5d..22ace9d92eb 100644
--- a/HLT/configure.ac
+++ b/HLT/configure.ac
@@ -44,7 +44,15 @@ AC_SUBST([ROOTSYS])
 ROOTBINDIR=`dirname $ROOTEXEC`
 AC_SUBST([ROOTBINDIR])
 
-dnl test for additional required root libraries
+dnl test for additional required root libraries and headers
+LIBS='-ldl'
+if test "x$have_root" = "x1"; then
+  AC_LANG_PUSH(C++)
+  save_CPPFLAGS=$CPPFLAGS
+  save_LDFLAGS=$LDFLAGS
+  save_LIBS=$LIBS
+  CPPFLAGS=`echo $save_CPPFLAGS; for i in ${ROOTINCDIR}; do echo -n "-I$i " ; done`
+  
   # we check for the libSTEER library which is linked to
   # - the ROOT libs libGeom libMinuit libVMC libEG
   # - the AliRoot libESD libRAWData (libRAWDatarec from v4-04-Rev-07)
@@ -52,23 +60,25 @@ dnl test for additional required root libraries
   # - from Nov 1 2006 TTreeFormula is needed by AliTagAnalysis and requires
   #   libTreePlayer.so
   # - from Jan 07 libESD also depends on libXMLIO
-LIBS='-ldl'
-if test "x$have_root" = "x1"; then
-  save_CPPFLAGS=$CPPFLAGS
-  save_LDFLAGS=$LDFLAGS
-  save_LIBS=$LIBS
-  
   ROOT_CHECKLIBS='Geom Minuit EG VMC TreePlayer XMLIO'
   for CHECKLIB in $ROOT_CHECKLIBS ; do
-    CPPFLAGS="$save_CPPFLAGS"
     LDFLAGS="$save_LDFLAGS -L${ROOTLIBDIR}"
     LIBS="$save_LIBS $ROOTLIBS $ADD_ROOTLIBS"
     AC_CHECK_LIB([$CHECKLIB],[_init], [ADD_ROOTLIBS="$ADD_ROOTLIBS -l$CHECKLIB"])
   done
-  
+
+  # TBuffer.h has been made pure virtual in root v5-15-02 and one
+  # has to derive from TBufferFile.h (needed for BASE/AliHLTMessage.h)
+  AC_CHECK_HEADERS([TBufferFile.h])
+
+  # TView.h has been made pure virtual right after root v5-15-02 and one
+  # has to derive from TView3D.h (needed for TPCLib/OnlineDisplay/AliHLTTPCDisplay3D)
+  AC_CHECK_HEADERS([TView3D.h])
+
   CPPFLAGS=$save_CPPFLAGS
   LDFLAGS=$save_LDFLAGS
   LIBS=$save_LIBS
+  AC_LANG_POP(C++)
 fi
 
 dnl ------------------------------------------------------------------
@@ -181,8 +191,19 @@ if test ! "x$have_aliroot" = "xno" ; then
  				       have_alirawdata=$CHECKLIB], 
  				      [have_alirawdata=no])
 	]) dnl AC_CHECK_LIB RAWDatabase
-  AC_MSG_CHECKING(for AliRawReader classes in RAWData libraries)
-  AC_MSG_RESULT($have_alirawdata)
+  AC_MSG_CHECKING([for AliRawReader classes in RAWData libraries])
+  AC_MSG_RESULT([$have_alirawdata])
+
+  dnl
+  dnl check whether AliLog supports notification callback
+  dnl
+  have_alilog_notification=no
+  AC_MSG_CHECKING([whether AliLog supports notification callback])
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <AliLog.h>], 
+		                  [AliLog::AliLogNotification fct])],
+                                  [have_alilog_notification=yes], 
+				  [AC_DEFINE(NO_ALILOG_NOTIFICATION)])
+  AC_MSG_RESULT([$have_alilog_notification])
 
   dnl
   dnl Check for the interface of AliExternalTrackParam which has been changed
@@ -263,7 +284,6 @@ if test ! "x$have_aliroot" = "xno" ; then
     
   fi
   AC_MSG_CHECKING([for TPC mapping layout])
-  AM_CONDITIONAL(USE_TPC_MAPPING, test x$have_tpc_mapping = xyes)
   AC_MSG_RESULT([$have_tpc_mapping])
 
   dnl
@@ -293,11 +313,13 @@ if test ! "x$have_aliroot" = "xno" ; then
   LIBS=$save_LIBS
 fi
 AC_LANG_POP(C++)
+AC_SUBST([ALICE_ROOT])
 AC_SUBST([ALIROOT_CPPFLAGS])
 AC_SUBST([ALIROOT_LDFLAGS])
 AC_SUBST([ALIROOTBINDIR])
 AC_SUBST([ALIROOTLIBDIR])
 AC_SUBST([ALIROOT_LIBS])
+AM_CONDITIONAL(USE_TPC_MAPPING, test x$have_tpc_mapping = xyes)
 
 HLTBASE_CPPFLAGS='-I${top_srcdir}/BASE'
 HLTBASE_LDFLAGS=
@@ -447,16 +469,33 @@ AM_CONDITIONAL(EN_HLT_PHOS, test x$enable_phos = xyes)
 AC_MSG_RESULT([$enable_phos])
 
 dnl ------------------------------------------------------------------
-AC_MSG_CHECKING([whether to enable HLT logging])
-AH_TEMPLATE([NOLOGGING],[disable hlt logging])
-AC_ARG_ENABLE(logging,
-  [AC_HELP_STRING([--enable-logging],
-      [enable logging])],
-  [],[enable_logging=yes])
-if test "x$enable_logging" != "xyes" ; then 
-  AC_DEFINE(NOLOGGING)
+AC_MSG_CHECKING([whether to compile trd library])
+AH_TEMPLATE([HLT_TRD],[hlt trd library])
+AC_ARG_ENABLE(trd,
+  [AC_HELP_STRING([--enable-trd],
+      [compile the trd library ])],
+  [],[enable_trd=yes])
+if test "x$have_aliroot" = "xno" ; then
+   enable_trd="no...requires.AliRoot"
+fi
+if test "x$enable_trd" = "xyes" ; then 
+  AC_DEFINE(HLT_TRD)
+fi
+AM_CONDITIONAL(EN_HLT_TRD, test x$enable_trd = xyes)
+AC_MSG_RESULT([$enable_trd])
+
+dnl ------------------------------------------------------------------
+AC_MSG_CHECKING([whether to disable AliRoot logging])
+AH_TEMPLATE([NOALIROOT_LOGGING],[disable AliRoot logging])
+AC_ARG_ENABLE(aliroot-logging,
+  [AC_HELP_STRING([--disable-aliroot-logging],
+      [disable logging through AliRoot logging methods])],
+  [],[enable_aliroot_logging=no])
+if test "x$enable_aliroot_logging" != "xno" ; then 
+  AC_DEFINE(NOALIROOT_LOGGING)
 fi
-AC_MSG_RESULT([$enable_logging])
+AM_CONDITIONAL(NOALIROOT_LOGGING, test x$enable_aliroot_logging != no)
+AC_MSG_RESULT([$enable_aliroot_logging])
 
 dnl ------------------------------------------------------------------
 AC_MSG_CHECKING([whether to enable saving MC data through the chain])
@@ -525,11 +564,13 @@ AC_CONFIG_FILES([Makefile
 		 BASE/Makefile
 		 BASE/setenv.sh
 		 BASE/setenv.csh
+		 BASE/util/Makefile
 		 SampleLib/Makefile
 		 TPCLib/Makefile
 		 TPCLib/mapping2array.cxx
 		 TPCLib/OnlineDisplay/Makefile
 		 PHOS/Makefile
+		 TRD/Makefile
 		 doc/Makefile
 		 doc/doxygen.conf])