Home My Page Projects Code Snippets Project Openings diderot
Summary Activity Tracker Tasks SCM

SCM Repository

[diderot] Diff of /trunk/configure.ac
ViewVC logotype

Diff of /trunk/configure.ac

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

revision 2568, Fri Mar 21 12:53:42 2014 UTC revision 2660, Fri May 30 14:43:18 2014 UTC
# Line 328  Line 328 
328      TEEM_DIR=$ac_cv_use_teem      TEEM_DIR=$ac_cv_use_teem
329      # check that TEEM_DIR actually points to something that looks like teem      # check that TEEM_DIR actually points to something that looks like teem
330      if test -f $TEEM_DIR/include/teem/nrrd.h ; then      if test -f $TEEM_DIR/include/teem/nrrd.h ; then
331        AC_MSG_RESULT([ okay])        AC_MSG_RESULT([yes])
332      else      else
333        TEEM_DIR=none        TEEM_DIR=none
334        AC_MSG_RESULT([ invalid])        AC_MSG_RESULT([no])
335      fi      fi
336    else    else
337      TEEM_DIR=none      TEEM_DIR=none
338      AC_MSG_RESULT([ invalid])      AC_MSG_RESULT([no])
339    fi    fi
340  fi  fi
341  if test x"$TEEM_DIR" = xnone ; then  if test x"$TEEM_DIR" = xnone ; then
342    AC_MSG_ERROR([unable to find teem; use --with-teem option to specify location])    AC_MSG_ERROR([unable to find teem; use --with-teem option to specify location])
343  fi  fi
344    dnl
345    dnl check that unu supports the dnorm command
346    dnl
347    if test x"$TEEM_DIR" != xnone ; then
348      AC_MSG_CHECKING([that \"unu dnorm\" works])
349      if test -x $TEEM_DIR/bin/unu ; then
350        $TEEM_DIR/bin/unu dnorm > /dev/null 2> /dev/null
351        if test $? -eq 0 ; then
352          AC_MSG_RESULT([yes])
353        else
354          AC_MSG_ERROR([\"unu dnorm\" is not supported; please update your teem installation])
355        fi
356      else
357        AC_MSG_ERROR([unable to find unu executable in $TEEM_DIR/bin"])
358      fi
359    fi
360  AC_SUBST(TEEM_DIR)  AC_SUBST(TEEM_DIR)
361    
362  dnl ******************** SML/NJ configuration ********************  dnl ******************** SML/NJ configuration ********************
# Line 350  Line 366 
366  dnl  dnl
367  CHECK_SMLNJ([AC_MSG_ERROR([unable to find SML/NJ installation; check your PATH or set SMLNJ_CMD])])  CHECK_SMLNJ([AC_MSG_ERROR([unable to find SML/NJ installation; check your PATH or set SMLNJ_CMD])])
368  if test $SMLNJ_MAJOR_VERSION -lt 110 \  if test $SMLNJ_MAJOR_VERSION -lt 110 \
369    -o $SMLNJ_MINOR_VERSION -lt 74    -o $SMLNJ_MINOR_VERSION -lt 75
370  then  then
371    AC_MSG_ERROR([installation requires SML/NJ version 110.74+])    AC_MSG_ERROR([installation requires SML/NJ version 110.75+])
372  fi  fi
373  AC_SUBST(SMLNJ_VERSION)  AC_SUBST(SMLNJ_VERSION)
374    

Legend:
Removed from v.2568  
changed lines
  Added in v.2660

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0