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 3199, Thu Jun 25 11:20:03 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 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("11000\n");    printf("120\n");
155    #elif defined(CL_VERSION_1_1)
156      printf("110\n");
157  #elif defined(CL_VERSION_1_0)  #elif defined(CL_VERSION_1_0)
158    printf("10000\n");    printf("100\n");
159  #else  #else
160    printf("0\n");    printf("0\n");
161  #endif  #endif
# Line 195  Line 198 
198  fi  fi
199  AC_SUBST(CL_ENABLED)  AC_SUBST(CL_ENABLED)
200  AC_SUBST(CL_VERSION)  AC_SUBST(CL_VERSION)
201    AC_DEFINE_UNQUOTED(DIDEROT_CL_VERSION,[$CL_VERSION],[version of OpenCL supported by system])
202    
203  AC_SUBST(SIZEOF_CL_INT)  AC_SUBST(SIZEOF_CL_INT)
204  AC_SUBST(SIZEOF_CL_LONG)  AC_SUBST(SIZEOF_CL_LONG)
# Line 328  Line 332 
332      TEEM_DIR=$ac_cv_use_teem      TEEM_DIR=$ac_cv_use_teem
333      # check that TEEM_DIR actually points to something that looks like teem      # check that TEEM_DIR actually points to something that looks like teem
334      if test -f $TEEM_DIR/include/teem/nrrd.h ; then      if test -f $TEEM_DIR/include/teem/nrrd.h ; then
335        AC_MSG_RESULT([ okay])        AC_MSG_RESULT([yes])
336      else      else
337        TEEM_DIR=none        TEEM_DIR=none
338        AC_MSG_RESULT([ invalid])        AC_MSG_RESULT([no])
339      fi      fi
340    else    else
341      TEEM_DIR=none      TEEM_DIR=none
342      AC_MSG_RESULT([ invalid])      AC_MSG_RESULT([no])
343    fi    fi
344  fi  fi
345  if test x"$TEEM_DIR" = xnone ; then  if test x"$TEEM_DIR" = xnone ; then
346    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])
347  fi  fi
348    dnl
349    dnl check that unu supports the dnorm command
350    dnl
351    if test x"$TEEM_DIR" != xnone ; then
352      AC_MSG_CHECKING([that \"unu dnorm\" works])
353      if test -x $TEEM_DIR/bin/unu ; then
354        $TEEM_DIR/bin/unu dnorm > /dev/null 2> /dev/null
355        if test $? -eq 0 ; then
356          AC_MSG_RESULT([yes])
357        else
358          AC_MSG_ERROR([\"unu dnorm\" is not supported; please update your teem installation])
359        fi
360      else
361        AC_MSG_ERROR([unable to find unu executable in $TEEM_DIR/bin"])
362      fi
363    fi
364  AC_SUBST(TEEM_DIR)  AC_SUBST(TEEM_DIR)
365    
366  dnl ******************** SML/NJ configuration ********************  dnl ******************** SML/NJ configuration ********************
# Line 350  Line 370 
370  dnl  dnl
371  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])])
372  if test $SMLNJ_MAJOR_VERSION -lt 110 \  if test $SMLNJ_MAJOR_VERSION -lt 110 \
373    -o $SMLNJ_MINOR_VERSION -lt 74    -o $SMLNJ_MINOR_VERSION -lt 77
374  then  then
375    AC_MSG_ERROR([installation requires SML/NJ version 110.74+])    AC_MSG_ERROR([installation requires SML/NJ version 110.77+ (available from smlnj.org)])
376  fi  fi
377  AC_SUBST(SMLNJ_VERSION)  AC_SUBST(SMLNJ_VERSION)
378    
# Line 416  Line 436 
436  dnl check for asciidoc and related tools  dnl check for asciidoc and related tools
437  dnl  dnl
438  AC_PATH_PROGS([ASCIIDOC], [asciidoc], [none])  AC_PATH_PROGS([ASCIIDOC], [asciidoc], [none])
439    AC_PATH_PROGS([A2X], [a2x], [none])
440  AC_PATH_PROGS([HIGHLIGHTER], [pygmentize], [none])  AC_PATH_PROGS([HIGHLIGHTER], [pygmentize], [none])
441  AC_PATH_PROGS([DBLATEX], [dblatex], [none])  AC_PATH_PROGS([DBLATEX], [dblatex], [none])
442    
# Line 428  Line 449 
449    AC_MSG_RESULT([$ASCIIDOC_CONF_DIR])    AC_MSG_RESULT([$ASCIIDOC_CONF_DIR])
450  fi  fi
451  AC_SUBST(ASCIIDOC)  AC_SUBST(ASCIIDOC)
452    AC_SUBST(A2X)
453  AC_SUBST(ASCIIDOC_CONF_DIR)  AC_SUBST(ASCIIDOC_CONF_DIR)
454  AC_SUBST(HIGHLIGHTER)  AC_SUBST(HIGHLIGHTER)
455  AC_SUBST(DBLATEX)  AC_SUBST(DBLATEX)
# Line 507  Line 529 
529    
530  AH_TOP([  AH_TOP([
531  /*  /*
532   * COPYRIGHT (c) 2011 Diderot project. (http://diderot-language.cs.uchicago.edu)   * COPYRIGHT (c) 2014 Diderot project. (http://diderot-language.cs.uchicago.edu)
533   * All rights reserved.   * All rights reserved.
534   */   */
535    
# Line 569  Line 591 
591  AC_CONFIG_FILES([  AC_CONFIG_FILES([
592    rtest/scripts/run-one.sh:rtest/scripts/run-one_sh.in    rtest/scripts/run-one.sh:rtest/scripts/run-one_sh.in
593  ], [chmod +x rtest/scripts/run-one.sh])  ], [chmod +x rtest/scripts/run-one.sh])
594    #
595    # more regression tests; should merge with rtest at some point
596    #
597    AC_CONFIG_FILES([
598      rtest2/scripts/run.sh:rtest2/scripts/run_sh.in
599    ], [chmod +x rtest2/scripts/run.sh])
600    AC_CONFIG_FILES([
601      rtest2/scripts/run-one.sh:rtest2/scripts/run-one_sh.in
602    ], [chmod +x rtest2/scripts/run-one.sh])
603    
604  dnl  dnl
605  dnl generate makefiles for runtime library builds  dnl generate makefiles for runtime library builds

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

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