- check for AliRoot features/libs/files and corresponding conditional

[u/mrichter/AliRoot.git] / HLT / Makefile.conf

diff --git a/HLT/Makefile.conf b/HLT/Makefile.conf
index 7ca26ede21b3bb735a6d27e38051e441443fd62d..d2dc1e54b29a8dbb3ba1513fa212de64de17ddc7 100644 (file)
--- a/HLT/Makefile.conf
+++ b/HLT/Makefile.conf
@@ -1,3 +1,4 @@
+# -*- Mode: Makefile -*-
 #$Id$
 ################################
 # Makefile.conf for HLT code.  #
@@ -7,7 +8,11 @@
 ################################
 
 #Added for MACOSX
-ARCH = $(shell uname)
+ARCH := $(shell root-config --arch)
+
+ifeq ($(ARCH),macosxxlc)
+ARCH := macosx
+endif
 
 #Specify the directory where the level3code tree is located.
 ifndef ALIHLT_TOPDIR
@@ -77,9 +82,9 @@ CINTCXXFLAGS  = -pipe -W -Wall -fsigned-char \
                 -DG__REGEXP  -DG__UNIX -DG__SHAREDLIB \
                 -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL
 LD              = $(CXX)
-#SOFLAGS         = -bundle -flat_namespace -Xlinker -bind_at_load -undefined suppress
-SOFLAGS         = -bundle -flat_namespace -undefined suppress
-DYFLAGS         = -dynamiclib -flat_namespace -undefined suppress \
+#SOFLAGS         = -bundle -Xlinker -bind_at_load -undefined suppress
+SOFLAGS         = -bundle -undefined suppress
+DYFLAGS         = -dynamiclib -undefined suppress \
                   -compatibility_version 1 -current_version 1.0.0 
 LDFLAGS         = -O $(EXTRALDFLAGS) -L/sw/lib -ldl
 else