--- MITgcm/tools/genmake2	2005/09/11 18:52:26	1.130
+++ MITgcm/tools/genmake2	2005/12/03 08:30:32	1.137
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.130 2005/09/11 18:52:26 edhill Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.137 2005/12/03 08:30:32 edhill Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -353,10 +353,18 @@
     else
 	echo "  The possible FORTRAN compilers found in your path are:"
 	echo "   "$p_FC
-	if test "x$FC" = x ; then
-	    FC=`echo $p_FC | $AWK '{print $1}'`
-	    echo "  Setting FORTRAN compiler to: "$FC
-	fi
+    fi
+
+    #  Use the first of the compilers found in the current PATH
+    #  that has a correctly-named optfile
+    if test "x$OPTFILE" = x  -a  "x$FC" = x ; then
+	for i in $p_FC ; do
+	    OPTFILE=$ROOTDIR"/tools/build_options/"$PLATFORM"_"$i
+	    if test -r $OPTFILE ; then
+		echo "  Setting OPTFILE to: "$OPTFILE
+		break
+	    fi
+	done
     fi
 
     if test "x$OPTFILE" = x ; then
@@ -601,7 +609,7 @@
       call tsub( string )
       end
 EOF
-    $FC $FFLAGS $DEFINES -c genmake_tcomp.$FS >> genmake_warnings 2>&1
+    $FC $FFLAGS -c genmake_tcomp.$FS >> genmake_warnings 2>&1
     RETVAL=$?
     if test "x$RETVAL" != x0 ; then
 	FC_NAMEMANGLE=$default_nm
@@ -689,6 +697,63 @@
 }
 
 
+check_HAVE_SIGREG()  {
+    get_fortran_c_namemangling
+    cat <<EOF > genmake_tc_1.c
+$FC_NAMEMANGLE
+#include <stdlib.h>
+#include <stdio.h>
+#include <signal.h>
+#include <errno.h>
+#include <ucontext.h>
+
+int * ip;
+
+static void killhandler(
+    unsigned int sn, siginfo_t  si, struct ucontext *sc )
+{
+    *ip = *ip + 1;
+    return;
+}
+
+void FC_NAMEMANGLE(sigreg) (int * aip)
+{
+    ip = aip;
+    struct sigaction s;
+    s.sa_flags = SA_SIGINFO;
+    s.sa_sigaction = (void *)killhandler;
+    if(sigaction (SIGTERM,&s,(struct sigaction *)NULL)) {
+	printf("Sigaction returned error = %d\n", errno);
+	exit(0);
+    }
+    return;
+}
+EOF
+    make genmake_tc_1.o >> genmake_warnings 2>&1
+    RET_C=$?
+    cat <<EOF > genmake_tc_2.$FS
+      program hello
+      integer anint
+      common /iv/ anint
+      external sigreg
+      call sigreg(anint)
+      end
+EOF
+    echo >> genmake_warnings
+    echo "running: check_HAVE_SIGREG()" >> genmake_warnings
+    cat genmake_tc_2.$FS >> genmake_warnings
+    COMM="$FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o"
+    echo $COMM >> genmake_warnings
+    $COMM >> genmake_warnings 2>&1
+    RETVAL=$?
+    if test "x$RETVAL" = x0 ; then
+	HAVE_SIGREG=t
+	DEFINES="$DEFINES -DHAVE_SIGREG"
+    fi
+    rm -f genmake_tc*
+}
+
+
 check_HAVE_SETRLSTK()  {
     get_fortran_c_namemangling
     cat <<EOF > genmake_tc_1.c
@@ -713,9 +778,12 @@
       call setrlstk()
       end
 EOF
-    $FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o >> genmake_warnings 2>&1
-    RET_F=$?
-    test -x ./genmake_tc  &&  ./genmake_tc >> genmake_warnings 2>&1
+    echo >> genmake_warnings
+    echo "running: check_HAVE_SETRLSTK()" >> genmake_warnings
+    cat genmake_tc_2.$FS >> genmake_warnings
+    COMM="$FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o"
+    echo $COMM >> genmake_warnings
+    $COMM >> genmake_warnings 2>&1
     RETVAL=$?
     if test "x$RETVAL" = x0 ; then
 	HAVE_SETRLSTK=t
@@ -755,9 +823,12 @@
       print *," HELLO WORLD", nbyte
       end
 EOF
-    $FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o >> genmake_tc.log 2>&1
-    RET_F=$?
-    test -x ./genmake_tc  &&  ./genmake_tc >> genmake_tc.log 2>&1
+    echo >> genmake_warnings
+    echo "running: check_HAVE_STAT()" >> genmake_warnings
+    cat genmake_tc_2.$FS >> genmake_warnings
+    COMM="$FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o"
+    echo $COMM >> genmake_warnings
+    $COMM >> genmake_tc.log 2>&1
     RETVAL=$?
     if test "x$RETVAL" = x0 ; then
 	HAVE_STAT=t
@@ -771,7 +842,8 @@
     if test ! "x$SKIP_NETCDF_CHECK" = x ; then
 	return
     fi
-    echo "" > genmake_tnc.log
+    echo >> genmake_warnings
+    echo "running: check_netcdf_libs()" >> genmake_warnings
     cat <<EOF > genmake_tnc.F
       program fgennc
 #include "netcdf.inc"
@@ -789,24 +861,25 @@
       IF (iret .NE. NF_NOERR) write(*,*) NF_STRERROR(iret)
       end
 EOF
-    echo "Executing:" > genmake_tnc.log
-    echo "  $CPP $DEFINES $INCLUDES genmake_tnc.F > genmake_tnc.$FS" \
-	> genmake_tnc.log
+    echo "===  genmake_tnc.F  ===" > genmake_tnc.log
+    cat genmake_tnc.F >> genmake_tnc.log
+    echo "===  genmake_tnc.F  ===" >> genmake_tnc.log
     RET_CPP=f
-    $CPP $DEFINES $INCLUDES genmake_tnc.F > genmake_tnc.$FS 2>/dev/null  \
-	&&  RET_CPP=t
+    COMM="$CPP $DEFINES $INCLUDES genmake_tnc.F"
+    echo "$COMM" >> genmake_tnc.log
+    $COMM > genmake_tnc.$FS 2>/dev/null  &&  RET_CPP=t
     if test "x$RET_CPP" = xf ; then
 	echo "  WARNING: CPP failed to pre-process the netcdf test." \
-	    > genmake_tnc.log
+	    >> genmake_tnc.log
 	echo "    Please check that \$INCLUDES is properly set." \
-	    > genmake_tnc.log
+	    >> genmake_tnc.log
     fi
-    echo "Executing:" > genmake_tnc.log
-    echo "  $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS" > genmake_tnc.log
-    echo "  $LINK -o genmake_tnc.o $LIBS" > genmake_tnc.log
+    echo "$FC $FFLAGS $FOPTIM -c genmake_tnc.$FS  \ " >> genmake_tnc.log
+    echo "  &&  $LINK -o genmake_tnc.o $LIBS" >> genmake_tnc.log
     $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS >> genmake_tnc.log 2>&1  \
 	&&  $LINK -o genmake_tnc genmake_tnc.o $LIBS >> genmake_tnc.log 2>&1
     RET_COMPILE=$?
+    cat genmake_tnc.log >> genmake_warnings
 
     #EH3  Remove test program execution for machines that either disallow
     #EH3  execution or cannot support it (eg. cross-compilers)
@@ -819,15 +892,18 @@
 	HAVE_NETCDF=t
     else
 	# try again with "-lnetcdf" added to the libs
+	echo "try again with added '-lnetcdf'" > genmake_tnc.log
+	echo "$CPP $DEFINES $INCLUDES genmake_tnc.F > genmake_tnc.$FS \ " >> genmake_tnc.log
+	echo " &&  $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS \ " >> genmake_tnc.log
+	echo " &&  $LINK -o genmake_tnc genmake_tnc.o $LIBS -lnetcdf" >> genmake_tnc.log
 	$CPP $DEFINES $INCLUDES genmake_tnc.F > genmake_tnc.$FS 2>/dev/null  \
 	    &&  $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS >> genmake_tnc.log 2>&1  \
 	    &&  $LINK -o genmake_tnc genmake_tnc.o $LIBS -lnetcdf >> genmake_tnc.log 2>&1
 	RET_COMPILE=$?
+	cat genmake_tnc.log >> genmake_warnings
 	if test "x$RET_COMPILE" = x0 ; then
 	    LIBS="$LIBS -lnetcdf"
 	    HAVE_NETCDF=t
-	else
-	    cat genmake_tnc.log >> genmake_warnings
 	fi
     fi
     rm -f genmake_tnc*
@@ -874,6 +950,7 @@
 MPI=
 MPIPATH=
 TS=
+HAVE_TEST_L=
 
 # DEFINES checked by test compilation or command-line
 HAVE_SYSTEM=
@@ -1338,6 +1415,11 @@
 EOF
     exit 1
 fi
+test -L genmake_tlink > /dev/null 2>&1
+RETVAL=$?
+if test "x$RETVAL" = x0 ; then
+    HAVE_TEST_L=t
+fi
 rm -f genmake_test_ln genmake_tlink
 
 #  Check for broken *.F/*.f handling and fix if possible
@@ -1360,7 +1442,7 @@
       call system('echo hi')
       end
 EOF
-$FC $FFLAGS $DEFINES -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1
+$FC $FFLAGS -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1
 RETVAL=$?
 if test "x$RETVAL" = x0 ; then
     HAVE_SYSTEM=t
@@ -1381,7 +1463,7 @@
       print *, string
       end
 EOF
-$FC $FFLAGS $DEFINES -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1
+$FC $FFLAGS -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1
 RETVAL=$?
 if test "x$RETVAL" = x0 ; then
     HAVE_FDATE=t
@@ -1403,7 +1485,7 @@
       print *, tarray
       end
 EOF
-$FC $FFLAGS $DEFINES -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1
+$FC $FFLAGS -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1
 RETVAL=$?
 if test "x$RETVAL" = x0 ; then
     HAVE_ETIME=t
@@ -1433,6 +1515,15 @@
 fi
 rm -f genmake_t*
 
+printf "  Can we register a signal handler using $FC...  "
+check_HAVE_SIGREG
+if test "x$HAVE_SIGREG" != x ; then
+    echo "yes"
+else
+    echo "no"
+fi
+rm -f genmake_t*
+
 printf "  Can we use stat() through C calls...  "
 check_HAVE_STAT
 if test "x$HAVE_STAT" != x ; then
@@ -1920,6 +2011,7 @@
     for sf in $sfiles ; do
 	if test ! -r ".links.tmp/$sf" ; then
 	    if test -f "$d/$sf" ; then
+		ignore_f=f
                 case $d/$sf in
                   ./$PACKAGES_DOT_H)
 			;;
@@ -1930,33 +2022,41 @@
                   ./BUILD_INFO.h)
 			;;
                   *)
-		  	touch .links.tmp/$sf
-		  	deplist="$deplist $sf"
+			#  For the local directory *ONLY*,
+			#  ignore all soft-links
+			if test "x$HAVE_TEST_L" = xt -a "x$d" = x. -a -L $sf ; then
+			    ignore_f=t
+			else
+			    touch .links.tmp/$sf
+			    deplist="$deplist $sf"
+			fi
 			;;
                 esac
-		extn=`echo $sf | $AWK -F. '{print $NF}'`
-		case $extn in
-		    F)
-			echo    " \\"  >> srclist.inc
-			printf " $sf" >> srclist.inc
-			;;
-		    F90)
-			echo    " \\"  >> f90srclist.inc
-			printf " $sf" >> f90srclist.inc
-			;;
-		    c)
-			echo    " \\"  >> csrclist.inc
-			printf " $sf" >> csrclist.inc
-			;;
-		    h)
-			echo    " \\"  >> hlist.inc
-			printf " $sf" >> hlist.inc
-			;;
-		    flow)
-			echo    " \\"  >> ad_flow_files.inc
-			printf " $sf" >> ad_flow_files.inc
-			;;
-		esac
+		if test "x$ignore_f" = xf ; then
+		    extn=`echo $sf | $AWK -F. '{print $NF}'`
+		    case $extn in
+			F)
+			    echo    " \\"  >> srclist.inc
+			    printf " $sf" >> srclist.inc
+			    ;;
+			F90)
+			    echo    " \\"  >> f90srclist.inc
+			    printf " $sf" >> f90srclist.inc
+			    ;;
+			c)
+			    echo    " \\"  >> csrclist.inc
+			    printf " $sf" >> csrclist.inc
+			    ;;
+			h)
+			    echo    " \\"  >> hlist.inc
+			    printf " $sf" >> hlist.inc
+			    ;;
+			flow)
+			    echo    " \\"  >> ad_flow_files.inc
+			    printf " $sf" >> ad_flow_files.inc
+			    ;;
+		    esac
+		fi
 	    fi
 	fi
     done
@@ -2107,6 +2207,11 @@
 	\$(TOOLSDIR)/f90mkdepend >> \$(MAKEFILE)
 	-rm -f makedepend.out
 
+lib: libmitgcmuv.a
+
+libmitgcmuv.a: \$(OBJFILES)
+	ar rcv libmitgcmuv.a \$(OBJFILES)
+
 links: \$(SRCFILES) \$(CSRCFILES) \$(HEADERFILES) \$(F90SRCFILES) \$(SPECIAL_FILES)
 
 small_f: \$(F77FILES) \$(F90FILES)