--- MITgcm/tools/genmake2	2004/02/23 21:51:32	1.66
+++ MITgcm/tools/genmake2	2004/02/28 05:01:12	1.70
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.66 2004/02/23 21:51:32 edhill Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.70 2004/02/28 05:01:12 edhill Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -100,13 +100,47 @@
 	CPP="cpp -traditional -P"
     fi
 
-    # makedepend is not always available
+    #  The "original" makedepend is part of the Imake system that is
+    #  most often distributed with XFree86 or with an XFree86 source
+    #  package.  As a result, many machines (eg. generic Linux) do not
+    #  have a system-default "makedepend" available.  For those
+    #  systems, we have two fall-back options:
+    #
+    #    1) a makedepend implementation shipped with the cyrus-imapd
+    #       package:  ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
+    #
+    #    2) a known-buggy xmakedpend shell script
+    #
+    #  So the choices are, in order:
+    #
+    #    1) use the user-specified program
+    #    2) use a system-wide default
+    #    3) locally build and use the cyrus implementation
+    #    4) fall back to the buggy local xmakedpend script
+    #
     if test "x${MAKEDEPEND}" = x ; then
       which makedepend >& /dev/null
       RETVAL=$?
-      if test "x${RETVAL}" = x1 ; then
-         echo "    makedepend was not found. Using xmakedpend instead."
-         MAKEDEPEND='$(TOOLSDIR)/xmakedepend'
+      if test ! "x${RETVAL}" = x0 ; then
+         echo "    a system-default makedepend was not found."
+
+	 #  Try to build the cyrus impl
+	 rm -f ./genmake_cy_md
+	 (
+	     cd $ROOTDIR/tools/cyrus-imapd-makedepend  \
+		 &&  ./configure > /dev/null 2>&1  \
+		 &&  make > /dev/null 2>&1  \
+		 &&  ./makedepend ifparser.c > /dev/null 2>&1  \
+		 &&  echo "true"
+	 ) > ./genmake_cy_md
+	 grep true ./genmake_cy_md > /dev/null 2>&1
+	 RETVAL=$?
+	 if test "x$RETVAL" = x0 ; then
+	     MAKEDEPEND='$(TOOLSDIR)/cyrus-imapd-makedepend/makedepend'
+	 else
+	     MAKEDEPEND='$(TOOLSDIR)/xmakedepend'
+	 fi
+	 rm -f ./genmake_cy_md
       fi
     fi
 
@@ -145,18 +179,27 @@
 	echo "   "$p_FC
 	if test "x$FC" = x ; then
 	    FC=`echo $p_FC | $AWK '{print $1}'`
+	    echo "  Setting FORTRAN compiler to: "$FC
 	fi
     fi
 
-    for i in $p_FC ; do
-	p_OF=$ROOTDIR"/tools/build_options/"$PLATFORM"_"$i
-	if test -r $p_OF ; then
-	    OPTFILE=$p_OF
-	    echo "  The options file:  $p_OF"
-	    echo "    appears to match so we'll use it."
-	    break
-	fi
-    done
+    if test "x$OPTFILE" = x ; then
+	OPTFILE=$ROOTDIR"/tools/build_options/"$PLATFORM"_"$FC
+	if test ! -r $OPTFILE ; then
+             echo "  I looked for the file "$OPTFILE" but did not find it"
+        fi
+    fi
+#    echo "  The options file:  $p_OF"
+#    echo "    appears to match so we'll use it."
+#   for i in $p_FC ; do
+#p_OF=$ROOTDIR"/tools/build_options/"$PLATFORM"_"$i
+#if test -r $p_OF ; then
+#    OPTFILE=$p_OF
+#    echo "  The options file:  $p_OF"
+#    echo "    appears to match so we'll use it."
+#    break
+#fi
+#   done
     if test "x$OPTFILE" = x ; then
 	cat 1>&2 <<EOF
 
@@ -253,6 +296,10 @@
       --makefile=NAME | -mf=NAME
           Call the makefile "NAME".  The default is "Makefile".
 
+    -makedepend NAME | -md NAME
+      --makedepend=NAME | -md=NAME
+          Use "NAME" for the MAKEDEPEND program.
+
     -rootdir NAME | --rootdir NAME | -rd NAME | --rd NAME
       -rootdir=NAME | --rootdir=NAME | -rd=NAME | --rd=NAME
           Specify the location of the MITgcm ROOTDIR as "NAME".
@@ -294,6 +341,13 @@
           *only* works if it is supported by the OPTFILE that 
           is being used.
 
+    -mpi | --mpi
+          Include MPI header files and link to MPI libraries
+    -mpi=PATH | --mpi=PATH
+          Include MPI header files and link to MPI libraries using MPI_ROOT
+          set to PATH. i.e. Include files from $PATH/include, link to libraries
+          from $PATH/lib and use binaries from $PATH/bin.
+
   While it is most often a single word, the "NAME" variables specified 
   above can in many cases be a space-delimited string such as:
 
@@ -476,6 +530,11 @@
 }
 
 
+
+###############################################################################
+#   Sequential part of script starts here
+###############################################################################
+
 #  Set defaults here
 COMMANDL="$0 $@"
 
@@ -486,7 +545,6 @@
 FC=
 CPP=
 LINK=
-# DEFINES="-DWORDLENGTH=4"
 DEFINES=
 PACKAGES=
 ENABLE=
@@ -503,10 +561,13 @@
 CFLAGS=
 KFLAGS1=
 KFLAGS2=
+#LDADD=
 LIBS=
 KPPFILES=
 NOOPTFILES=
 NOOPTFLAGS=
+MPI=
+MPIPATH=
 
 # DEFINES checked by test compilation
 HAVE_SYSTEM=
@@ -654,6 +715,11 @@
 	-make=* | --make=* | -m=* | --m=*)
 	    MAKE=$ac_optarg ;;
 	
+	-makedepend | --makedepend | -md | --md)
+	    ac_prev=MAKEDEPEND ;;
+	-makedepend=* | --makedepend=* | -md=* | --md=*)
+	    MAKEDEPEND=$ac_optarg ;;
+	
 	-makefile | --makefile | -ma | --ma)
 	    ac_prev=MAKEFILE ;;
 	-makefile=* | --makefile=* | -ma=* | --ma=*)
@@ -705,6 +771,12 @@
 	    IEEE=true ;;
 	-noieee | --noieee)
 	    IEEE= ;;
+
+	-mpi | --mpi)
+	    MPI=true ;;
+	-mpi=* | --mpi=*)
+	    MPIPATH=$ac_optarg
+	    MPI=true ;;
 	
 #	-jam | --jam)
 #	    JAM=1 ;;
@@ -897,6 +969,10 @@
 fi
 rm -f genmake_test_ln genmake_tlink
 
+if test ! "x$MPI" = x ; then
+      echo "  Turning on MPI cpp macros"
+      DEFINES="$DEFINES -DALLOW_USE_MPI -DALWAYS_USE_MPI"
+fi
 
 printf "\n===  Checking system libraries  ===\n"
 echo -n "  Do we have the system() command using $FC...  "
@@ -1514,7 +1590,7 @@
 # Fortran compiler
 F90C = ${F90C}
 # Link editor
-LINK = ${LINK}
+LINK = ${LINK} ${LDADD}
 
 # Defines for CPP
 DEFINES = ${DEFINES}