#! /bin/sh /usr/share/dpatch/dpatch-run
## 320-support-ifort-and-gfortran.dpatch by  <kmccarty@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Support use of ifort, icc and/or gfortran as default compilers.

@DPATCH@
diff -urNad paw-2.14.04~/src/pawlib/comis/code/csinit.F paw-2.14.04/src/pawlib/comis/code/csinit.F
--- paw-2.14.04~/src/pawlib/comis/code/csinit.F	2006-09-07 17:57:19.881356063 -0400
+++ paw-2.14.04/src/pawlib/comis/code/csinit.F	2006-09-07 18:04:23.085153626 -0400
@@ -217,8 +217,18 @@
 #endif
 #if (defined(CERNLIB_LINUX))
       ITMPLEN=CSTMPD(CHPATH, 256)
+# if (defined(CERNLIB_GFORTRAN))
+      CHF77 ='gfortran -g -c -fPIC'
+# elif (defined(CERNLIB_INTELIFC))
+      CHF77 ='ifort -g -c -fPIC'
+# else
       CHF77 ='g77 -g -c -fPIC'
+# endif
+# if (defined(CERNLIB_INTELIFC))
+      CHCC  ='icc -g -c -fPIC'
+# else
       CHCC  ='cc -g -c -fPIC'
+# endif
 #endif
 #if (defined(CERNLIB_SGI))&&(defined(CERNLIB_SHL))
       ITMPLEN=CSTMPD(CHPATH, 256)
diff -urNad paw-2.14.04~/src/pawlib/paw/ntuple/Imakefile paw-2.14.04/src/pawlib/paw/ntuple/Imakefile
--- paw-2.14.04~/src/pawlib/paw/ntuple/Imakefile	2006-09-07 17:57:19.916348611 -0400
+++ paw-2.14.04/src/pawlib/paw/ntuple/Imakefile	2006-09-07 17:57:35.628002463 -0400
@@ -16,9 +16,17 @@
 EXTRA_DEFINES := $(EXTRA_DEFINES) -Dextname
 #endif
 
-#if defined(CERNLIB_LINUX)
+#if defined(CERNLIB_LINUX) && !defined(CERNLIB_QMLXIA64)
+EXTRA_DEFINES := $(EXTRA_DEFINES) -Df2cFortran
+#endif
+
+#if defined(CERNLIB_QMLXIA64) 
+#if defined(CERNLIB_GFORTRAN)
+EXTRA_DEFINES := $(EXTRA_DEFINES) -DgFortran
+#else
 EXTRA_DEFINES := $(EXTRA_DEFINES) -Df2cFortran
 #endif
+#endif
 
 #if defined(CERNLIB_HPUX)
 CCOPTIONS += -Wp,-H10000