--- MITgcm/tools/genmake2	2004/07/20 19:43:45	1.88
+++ MITgcm/tools/genmake2	2004/08/05 16:04:32	1.95
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.88 2004/07/20 19:43:45 edhill Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.95 2004/08/05 16:04:32 edhill Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -195,30 +195,48 @@
 	    echo "    a system-default makedepend was not found."
 	    
 	    #  Try to build the cyrus implementation
-	    rm -f ./genmake_cy_md
-	    (
-		cd $ROOTDIR/tools/cyrus-imapd-makedepend  \
-		    &&  ./configure > /dev/null 2>&1  \
-		    &&  make > /dev/null 2>&1
-		if test -x ./makedepend.exe ; then
-		    $LN ./makedepend.exe ./makedepend
-		fi
-		./makedepend ifparser.c > /dev/null 2>&1  \
-		    &&  echo "true"
-	    ) > ./genmake_cy_md
-	    grep true ./genmake_cy_md > /dev/null 2>&1
+	    build_cyrus_makedepend
 	    RETVAL=$?
-	    if test "x$RETVAL" = x0 ; then
-		MAKEDEPEND='$(TOOLSDIR)/cyrus-imapd-makedepend/makedepend'
-	    else
+	    if test "x$RETVAL" != x0 ; then
 		MAKEDEPEND='$(TOOLSDIR)/xmakedepend'
 	    fi
 	    rm -f ./genmake_cy_md
 	fi
+    else
+	#  echo "MAKEDEPEND=${MAKEDEPEND}"
+	echo "${MAKEDEPEND}" | grep -i cyrus > /dev/null 2>&1
+	RETVAL=$?
+	if test x"$RETVAL" = x0 ; then
+	    build_cyrus_makedepend
+	fi
     fi
 }
 
 
+build_cyrus_makedepend()  {
+    rm -f ./genmake_cy_md
+    (
+	cd $ROOTDIR/tools/cyrus-imapd-makedepend  \
+	    &&  ./configure > /dev/null 2>&1  \
+	    &&  make > /dev/null 2>&1
+	if test -x ./makedepend.exe ; then
+	    $LN ./makedepend.exe ./makedepend
+	fi
+	./makedepend ifparser.c > /dev/null 2>&1  \
+	    &&  echo "true"
+    ) > ./genmake_cy_md
+    grep true ./genmake_cy_md > /dev/null 2>&1
+    RETVAL=$?
+    rm -f ./genmake_cy_md
+    if test "x$RETVAL" = x0 ; then
+	MAKEDEPEND='$(TOOLSDIR)/cyrus-imapd-makedepend/makedepend'
+	return 0
+    else
+	echo "WARNING: unable to build cyrus-imapd-makedepend"
+	return 1
+    fi
+}
+
 # Guess possible config options for this host
 find_possible_configs()  {
 
@@ -251,7 +269,47 @@
 
     look_for_makedepend
 
-    # look for possible fortran compilers
+    #================================================================
+    #  look for possible C compilers
+    tmp="$MITGCM_CC $CC gcc c89 cc c99 mpicc"
+    p_CC=
+    for c in $tmp ; do
+	rm -f ./genmake_hello.c  ./genmake_hello
+	cat >> genmake_hello.c << EOF
+#include <stdio.h>
+int main(int argc, char **argv) {
+  printf("Hello!\n");
+  return 0;
+}
+EOF
+	$c -o genmake_hello genmake_hello.c > /dev/null 2>&1
+	RETVAL=$?
+	if test "x${RETVAL}" = x0 ; then
+	    p_CC="$p_CC $c"
+	fi
+    done
+    rm -f ./genmake_hello.c ./genmake_hello
+    if test "x${p_CC}" = x ; then
+	cat 1>&2 <<EOF
+
+Error: No C compilers were found in your path.  Please specify one using:
+
+    1) an "optfile" on (eg. "-optfile=path/to/OPTFILE"),
+    2) the CC or MITGCM_CC environment variables.
+
+EOF
+	exit 1
+    else
+	echo "  The possible C compilers found in your path are:"
+	echo "   "$p_CC
+	if test "x$CC" = x ; then
+	    CC=`echo $p_CC | $AWK '{print $1}'`
+	    echo "  Setting C compiler to: "$CC
+	fi
+    fi
+
+    #================================================================
+    #  look for possible FORTRAN compilers
     tmp="$MITGCM_FC $FC efc g77 f77 pgf77 pgf95 ifc f90 f95 mpif77 mpf77 mpxlf95"
     p_FC=
     for c in $tmp ; do
@@ -277,7 +335,7 @@
 
     1) an "optfile" on (eg. "-optfile=path/to/OPTFILE"),
     2) a command-line option (eg. "-fc NAME"), or
-    3) the MITGCM_FC environment variable.
+    3) the FC or MITGCM_FC environment variables.
 
 EOF
 	exit 1
@@ -448,6 +506,11 @@
           will search for a working compiler by trying a list of
           "usual suspects" such as g77, f77, etc.
 
+    -cc NAME | --cc NAME | -cc=NAME | --cc=NAME
+          Use "NAME" as the C compiler.  By default, genmake 
+          will search for a working compiler by trying a list of
+          "usual suspects" such as gcc, c89, cc, etc.
+
     -[no]ieee | --[no]ieee
           Do or don't use IEEE numerics.  Note that this option 
           *only* works if it is supported by the OPTFILE that 
@@ -457,8 +520,8 @@
           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.
+          set to PATH. i.e. Include files from \$PATH/include, link to libraries
+          from \$PATH/lib and use binaries from \$PATH/bin.
 
     -bash NAME
           Explicitly specify the Bourne or BASH shell to use
@@ -483,6 +546,12 @@
 
 #  Build a CPP macro to automate calling C routines from FORTRAN
 get_fortran_c_namemangling()  {
+
+    #echo "FC_NAMEMANGLE = \"$FC_NAMEMANGLE\""
+    if test ! "x$FC_NAMEMANGLE" = x ; then
+        return 0
+    fi
+
     default_nm="#define FC_NAMEMANGLE(X) X ## _"
     
     cat > genmake_test.c <<EOF
@@ -500,7 +569,7 @@
 EOF
 	return 1
     fi
-    c_tcall=`nm genmake_test.o | grep 'T ' | grep tcall | cut -d ' ' -f 3`
+    c_tcall=`nm genmake_test.o 2>/dev/null | grep 'T ' | grep tcall | cut -d ' ' -f 3`
     RETVAL=$?
     if test "x$RETVAL" != x0 ; then
 	FC_NAMEMANGLE=$default_nm
@@ -530,7 +599,7 @@
 EOF
 	return 1
     fi
-    f_tcall=`nm genmake_tcomp.o | grep 'T ' | grep tcall | cut -d ' ' -f 3`
+    f_tcall=`nm genmake_tcomp.o 2>/dev/null | grep 'T ' | grep tcall | cut -d ' ' -f 3`
     RETVAL=$?
     if test "x$RETVAL" != x0 ; then
 	FC_NAMEMANGLE=$default_nm
@@ -607,6 +676,7 @@
 
 
 check_netcdf_libs()  {
+    echo "" > genmake_tnc.log
     cat <<EOF > genmake_tnc.for
       program fgennc
 #include "netcdf.inc"
@@ -619,7 +689,8 @@
       IF (iret .NE. NF_NOERR) write(*,*) NF_STRERROR(iret)
       end
 EOF
-    $CPP genmake_tnc.for > genmake_tnc.f  \
+    #echo "$CPP $DEFINES $INCLUDES"
+    $CPP $DEFINES $INCLUDES genmake_tnc.for > genmake_tnc.f 2>/dev/null  \
 	&&  $FC $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.f $LIBS >> genmake_tnc.log 2>&1
     RET_COMPILE=$?
     test -x ./genmake_tnc  &&  ./genmake_tnc >> genmake_tnc.log 2>&1
@@ -628,7 +699,7 @@
 	HAVE_NETCDF=t
     else
 	# try again with "-lnetcdf" added to the libs
-	$CPP genmake_tnc.for > genmake_tnc.f  \
+	$CPP $DEFINES $INCLUDES genmake_tnc.for > genmake_tnc.f 2>/dev/null  \
 	    &&  $FC $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.f \
 	    $LIBS -lnetcdf >> genmake_tnc_2.log 2>&1
 	RET_COMPILE=$?
@@ -658,6 +729,7 @@
 S64=
 KPP=
 FC=
+#CC=gcc
 CPP=
 LINK=
 DEFINES=
@@ -665,7 +737,7 @@
 ENABLE=
 DISABLE=
 MAKEFILE=
-MAKEDEPEND=
+#MAKEDEPEND=
 PDEPEND=
 DUMPSTATE=t
 PDEFAULT=
@@ -888,7 +960,12 @@
 #		ac_prev=cpp ;;
 #	    -cpp=* | --cpp=*)
 #		CPP=$ac_optarg ;;
-	    
+	
+	-cc | --cc)
+	    ac_prev=CC ;;
+	-cc=* | --cc=*)
+	    CC=$ac_optarg ;;
+	
 	-fortran | --fortran | -fc | --fc)
 	    ac_prev=FC ;;
 	-fc=* | --fc=*)
@@ -1044,7 +1121,7 @@
     fi
 fi
 
-#  Check that FC, LINK, CPP, S64, LN, and MAKE are defined.  If not,
+#  Check that FC, CC, LINK, CPP, S64, LN, and MAKE are defined.  If not,
 #  either set defaults or complain and abort!
 if test ! "x$BASH" = x ; then
     # add a trailing space so that it works within the Makefile syntax (see below)
@@ -1060,6 +1137,16 @@
 EOF
     exit 1
 fi
+if test "x$CC" = x ; then
+    CC=cc
+#     cat <<EOF 1>&2
+# Error: no C compiler: please specify using one of the following:
+#   1) within the options file ("CC=...") as specified by "-of=OPTFILE"
+#   2) the "-cc=XXX" command-line option
+#   3) the "./genmake_local" file
+# EOF
+#     exit 1
+fi
 if test "x$LINK" = x ; then
     LINK=$FC
 fi
@@ -1766,6 +1853,8 @@
 FC = ${FC}
 # Fortran compiler
 F90C = ${F90C}
+# C compiler
+CC = ${CC}
 # Link editor
 LINK = ${LINK} ${LDADD}