- configure adapted to the new directory structure of the HOMER module in PubSub

[u/mrichter/AliRoot.git] / HLT / configure.ac

diff --git a/HLT/configure.ac b/HLT/configure.ac
index 0593ee2731ecb8bef5c67d50de8f625af34d32e5..016d2fda88a38daa31451f19e1987e0da410c067 100644 (file)
--- a/HLT/configure.ac
+++ b/HLT/configure.ac
@@ -252,8 +252,16 @@ if test "x$with_pubsub" != "xno" ; then
   # currently the different versions of the HLT PubSub framework have a different
   # directory layout
   if test -d ${with_pubsub}/include/HOMER ; then
+    # the 'early' location of the include files with separated HOMER sub dirs
     HOMER_CPPFLAGS="-I${with_pubsub}/include/HOMER -I${with_pubsub}/include/HOMER/reader"
+  elif test -d ${with_pubsub}/include/Util/HOMER ; then
+    # location for HLT Framework versions after Sep 2006
+    HOMER_CPPFLAGS="-I${with_pubsub}/include/Util/HOMER"
+  elif test -d ${with_pubsub}/src/Util/HOMER/include ; then
+    # fall back if include files were not installed (versions after Sep 06)
+    HOMER_CPPFLAGS="-I${with_pubsub}/src/Util/HOMER/include"
   else
+    # fall back if include files were not installed (versions before Sep 06)
     HOMER_CPPFLAGS="-I${with_pubsub}/src/Util/HOMER/reader/include -I${with_pubsub}/src/Util/HOMER/data/include"
   fi
   HOMER_LDFLAGS="-L${with_pubsub}/lib/`uname -s`-`uname -m`"