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

SCM Repository

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

Diff of /branches/vis12/configure.ac

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

revision 2441, Wed Sep 25 17:00:08 2013 UTC revision 3223, Mon Jul 20 22:21:00 2015 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 120  Line 120 
120    if test x"$HAVE_CL_H" = xno ; then    if test x"$HAVE_CL_H" = xno ; then
121      # check for NVIDIA's SDK      # check for NVIDIA's SDK
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      CUDA_HOME=none
124        for CUDA in cuda cuda-7.0 cuda-6.5 cuda-6.0 ; do
125          if test -d /usr/local/$CUDA/include/CL ; then
126            CUDA_HOME=/usr/local/$CUDA
127            break
128          fi
129        done
130        if test x"$CUDA" != xnone ; then
131        HAVE_CL_H="yes"        HAVE_CL_H="yes"
132          CL_HEADER="$CUDA_HOME/include/CL/cl.h"
133        AC_DEFINE([HAVE_CL_CL_H])        AC_DEFINE([HAVE_CL_CL_H])
134        CPPFLAGS_CL="-I/usr/local/cuda/include"        CPPFLAGS_CL="-I$CUDA_HOME/include"
135      fi      fi
136      AC_MSG_RESULT([$HAVE_CL_H])      AC_MSG_RESULT([$HAVE_CL_H])
137    fi    fi
# Line 149  Line 157 
157  # else  # else
158  #   error no cl.h  #   error no cl.h
159  # endif]],  # endif]],
160  [[#if defined(CL_VERSION_1_1)  [[#if defined(CL_VERSION_1_2)
161    printf("11000\n");    printf("120\n");
162    #elif defined(CL_VERSION_1_1)
163      printf("110\n");
164  #elif defined(CL_VERSION_1_0)  #elif defined(CL_VERSION_1_0)
165    printf("10000\n");    printf("100\n");
166  #else  #else
167    printf("0\n");    printf("0\n");
168  #endif  #endif
# Line 195  Line 205 
205  fi  fi
206  AC_SUBST(CL_ENABLED)  AC_SUBST(CL_ENABLED)
207  AC_SUBST(CL_VERSION)  AC_SUBST(CL_VERSION)
208    AC_DEFINE_UNQUOTED(DIDEROT_CL_VERSION,[$CL_VERSION],[version of OpenCL supported by system])
209    
210  AC_SUBST(SIZEOF_CL_INT)  AC_SUBST(SIZEOF_CL_INT)
211  AC_SUBST(SIZEOF_CL_LONG)  AC_SUBST(SIZEOF_CL_LONG)
# Line 328  Line 339 
339      TEEM_DIR=$ac_cv_use_teem      TEEM_DIR=$ac_cv_use_teem
340      # check that TEEM_DIR actually points to something that looks like teem      # check that TEEM_DIR actually points to something that looks like teem
341      if test -f $TEEM_DIR/include/teem/nrrd.h ; then      if test -f $TEEM_DIR/include/teem/nrrd.h ; then
342        AC_MSG_RESULT([ okay])        AC_MSG_RESULT([yes])
343      else      else
344        TEEM_DIR=none        TEEM_DIR=none
345        AC_MSG_RESULT([ invalid])        AC_MSG_RESULT([no])
346      fi      fi
347    else    else
348      TEEM_DIR=none      TEEM_DIR=none
349      AC_MSG_RESULT([ invalid])      AC_MSG_RESULT([no])
350    fi    fi
351  fi  fi
352  if test x"$TEEM_DIR" = xnone ; then  if test x"$TEEM_DIR" = xnone ; then
353    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])
354  fi  fi
355    dnl
356    dnl check that unu supports the dnorm command
357    dnl
358    if test x"$TEEM_DIR" != xnone ; then
359      AC_MSG_CHECKING([that \"unu dnorm\" works])
360      if test -x $TEEM_DIR/bin/unu ; then
361        $TEEM_DIR/bin/unu dnorm > /dev/null 2> /dev/null
362        if test $? -eq 0 ; then
363          AC_MSG_RESULT([yes])
364        else
365          AC_MSG_ERROR([\"unu dnorm\" is not supported; please update your teem installation])
366        fi
367      else
368        AC_MSG_ERROR([unable to find unu executable in $TEEM_DIR/bin"])
369      fi
370    fi
371  AC_SUBST(TEEM_DIR)  AC_SUBST(TEEM_DIR)
372    
373  dnl ******************** SML/NJ configuration ********************  dnl ******************** SML/NJ configuration ********************
# Line 350  Line 377 
377  dnl  dnl
378  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])])
379  if test $SMLNJ_MAJOR_VERSION -lt 110 \  if test $SMLNJ_MAJOR_VERSION -lt 110 \
380    -o $SMLNJ_MINOR_VERSION -lt 74    -o $SMLNJ_MINOR_VERSION -lt 77
381  then  then
382    AC_MSG_ERROR([installation requires SML/NJ version 110.74+])    AC_MSG_ERROR([installation requires SML/NJ version 110.77+ (available from smlnj.org)])
383  fi  fi
384  AC_SUBST(SMLNJ_VERSION)  AC_SUBST(SMLNJ_VERSION)
385    
# Line 416  Line 443 
443  dnl check for asciidoc and related tools  dnl check for asciidoc and related tools
444  dnl  dnl
445  AC_PATH_PROGS([ASCIIDOC], [asciidoc], [none])  AC_PATH_PROGS([ASCIIDOC], [asciidoc], [none])
446    AC_PATH_PROGS([A2X], [a2x], [none])
447  AC_PATH_PROGS([HIGHLIGHTER], [pygmentize], [none])  AC_PATH_PROGS([HIGHLIGHTER], [pygmentize], [none])
448  AC_PATH_PROGS([DBLATEX], [dblatex], [none])  AC_PATH_PROGS([DBLATEX], [dblatex], [none])
449    
# Line 428  Line 456 
456    AC_MSG_RESULT([$ASCIIDOC_CONF_DIR])    AC_MSG_RESULT([$ASCIIDOC_CONF_DIR])
457  fi  fi
458  AC_SUBST(ASCIIDOC)  AC_SUBST(ASCIIDOC)
459    AC_SUBST(A2X)
460  AC_SUBST(ASCIIDOC_CONF_DIR)  AC_SUBST(ASCIIDOC_CONF_DIR)
461  AC_SUBST(HIGHLIGHTER)  AC_SUBST(HIGHLIGHTER)
462  AC_SUBST(DBLATEX)  AC_SUBST(DBLATEX)
# Line 507  Line 536 
536    
537  AH_TOP([  AH_TOP([
538  /*  /*
539   * COPYRIGHT (c) 2011 Diderot project. (http://diderot-language.cs.uchicago.edu)   * COPYRIGHT (c) 2014 Diderot project. (http://diderot-language.cs.uchicago.edu)
540   * All rights reserved.   * All rights reserved.
541   */   */
542    
# Line 569  Line 598 
598  AC_CONFIG_FILES([  AC_CONFIG_FILES([
599    rtest/scripts/run-one.sh:rtest/scripts/run-one_sh.in    rtest/scripts/run-one.sh:rtest/scripts/run-one_sh.in
600  ], [chmod +x rtest/scripts/run-one.sh])  ], [chmod +x rtest/scripts/run-one.sh])
601    #
602    # more regression tests; should merge with rtest at some point
603    #
604    AC_CONFIG_FILES([
605      rtest2/scripts/run.sh:rtest2/scripts/run_sh.in
606    ], [chmod +x rtest2/scripts/run.sh])
607    AC_CONFIG_FILES([
608      rtest2/scripts/run-one.sh:rtest2/scripts/run-one_sh.in
609    ], [chmod +x rtest2/scripts/run-one.sh])
610    
611  dnl  dnl
612  dnl generate makefiles for runtime library builds  dnl generate makefiles for runtime library builds

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

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