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

SCM Repository

[diderot] Diff of /branches/vis15/configure.ac
ViewVC logotype

Diff of /branches/vis15/configure.ac

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

branches/vis12/configure.ac revision 2441, Wed Sep 25 17:00:08 2013 UTC branches/vis15/configure.ac revision 2839, Tue Nov 25 19:45:46 2014 UTC
# Line 1  Line 1 
1  dnl Process this file with autoconf to produce a configure script.  dnl Process this file with autoconf to produce a configure script.
2  dnl  dnl
3  dnl COPYRIGHT (c) 2012 The Diderot Project  dnl COPYRIGHT (c) 2014 The Diderot Project
4  dnl All rights reserved.  dnl All rights reserved.
5  dnl  dnl
6    
7  AC_INIT(diderot,0.1,)  AC_INIT(diderot,0.1,)
8    
9  AC_PREREQ(2.60)  AC_PREREQ(2.60)
10  AC_COPYRIGHT([[COPYRIGHT (c) 2013 The Diderot Project (http://diderot-language.cs.uchicago.edu)]])  AC_COPYRIGHT([[COPYRIGHT (c) 2014 The Diderot Project (http://diderot-language.cs.uchicago.edu)]])
11  AC_CONFIG_SRCDIR(src/compiler/driver/main.sml)  AC_CONFIG_SRCDIR(src/compiler/driver/main.sml)
12  AC_CONFIG_AUX_DIR(config)  AC_CONFIG_AUX_DIR(config)
13  AC_CONFIG_MACRO_DIR(config)  AC_CONFIG_MACRO_DIR(config)
# Line 122  Line 122 
122      AC_MSG_CHECKING([for NVIDIA's SDK cl.h])      AC_MSG_CHECKING([for NVIDIA's SDK cl.h])
123      if test -d /usr/local/cuda/include/CL ; then      if test -d /usr/local/cuda/include/CL ; then
124        HAVE_CL_H="yes"        HAVE_CL_H="yes"
125          CL_HEADER="/usr/local/cuda/include/CL/cl.h"
126        AC_DEFINE([HAVE_CL_CL_H])        AC_DEFINE([HAVE_CL_CL_H])
127        CPPFLAGS_CL="-I/usr/local/cuda/include"        CPPFLAGS_CL="-I/usr/local/cuda/include"
128      fi      fi
# Line 149  Line 150 
150  # else  # else
151  #   error no cl.h  #   error no cl.h
152  # endif]],  # endif]],
153  [[#if defined(CL_VERSION_1_1)  [[#if defined(CL_VERSION_1_2)
154      printf("12000\n");
155    #elif defined(CL_VERSION_1_1)
156    printf("11000\n");    printf("11000\n");
157  #elif defined(CL_VERSION_1_0)  #elif defined(CL_VERSION_1_0)
158    printf("10000\n");    printf("10000\n");
# Line 328  Line 331 
331      TEEM_DIR=$ac_cv_use_teem      TEEM_DIR=$ac_cv_use_teem
332      # check that TEEM_DIR actually points to something that looks like teem      # check that TEEM_DIR actually points to something that looks like teem
333      if test -f $TEEM_DIR/include/teem/nrrd.h ; then      if test -f $TEEM_DIR/include/teem/nrrd.h ; then
334        AC_MSG_RESULT([ okay])        AC_MSG_RESULT([yes])
335      else      else
336        TEEM_DIR=none        TEEM_DIR=none
337        AC_MSG_RESULT([ invalid])        AC_MSG_RESULT([no])
338      fi      fi
339    else    else
340      TEEM_DIR=none      TEEM_DIR=none
341      AC_MSG_RESULT([ invalid])      AC_MSG_RESULT([no])
342    fi    fi
343  fi  fi
344  if test x"$TEEM_DIR" = xnone ; then  if test x"$TEEM_DIR" = xnone ; then
345    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])
346  fi  fi
347    dnl
348    dnl check that unu supports the dnorm command
349    dnl
350    if test x"$TEEM_DIR" != xnone ; then
351      AC_MSG_CHECKING([that \"unu dnorm\" works])
352      if test -x $TEEM_DIR/bin/unu ; then
353        $TEEM_DIR/bin/unu dnorm > /dev/null 2> /dev/null
354        if test $? -eq 0 ; then
355          AC_MSG_RESULT([yes])
356        else
357          AC_MSG_ERROR([\"unu dnorm\" is not supported; please update your teem installation])
358        fi
359      else
360        AC_MSG_ERROR([unable to find unu executable in $TEEM_DIR/bin"])
361      fi
362    fi
363  AC_SUBST(TEEM_DIR)  AC_SUBST(TEEM_DIR)
364    
365  dnl ******************** SML/NJ configuration ********************  dnl ******************** SML/NJ configuration ********************
# Line 350  Line 369 
369  dnl  dnl
370  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])])
371  if test $SMLNJ_MAJOR_VERSION -lt 110 \  if test $SMLNJ_MAJOR_VERSION -lt 110 \
372    -o $SMLNJ_MINOR_VERSION -lt 74    -o $SMLNJ_MINOR_VERSION -lt 77
373  then  then
374    AC_MSG_ERROR([installation requires SML/NJ version 110.74+])    AC_MSG_ERROR([installation requires SML/NJ version 110.77+ (available from smlnj.org)])
375  fi  fi
376  AC_SUBST(SMLNJ_VERSION)  AC_SUBST(SMLNJ_VERSION)
377    
# Line 416  Line 435 
435  dnl check for asciidoc and related tools  dnl check for asciidoc and related tools
436  dnl  dnl
437  AC_PATH_PROGS([ASCIIDOC], [asciidoc], [none])  AC_PATH_PROGS([ASCIIDOC], [asciidoc], [none])
438    AC_PATH_PROGS([A2X], [a2x], [none])
439  AC_PATH_PROGS([HIGHLIGHTER], [pygmentize], [none])  AC_PATH_PROGS([HIGHLIGHTER], [pygmentize], [none])
440  AC_PATH_PROGS([DBLATEX], [dblatex], [none])  AC_PATH_PROGS([DBLATEX], [dblatex], [none])
441    
# Line 428  Line 448 
448    AC_MSG_RESULT([$ASCIIDOC_CONF_DIR])    AC_MSG_RESULT([$ASCIIDOC_CONF_DIR])
449  fi  fi
450  AC_SUBST(ASCIIDOC)  AC_SUBST(ASCIIDOC)
451    AC_SUBST(A2X)
452  AC_SUBST(ASCIIDOC_CONF_DIR)  AC_SUBST(ASCIIDOC_CONF_DIR)
453  AC_SUBST(HIGHLIGHTER)  AC_SUBST(HIGHLIGHTER)
454  AC_SUBST(DBLATEX)  AC_SUBST(DBLATEX)
# Line 507  Line 528 
528    
529  AH_TOP([  AH_TOP([
530  /*  /*
531   * COPYRIGHT (c) 2011 Diderot project. (http://diderot-language.cs.uchicago.edu)   * COPYRIGHT (c) 2014 Diderot project. (http://diderot-language.cs.uchicago.edu)
532   * All rights reserved.   * All rights reserved.
533   */   */
534    

Legend:
Removed from v.2441  
changed lines
  Added in v.2839

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