--- MITgcm/tools/genmake2	2004/10/27 18:25:05	1.110
+++ MITgcm/tools/genmake2	2005/01/05 22:30:55	1.114
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.110 2004/10/27 18:25:05 edhill Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.114 2005/01/05 22:30:55 edhill Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -718,10 +718,18 @@
 
 
 check_netcdf_libs()  {
+    if test ! "x$SKIP_NETCDF_CHECK" = x ; then
+	return
+    fi
     echo "" > genmake_tnc.log
     cat <<EOF > genmake_tnc.for
       program fgennc
 #include "netcdf.inc"
+EOF
+    if test ! "x$MPI" = x ; then
+	echo '#include "mpif.h"' >> genmake_tnc.for
+    fi
+    cat <<EOF >> genmake_tnc.for
       integer iret, ncid, xid
       iret = nf_create('genmake_tnc.nc', NF_CLOBBER, ncid)
       IF (iret .NE. NF_NOERR) write(*,*) NF_STRERROR(iret)
@@ -731,11 +739,22 @@
       IF (iret .NE. NF_NOERR) write(*,*) NF_STRERROR(iret)
       end
 EOF
-    #echo "$CPP $DEFINES $INCLUDES genmake_tnc.for > genmake_tnc.f"
-    #echo "$FC $FFLAGS $FOPTIM -c genmake_tnc.f"
-    #echo "$LINK -o genmake_tnc.o $LIBS"
+    echo "Executing:" > genmake_tnc.log
+    echo "  $CPP $DEFINES $INCLUDES genmake_tnc.for > genmake_tnc.f" \
+	> genmake_tnc.log
+    RET_CPP=f
     $CPP $DEFINES $INCLUDES genmake_tnc.for > genmake_tnc.f 2>/dev/null  \
-	&&  $FC $FFLAGS $FOPTIM -c genmake_tnc.f >> genmake_tnc.log 2>&1  \
+	&&  RET_CPP=t
+    if test "x$RET_CPP" = xf ; then
+	echo "  WARNING: CPP failed to pre-process the netcdf test." \
+	    > genmake_tnc.log
+	echo "    Please check that \$INCLUDES is properly set." \
+	    > genmake_tnc.log
+    fi
+    echo "Executing:" > genmake_tnc.log
+    echo "  $FC $FFLAGS $FOPTIM -c genmake_tnc.f" > genmake_tnc.log
+    echo "  $LINK -o genmake_tnc.o $LIBS" > genmake_tnc.log
+    $FC $FFLAGS $FOPTIM -c genmake_tnc.f >> genmake_tnc.log 2>&1  \
 	&&  $LINK -o genmake_tnc genmake_tnc.o $LIBS >> genmake_tnc.log 2>&1
     RET_COMPILE=$?
 
@@ -777,9 +796,9 @@
 LN=
 S64=
 KPP=
-FC=
+#FC=
 #CC=gcc
-CPP=
+#CPP=
 LINK=
 DEFINES=
 PACKAGES=
@@ -791,7 +810,7 @@
 DUMPSTATE=t
 PDEFAULT=
 OPTFILE=
-INCLUDES="-I."
+INCLUDES="-I. $INCLUDES"
 FFLAGS=
 FOPTIM=
 CFLAGS=
@@ -823,8 +842,8 @@
 G2ARGS=
 BASH=
 PWD=`pwd`
-MAKE=make
-AWK=awk
+test "x$MAKE" = x  &&  MAKE=make
+test "x$AWK" = x   &&  AWK=awk
 THISHOST=`hostname`
 THISCWD=`pwd`
 THISDATE=`date`
@@ -1090,7 +1109,7 @@
 
 #  Find the MITgcm ${ROOTDIR}
 if test "x${ROOTDIR}" = x ; then
-    tmp=`echo $PWD | sed -e 's/\// /g' | awk '{print $NR}'`
+    tmp=`echo $PWD | sed -e 's/\// /g' | $AWK '{print $NR}'`
     if test "x$tmp" = "xbin" -a -d ../model -a -d ../eesup -a -d ../pkg ; then
 	ROOTDIR=".."
     else
@@ -1377,7 +1396,7 @@
 fi
 
 if test "x${EXEDIR}" = x ; then
-    tmp=`echo $PWD | sed -e 's/\// /g' | awk '{print $NR}'`
+    tmp=`echo $PWD | sed -e 's/\// /g' | $AWK '{print $NR}'`
     if test "x$tmp" = "xbin" -a -d ../exe -a $ROOTDIR = .. ; then
 	EXEDIR=../exe
     else
@@ -1837,7 +1856,7 @@
 		  	deplist="$deplist $sf"
 			;;
                 esac
-		extn=`echo $sf | $AWK -F '.' '{print $NF}'`
+		extn=`echo $sf | $AWK 'BEGIN {FS="."}; {print $NF}'`
 		case $extn in
 		    F)
 			echo    " \\"  >> srclist.inc