--- MITgcm/tools/genmake2	2004/07/20 19:43:45	1.88
+++ MITgcm/tools/genmake2	2004/07/27 20:59:19	1.90
@@ -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.90 2004/07/27 20:59:19 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()  {
 
@@ -483,6 +501,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
@@ -619,7 +643,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  \
 	&&  $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 +653,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  \
 	    &&  $FC $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.f \
 	    $LIBS -lnetcdf >> genmake_tnc_2.log 2>&1
 	RET_COMPILE=$?
@@ -665,7 +690,7 @@
 ENABLE=
 DISABLE=
 MAKEFILE=
-MAKEDEPEND=
+#MAKEDEPEND=
 PDEPEND=
 DUMPSTATE=t
 PDEFAULT=