X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=conf%2FMachineDef.Linux;h=2e854b80a1cc6155b5dc118b689903830c569aff;hp=a0895a9713079036b22ea18c320c86d71450dacf;hb=9e11827bfb1e5d71580dfe3f4dccd7c12e87a09e;hpb=ad51aeb0c02b3e46da92b7c5d59c38d3518352f2

diff --git a/conf/MachineDef.Linux b/conf/MachineDef.Linux
index a0895a97130..2e854b80a1c 100644
--- a/conf/MachineDef.Linux
+++ b/conf/MachineDef.Linux
@@ -14,7 +14,11 @@ OPT           = -g
 SL	      = so
 
 # The options
-CXXOPTS       = $(OPT) -Wall -fPIC  -fno-rtti -fno-exceptions
+#
+# starting from root.2.22 on Linux the flags -fno-rtti -fno-exceptions are
+# not necessary any more
+#
+CXXOPTS       = $(OPT) -Wall -fPIC
 COPT	      = $(OPT)
 FOPT	      = $(OPT) -fno-second-underscore
 
@@ -27,9 +31,11 @@ CLIBFOPT      =
 
 # Additional directories for dependencies
 
-DEPINC        = -I/usr/local/include/g++ -I/usr/local/include \
-		-I/usr/local/i686-pc-linux-gnu/include \
-		-I/usr/local/lib/gcc-lib/i686-pc-linux-gnu/egcs-2.91.60/include
+DEPINC	      = `rm -f /tmp/d.cxx; touch /tmp/d.cxx ; \
+                 g++ -v -c /tmp/d.cxx -o /dev/null 2>&1 | \
+                 awk 'BEGIN {i=0} {if(substr($$0,1,10)=="End of sea") i=0; \
+                 if(i==1) printf "%s",$$sub(" ","-I")" "; \
+                 if(substr($$0,1,10) == "\#include <") i=1}' ; rm /tmp/d.cxx`
 		
 LD            = g++
 LDFLAGS       = $(OPT)