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

revision 2839, Tue Nov 25 19:45:46 2014 UTC revision 3340, Wed Oct 21 22:04:01 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) 2014 The Diderot Project  dnl This code is part of the Diderot Project (http://diderot-language.cs.uchicago.edu)
4    dnl
5    dnl COPYRIGHT (c) 2015 The University of Chicago
6  dnl All rights reserved.  dnl All rights reserved.
7  dnl  dnl
8    
9  AC_INIT(diderot,0.1,)  AC_INIT(diderot,0.1,)
10    
11  AC_PREREQ(2.60)  AC_PREREQ(2.60)
12  AC_COPYRIGHT([[COPYRIGHT (c) 2014 The Diderot Project (http://diderot-language.cs.uchicago.edu)]])  AC_COPYRIGHT([[COPYRIGHT (c) 2015 The University of Chicago]])
13  AC_CONFIG_SRCDIR(src/compiler/driver/main.sml)  AC_CONFIG_SRCDIR(src/compiler/driver/main.sml)
14  AC_CONFIG_AUX_DIR(config)  AC_CONFIG_AUX_DIR(config)
15  AC_CONFIG_MACRO_DIR(config)  AC_CONFIG_MACRO_DIR(config)
# Line 120  Line 122 
122    if test x"$HAVE_CL_H" = xno ; then    if test x"$HAVE_CL_H" = xno ; then
123      # check for NVIDIA's SDK      # check for NVIDIA's SDK
124      AC_MSG_CHECKING([for NVIDIA's SDK cl.h])      AC_MSG_CHECKING([for NVIDIA's SDK cl.h])
125      if test -d /usr/local/cuda/include/CL ; then      CUDA_HOME=none
126        for CUDA in cuda cuda-7.0 cuda-6.5 cuda-6.0 ; do
127          if test -d /usr/local/$CUDA/include/CL ; then
128            CUDA_HOME=/usr/local/$CUDA
129            break
130          fi
131        done
132        if test x"$CUDA" != xnone ; then
133        HAVE_CL_H="yes"        HAVE_CL_H="yes"
134        CL_HEADER="/usr/local/cuda/include/CL/cl.h"        CL_HEADER="$CUDA_HOME/include/CL/cl.h"
135        AC_DEFINE([HAVE_CL_CL_H])        AC_DEFINE([HAVE_CL_CL_H])
136        CPPFLAGS_CL="-I/usr/local/cuda/include"        CPPFLAGS_CL="-I$CUDA_HOME/include"
137      fi      fi
138      AC_MSG_RESULT([$HAVE_CL_H])      AC_MSG_RESULT([$HAVE_CL_H])
139    fi    fi
# Line 151  Line 160 
160  #   error no cl.h  #   error no cl.h
161  # endif]],  # endif]],
162  [[#if defined(CL_VERSION_1_2)  [[#if defined(CL_VERSION_1_2)
163    printf("12000\n");    printf("120\n");
164  #elif defined(CL_VERSION_1_1)  #elif defined(CL_VERSION_1_1)
165    printf("11000\n");    printf("110\n");
166  #elif defined(CL_VERSION_1_0)  #elif defined(CL_VERSION_1_0)
167    printf("10000\n");    printf("100\n");
168  #else  #else
169    printf("0\n");    printf("0\n");
170  #endif  #endif
# Line 198  Line 207 
207  fi  fi
208  AC_SUBST(CL_ENABLED)  AC_SUBST(CL_ENABLED)
209  AC_SUBST(CL_VERSION)  AC_SUBST(CL_VERSION)
210    AC_DEFINE_UNQUOTED(DIDEROT_CL_VERSION,[$CL_VERSION],[version of OpenCL supported by system])
211    
212  AC_SUBST(SIZEOF_CL_INT)  AC_SUBST(SIZEOF_CL_INT)
213  AC_SUBST(SIZEOF_CL_LONG)  AC_SUBST(SIZEOF_CL_LONG)
# Line 369  Line 379 
379  dnl  dnl
380  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])])
381  if test $SMLNJ_MAJOR_VERSION -lt 110 \  if test $SMLNJ_MAJOR_VERSION -lt 110 \
382    -o $SMLNJ_MINOR_VERSION -lt 77    -o $SMLNJ_MINOR_VERSION -lt 79
383  then  then
384    AC_MSG_ERROR([installation requires SML/NJ version 110.77+ (available from smlnj.org)])    AC_MSG_ERROR([installation requires SML/NJ version 110.79+ (available from smlnj.org)])
385  fi  fi
386  AC_SUBST(SMLNJ_VERSION)  AC_SUBST(SMLNJ_VERSION)
387    
# Line 590  Line 600 
600  AC_CONFIG_FILES([  AC_CONFIG_FILES([
601    rtest/scripts/run-one.sh:rtest/scripts/run-one_sh.in    rtest/scripts/run-one.sh:rtest/scripts/run-one_sh.in
602  ], [chmod +x rtest/scripts/run-one.sh])  ], [chmod +x rtest/scripts/run-one.sh])
603    #
604    # more regression tests; should merge with rtest at some point
605    #
606    AC_CONFIG_FILES([
607      rtest2/scripts/run.sh:rtest2/scripts/run_sh.in
608    ], [chmod +x rtest2/scripts/run.sh])
609    AC_CONFIG_FILES([
610      rtest2/scripts/run-one.sh:rtest2/scripts/run-one_sh.in
611    ], [chmod +x rtest2/scripts/run-one.sh])
612    
613  dnl  dnl
614  dnl generate makefiles for runtime library builds  dnl generate makefiles for runtime library builds

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

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