Mods for Solaris

diff --git a/Makefile b/Makefile
index 250cda5ce688eefa7b1f1dfc9a3ee975d44c50ee..ae5aa5c54eb99d85b145534270ad22009d82b511 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@ endif
 #-------------------------------------------------------------------------------
 # Check if DATE is installed
 
 #-------------------------------------------------------------------------------
 # Check if DATE is installed
 

-ifneq ($(shell date-config 2>&1 | grep -i usage),)
+ifneq ($(shell which date-config | grep "^/"),)

 DATEFLAGS := -DALI_DATE $(shell date-config --cflags | tr \" \')
 CXXFLAGS  += $(DATEFLAGS)
 CFLAGS    += $(DATEFLAGS)
 DATEFLAGS := -DALI_DATE $(shell date-config --cflags | tr \" \')
 CXXFLAGS  += $(DATEFLAGS)
 CFLAGS    += $(DATEFLAGS)

diff --git a/build/Makefile.solarisCC5 b/build/Makefile.solarisCC5
index d3d3ac7badefe9d051abaf9cf966f740dc3e43c4..e4a5a6408198c56c5d3d0fefc95848a99f5b0518 100644 (file)
--- a/build/Makefile.solarisCC5
+++ b/build/Makefile.solarisCC5
@@ -29,7 +29,7 @@ FFLAGS        = $(FOPT) $(CLIBFOPT) $(CLIBDEFS)  -KPIC
 DEPENDFFLAGS  = $(FFLAGS) 
 
 # rootcint flags
 DEPENDFFLAGS  = $(FFLAGS) 
 
 # rootcint flags

-CINTFLAGS     = 
+CINTFLAGS     := 

 
 SHLIB         = 
 SOEXT        = so
 
 SHLIB         = 
 SOEXT        = so

diff --git a/build/module.tpl b/build/module.tpl
index d59485274b15c30929e1ce320a37c0ac31381472..0d58a2dbdd95cb89b1273983583e08f95a3f7013 100644 (file)
--- a/build/module.tpl
+++ b/build/module.tpl
@@ -269,6 +269,11 @@ endif
           echo "#pragma link C++ class $(i)+;" >> $@ ;)
        $(MUTE)echo '#endif' >> $@
 
           echo "#pragma link C++ class $(i)+;" >> $@ ;)
        $(MUTE)echo '#endif' >> $@
 

+ifneq ($(findstring solaris,$(ALICE_TARGET)),)
+# shameful hack....
+CINTFLAGS := $(filter-out -library=stlport4,$(CINTFLAGS))
+endif
+

 $(@PACKAGE@DS): $(@PACKAGE@CINTHDRS) $(@PACKAGE@DH) @MODULE@/module.mk
 ifndef ALIQUIET
         @echo "***** Creating $@ *****";
 $(@PACKAGE@DS): $(@PACKAGE@CINTHDRS) $(@PACKAGE@DH) @MODULE@/module.mk
 ifndef ALIQUIET
         @echo "***** Creating $@ *****";