/[MITgcm]/MITgcm/tools/genmake2
ViewVC logotype

Diff of /MITgcm/tools/genmake2

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.62 by edhill, Thu Jan 15 19:19:59 2004 UTC revision 1.66 by edhill, Mon Feb 23 21:51:32 2004 UTC
# Line 458  EOF Line 458  EOF
458      if test "x$RET_COMPILE" = x0 -a "x$RETVAL" = x0 ; then      if test "x$RET_COMPILE" = x0 -a "x$RETVAL" = x0 ; then
459          HAVE_NETCDF=t          HAVE_NETCDF=t
460      else      else
461          cat genmake_tnc.log >> genmake_warnings          # try again with "-lnetcdf" added to the libs
462            $CPP genmake_tnc.F > genmake_tnc.f  \
463                &&  $FC $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.f \
464                $LIBS -lnetcdf >> genmake_tnc_2.log 2>&1
465            RET_COMPILE=$?
466            test -x ./genmake_tnc  &&  ./genmake_tnc >> genmake_tnc.log 2>&1
467            RETVAL=$?
468            if test "x$RET_COMPILE" = x0 -a "x$RETVAL" = x0 ; then
469                LIBS="$LIBS -lnetcdf"
470                HAVE_NETCDF=t
471            else
472                cat genmake_tnc.log >> genmake_warnings
473            fi
474      fi      fi
475      rm -f genmake_tnc*      rm -f genmake_tnc*
476  }  }
# Line 834  fi Line 846  fi
846  if test "x$LINK" = x ; then  if test "x$LINK" = x ; then
847      LINK=$FC      LINK=$FC
848  fi  fi
 if test "x$CPP" = x ; then  
     CPP="cpp"  
 fi  
849  if test "x$MAKE" = x ; then  if test "x$MAKE" = x ; then
850      MAKE="make"      MAKE="make"
851  fi  fi
852    if test "x$CPP" = x ; then
853        CPP=cpp
854    fi
855    #EH3 === UGLY ===
856    #  The following an ugly little hack to check for $CPP in /lib/ and it
857    #  should eventually be replaced with a more general function that
858    #  searches a combo of the user's path and a list of "usual suspects"
859    #  to find the correct location for binaries such as $CPP.
860    for i in " " "/lib/" ; do
861        echo "#define A a" | $i$CPP > test_cpp 2>&1 && CPP=$i$CPP
862    done
863    #EH3 === UGLY ===
864  echo "#define A a" | $CPP > test_cpp 2>&1  echo "#define A a" | $CPP > test_cpp 2>&1
865  RETVAL=$?  RETVAL=$?
866  if test "x$RETVAL" != x0 ; then  if test "x$RETVAL" != x0 ; then
# Line 973  if test "x${TOOLSDIR}" = x ; then Line 994  if test "x${TOOLSDIR}" = x ; then
994      TOOLSDIR="$ROOTDIR/tools"      TOOLSDIR="$ROOTDIR/tools"
995  fi  fi
996  if test ! -d ${TOOLSDIR} ; then  if test ! -d ${TOOLSDIR} ; then
997      echo "Error: the specified $TOOLSDIR (\"$TOOLSDIR\") does not exist!"      echo "Error: the specified TOOLSDIR (\"$TOOLSDIR\") does not exist!"
998      exit 1      exit 1
999  fi  fi
1000  if test "x$S64" = x ; then  if test "x$S64" = x ; then
# Line 1209  if test "x$RETVAL" = x0 ; then Line 1230  if test "x$RETVAL" = x0 ; then
1230          cat make_mnc.errors 1>&2          cat make_mnc.errors 1>&2
1231          exit 1          exit 1
1232      fi      fi
1233      if test -a "x$HAVE_NETCDF" != xt ; then      if test "x$HAVE_NETCDF" != xt ; then
1234          cat <<EOF          cat <<EOF
1235    
1236  WARNING: the "mnc" package has been enabled but tests failed to  WARNING: the "mnc" package has been enabled but tests failed to

Legend:
Removed from v.1.62  
changed lines
  Added in v.1.66

  ViewVC Help
Powered by ViewVC 1.1.22