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

trunk/configure.ac revision 1531, Fri Oct 14 18:45:50 2011 UTC branches/vis12/configure.ac revision 1721, Mon Mar 12 20:19:29 2012 UTC
# Line 7  Line 7 
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) 2010 The Diderot Project (http://diderot-language.cs.uchicago.edu)]])  AC_COPYRIGHT([[COPYRIGHT (c) 2011 The Diderot Project (http://diderot-language.cs.uchicago.edu)]])
11  AC_CONFIG_SRCDIR(src/dnorm/dnorm.c)  AC_CONFIG_SRCDIR(src/dnorm/dnorm.c)
12  AC_CONFIG_AUX_DIR(config)  AC_CONFIG_AUX_DIR(config)
13  AC_CONFIG_MACRO_DIR(config)  AC_CONFIG_MACRO_DIR(config)
# Line 32  Line 32 
32  AC_PROG_INSTALL  AC_PROG_INSTALL
33  AC_PROG_MAKE_SET  AC_PROG_MAKE_SET
34    
35    dnl FIXME: this works for now, but we should probably switch to libtool
36    dnl
37    AC_PATH_PROG(LD, [ld], [none])
38    if test x$LD = xnone ; then
39      AC_MSG_ERROR([cannot find ld command])
40    fi
41    AC_SUBST(LD)
42    
43  dnl check for c99 support  dnl check for c99 support
44  dnl  dnl
45  AC_PROG_CC_C99  AC_PROG_CC_C99
# Line 52  Line 60 
60  dnl  dnl
61  ACX_PTHREAD()  ACX_PTHREAD()
62    
63    dnl check for doxygen
64    dnl
65    AC_ARG_WITH([doxygen],
66      [AS_HELP_STRING([--with-doxygen=PATH], [specify location of doxygen executable])],
67      [DOXYGEN=$with_doxygen],
68      [DOXYGEN=none])
69    if test x$DOXYGEN = xnone ; then
70      # see if we can find doxygen in the user's path
71      AC_PATH_PROG(DOXYGEN, [doxygen], [none])
72    fi
73    if test x$with_doxygen = xyes -o x$with_doxygen = xno ; then
74      AC_MSG_ERROR([--with-doxygen option must specify directory argument])
75    elif test x$DOXYGEN != xnone -a ! -x $DOXYGEN ; then
76      AC_MSG_ERROR([doxygen not found at $DOXYGEN])
77    elif test x$DOXYGEN != xnone ; then
78    dnl
79    dnl verify that $DOXYGEN is an absolute path
80    dnl
81      case $DOXYGEN in
82        /*) ;;
83        *) AC_MSG_ERROR([--with-doxygen path must be absolute]) ;;
84      esac
85    fi
86    if test $DOXYGEN = xnone ; then
87      DOXYGEN=:
88    fi
89    AC_SUBST(DOXYGEN)
90    
91  dnl  dnl
92  dnl Look for NVIDIA's nvcc compiler  dnl Look for NVIDIA's nvcc compiler
93  dnl  dnl
# Line 107  Line 143 
143  #endif  #endif
144      ]])],      ]])],
145      [CL_VERSION=`./conftest$EXEEXT`], [CL_VERSION=0])      [CL_VERSION=`./conftest$EXEEXT`], [CL_VERSION=0])
146    dnl
147    dnl check to see how we access the host-side vector types.  For OpenCL 1.1,
148    dnl the specification specifies the behavior, but it was unspecified in 1.0.
149    dnl
150      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
151    # ifdef HAVE_CL_CL_H
152    #   include <CL/cl.h>
153    # elif defined(HAVE_OPENCL_CL_H)
154    #   include <OpenCL/cl.h>
155    # else
156    #   error no cl.h
157    # endif]],
158        [[cl_float4 x; x[0] = 0.0;]])],
159        [AC_DEFINE([CL_HOST_VECTORS_ARE_ARRAYS],[1],[host vector types are arrays])],
160    dnl
161    dnl not arrays, so try the OpenCL 1.1 structure representation
162    dnl
163        [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
164    # ifdef HAVE_CL_CL_H
165    #   include <CL/cl.h>
166    # elif defined(HAVE_OPENCL_CL_H)
167    #   include <OpenCL/cl.h>
168    # else
169    #   error no cl.h
170    # endif]],
171        [[cl_float4 x; x.s[0] = 0.0;]])],
172        [AC_DEFINE([CL_HOST_VECTORS_ARE_STRUCTS],[1],[host vector types are structs])],
173        [AC_MSG_ERROR([unable to figure out host types for OpenCL vectors])])])
174    # substitutions    # substitutions
175    AC_SUBST(CL_LIBS)    AC_SUBST(CL_LIBS)
176  fi  fi
# Line 372  Line 436 
436  dnl  dnl
437  dnl ***** Makefiles *****  dnl ***** Makefiles *****
438    Makefile    Makefile
439      doc/Makefile
440      src/clinfo/Makefile
441    src/dnorm/Makefile    src/dnorm/Makefile
442    src/compiler/Makefile    src/compiler/Makefile
443    src/lib/build/Makefile    src/lib/build/Makefile
444    src/lib/build/mk/build.gmk:src/lib/build/mk/build_gmk.in    src/lib/build/mk/build.gmk:src/lib/build/mk/build_gmk.in
445    test/MIP/Makefile    test/MIP/Makefile
446    test/probe/Makefile    test/probe/Makefile
447    test/teem/Makefile    test/vr-lite-cam/Makefile
 dnl  
 dnl ***** CM files *****  
   src/compiler/codegen/sources.cm:src/compiler/codegen/sources_cm.in  
448  dnl  dnl
449  dnl ***** SML source files *****  dnl ***** SML source files *****
450    src/compiler/fields/run-dnorm.sml:src/compiler/fields/run-dnorm_sml.in    src/compiler/fields/run-dnorm.sml:src/compiler/fields/run-dnorm_sml.in
# Line 397  Line 460 
460    bin/install-sml-wrapper.sh:config/install-sml-wrapper_sh.in    bin/install-sml-wrapper.sh:config/install-sml-wrapper_sh.in
461  ], [chmod +x bin/install-sml-wrapper.sh])  ], [chmod +x bin/install-sml-wrapper.sh])
462  AC_CONFIG_FILES([  AC_CONFIG_FILES([
463    rtest/scripts/run-one.sh:rtest/scripts/run-one_sh.in    src/compiler/gen/file2str/file2str.sh:src/compiler/gen/file2str/file2str_sh.in
464  ], [chmod +x rtest/scripts/run-one.sh])  ], [chmod +x src/compiler/gen/file2str/file2str.sh])
 AC_CONFIG_FILES([  
   rtest/scripts/run.sh:rtest/scripts/run_sh.in  
 ], [chmod +x rtest/scripts/run.sh])  
465    
466  dnl  dnl
467  dnl generate makefiles for runtime library builds  dnl generate makefiles for runtime library builds
# Line 421  Line 481 
481    ])    ])
482    
483  MK_BUILD_DIR(rt-c-f, c, [float])  MK_BUILD_DIR(rt-c-f, c, [float])
484    MK_BUILD_DIR(rt-c-d, c, [double])
485  MK_BUILD_DIR(rt-c-f-debug, c, [float debug])  MK_BUILD_DIR(rt-c-f-debug, c, [float debug])
486    MK_BUILD_DIR(rt-c-d-debug, c, [double debug])
487  MK_BUILD_DIR(rt-c-f-par, parallel, [parallel float])  MK_BUILD_DIR(rt-c-f-par, parallel, [parallel float])
488    MK_BUILD_DIR(rt-c-d-par, parallel, [parallel double])
489  MK_BUILD_DIR(rt-c-f-par-debug, parallel, [parallel float debug])  MK_BUILD_DIR(rt-c-f-par-debug, parallel, [parallel float debug])
490    MK_BUILD_DIR(rt-c-d-par-debug, parallel, [parallel double debug])
491    
492    if test x"$CL_ENABLED" = xtrue ; then
493      MK_BUILD_DIR(rt-cl-f, cl, [exec float])
494      MK_BUILD_DIR(rt-cl-d, cl, [exec double])
495      MK_BUILD_DIR(rt-cl-f-debug, cl, [exec float debug])
496      MK_BUILD_DIR(rt-cl-d-debug, cl, [exec double debug])
497    fi
498    
499  AC_OUTPUT  AC_OUTPUT

Legend:
Removed from v.1531  
changed lines
  Added in v.1721

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