--- tof/flight/ToFNuclei/Makefile	2008/10/13 14:00:04	1.1
+++ tof/flight/ToFNuclei/Makefile	2009/08/06 12:06:16	1.2
@@ -30,9 +30,22 @@
 UNAMEA=`uname -a`
 TODAY=`date`
 # F77
+ifeq ($(GCC4),)
+export GCCVERS=$(shell echo `gcc -dumpversion | sed 's/\./\ /g'`)
+export GCCVERMAJ=$(word 1,$(GCCVERS))
+export GCC4=$(shell echo `echo "${GCCVERMAJ} > 3" |bc -l`)
+endif
+ifeq ($(GCC4),1)
+F77=gfortran
+LG2C=-lgfortran
+EXTRAOPT=
+else
 F77=g77
+LG2C=-lg2c
+EXTRAOPT=-Wno-globals -fvxt
+endif
 #F77FLAGS=  -Wall -Wno-globals -fvxt -fno-automatic -fbounds-check -g -extend_source -static -fno-backslash ${PAM_BIT} 
-F77FLAGS=  -Wall -Wno-globals -fvxt -fno-automatic -fbounds-check -extend_source -static -fno-backslash ${PAM_BIT} 
+F77FLAGS=  -Wall -funroll-loops -fPIC $(EXTRAOPT) -fno-automatic -fbounds-check -extend_source -static -fno-backslash ${PAM_BIT}
 # C++
 CXX=g++
 #CXXFLAGS=-Wall -O -fPIC -pthread -g ${PAM_BIT}