applying fix for bug https://savannah.cern.ch/bugs/index.php?71490

comlying both AliRoot and HLT build system, replaces r43784

diff --git a/HLT/acinclude.m4 b/HLT/acinclude.m4
index b80b4691978ab6340a326af27beab1f8449359a8..3f8c4886fc8a9e1ee9ac8f0286e4f55948abedbc 100644 (file)
--- a/HLT/acinclude.m4
+++ b/HLT/acinclude.m4
@@ -149,7 +149,8 @@ AC_DEFUN([ROOT_PATH],
   else 
    rootbin=$PATH
   fi
-  AC_PATH_PROG(ROOTCONF, root-config , no, $rootbin)
+  AC_PATH_PROG(ROOTCONF, root-config , no, $rootbin)   # used by HLT build system
+  AC_PATH_PROG(ROOTCONFIG, root-config , no, $rootbin) # used by AliRoot build system
   AC_PATH_PROG(ROOTEXEC, root , no, $rootbin)
   AC_PATH_PROG(ROOTCINT, rootcint , no, $rootbin)
        

diff --git a/HLT/hlteve.conf b/HLT/hlteve.conf
new file mode 100644 (file)
index 0000000..2182598
--- /dev/null
+++ b/HLT/hlteve.conf
@@ -0,0 +1,22 @@
+#-*- Mode: Makefile -*-
+# $Id$
+
+# This files defines the configuration for the hlteve libraries
+# which depend on the opengl  build of root. The source files are
+# only defined if root is build with opengl
+
+include $(MODDIR)/hlt.conf
+
+ifneq ($(shell $(ROOTCONFIG) --has-opengl), no)
+
+# library sources, generated from the class headers
+MODULE_SRCS=   $(CLASS_HDRS:.h=.cxx)
+
+# library headers
+# in most cases you might have already added all the header files to
+# the CLASS_HDRS variable. So we just use the content of this. You
+# can simply add more header files which don't contain classes with
+# ROOT dictionary support
+MODULE_HDRS:=  $(CLASS_HDRS)
+
+endif

diff --git a/HLT/libAliHLTEve.pkg b/HLT/libAliHLTEve.pkg
index b5f85770f2dadaf70f5f71ce5b4b25ba8aca2398..b2174e7944b399097962d9c04b7ce3bcf4e1a1b0 100644 (file)
--- a/HLT/libAliHLTEve.pkg
+++ b/HLT/libAliHLTEve.pkg
@@ -23,15 +23,10 @@ CLASS_HDRS:=        AliHLTEveBase.h \
                AliHLTEveAny.h
 
 
-# library sources, generated from the class headers
-MODULE_SRCS=   $(CLASS_HDRS:.h=.cxx)
-
-# library headers
-# in most cases you might have already added all the header files to
-# the CLASS_HDRS variable. So we just use the content of this. You
-# can simply add more header files which don't contain classes with
-# ROOT dictionary support
-MODULE_HDRS:=  $(CLASS_HDRS)
+# library sources and headers are set in hlteve.conf according to
+# availability of ROOT opengl
+MODULE_SRCS:=
+MODULE_HDRS:=
 
 # The LinkDef file required by the ROOT dictionary generation can be
 # generated automatically. For the all header files specified in
@@ -57,7 +52,7 @@ LIBRARY_DEP := -lHLTbase -lCDB -lSTEERBase -AliHLTTPC -lMUONbase -lAliHLTMUON -l
 #
 # do not change anything below this line
 #
-include $(MODDIR)/hlt.conf
+include $(MODDIR)/hlteve.conf
 
 SRCS:=$(patsubst %,EVE/%,$(MODULE_SRCS))
 CINTHDRS:=$(patsubst %,EVE/%,$(CLASS_HDRS))

diff --git a/HLT/libAliHLTTPCEVE.pkg b/HLT/libAliHLTTPCEVE.pkg
index 969e3d77adaf0242a3e871d4dc9ba00411f60f82..52e6cfdf5e8608873439f69b10aa75655996872f 100644 (file)
--- a/HLT/libAliHLTTPCEVE.pkg
+++ b/HLT/libAliHLTTPCEVE.pkg
@@ -3,9 +3,10 @@
 
 CLASS_HDRS:=   AliHLTTPCEVE.h
 
-MODULE_SRCS=   $(CLASS_HDRS:.h=.cxx)
-
-MODULE_HDRS:=  $(CLASS_HDRS)
+# library sources and headers are set in hlteve.conf according to
+# availability of ROOT opengl
+MODULE_SRCS:=
+MODULE_HDRS:=
 
 MODULE_DHDR:=
 
@@ -21,7 +22,7 @@ LIBRARY_DEP := -lHLTbase -lAliHLTTPC
 #
 # do not change anything below this line
 #
-include $(MODDIR)/hlt.conf
+include $(MODDIR)/hlteve.conf
 
 SRCS:=$(patsubst %,TPCLib/EVE/%,$(MODULE_SRCS))
 CINTHDRS:=$(patsubst %,TPCLib/EVE/%,$(CLASS_HDRS))