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

SCM Repository

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

Diff of /branches/lamont/configure.ac

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

trunk/configure.ac revision 1232, Mon May 16 23:37:52 2011 UTC branches/vis12/configure.ac revision 1833, Fri Apr 13 15:19:40 2012 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) 2010 The Diderot Project  dnl COPYRIGHT (c) 2012 The Diderot Project
4  dnl All rights reserved.  dnl All rights reserved.
5  dnl  dnl
6    
 dnl NOTE: MANTICORE_DIST_VERSION is an M4 variable defined in config/aclocal.m4  
 dnl  
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) 2012 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 34  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 43  Line 49 
49    
50  dnl extra C compiler options  dnl extra C compiler options
51  dnl  dnl
52    CFLAGS=""
53  CFLAG_M64="-m64"  CFLAG_M64="-m64"
54  CFLAGS_BASE="-Wformat -Wreturn-type -Wuninitialized"  CFLAGS_BASE="-Wformat -Wreturn-type -Wuninitialized"
55  AC_SUBST(CFLAG_M64)  AC_SUBST(CFLAG_M64)
56  AC_SUBST(CFLAGS_BASE)  AC_SUBST(CFLAGS_BASE)
57    
58  dnl  dnl
59    dnl standard headers
60    dnl
61    AC_HEADER_STDBOOL
62    
63    dnl
64  dnl check for pthreads support  dnl check for pthreads support
65  dnl  dnl
66  ACX_PTHREAD()  ACX_PTHREAD
67    
68    dnl check for doxygen
69    dnl
70    AC_ARG_WITH([doxygen],
71      [AS_HELP_STRING([--with-doxygen=PATH], [specify location of doxygen executable])],
72      [DOXYGEN=$with_doxygen],
73      [DOXYGEN=none])
74    if test x$DOXYGEN = xnone ; then
75      # see if we can find doxygen in the user's path
76      AC_PATH_PROG(DOXYGEN, [doxygen], [none])
77    fi
78    if test x$with_doxygen = xyes -o x$with_doxygen = xno ; then
79      AC_MSG_ERROR([--with-doxygen option must specify directory argument])
80    elif test x$DOXYGEN != xnone -a ! -x $DOXYGEN ; then
81      AC_MSG_ERROR([doxygen not found at $DOXYGEN])
82    elif test x$DOXYGEN != xnone ; then
83    dnl
84    dnl verify that $DOXYGEN is an absolute path
85    dnl
86      case $DOXYGEN in
87        /*) ;;
88        *) AC_MSG_ERROR([--with-doxygen path must be absolute]) ;;
89      esac
90    fi
91    if test $DOXYGEN = xnone ; then
92      DOXYGEN=:
93    fi
94    AC_SUBST(DOXYGEN)
95    
96  dnl  dnl
97  dnl Look for NVIDIA's nvcc compiler  dnl Look for NVIDIA's nvcc compiler
# Line 108  Line 148 
148  #endif  #endif
149      ]])],      ]])],
150      [CL_VERSION=`./conftest$EXEEXT`], [CL_VERSION=0])      [CL_VERSION=`./conftest$EXEEXT`], [CL_VERSION=0])
151    dnl
152    dnl check to see how we access the host-side vector types.  For OpenCL 1.1,
153    dnl the specification specifies the behavior, but it was unspecified in 1.0.
154    dnl
155      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
156    # ifdef HAVE_CL_CL_H
157    #   include <CL/cl.h>
158    # elif defined(HAVE_OPENCL_CL_H)
159    #   include <OpenCL/cl.h>
160    # else
161    #   error no cl.h
162    # endif]],
163        [[cl_float4 x; x[0] = 0.0;]])],
164        [AC_DEFINE([CL_HOST_VECTORS_ARE_ARRAYS],[1],[host vector types are arrays])],
165    dnl
166    dnl not arrays, so try the OpenCL 1.1 structure representation
167    dnl
168        [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
169    # ifdef HAVE_CL_CL_H
170    #   include <CL/cl.h>
171    # elif defined(HAVE_OPENCL_CL_H)
172    #   include <OpenCL/cl.h>
173    # else
174    #   error no cl.h
175    # endif]],
176        [[cl_float4 x; x.s[0] = 0.0;]])],
177        [AC_DEFINE([CL_HOST_VECTORS_ARE_STRUCTS],[1],[host vector types are structs])],
178        [AC_MSG_ERROR([unable to figure out host types for OpenCL vectors])])])
179    # substitutions    # substitutions
180    AC_SUBST(CL_LIBS)    AC_SUBST(CL_LIBS)
181  fi  fi
# Line 127  Line 195 
195    
196  AC_CHECK_FUNCS(mach_absolute_time)  AC_CHECK_FUNCS(mach_absolute_time)
197  AC_CHECK_TYPES([struct timespec])  AC_CHECK_TYPES([struct timespec])
198    AC_CHECK_FUNCS(pthread_barrier_init)
199    
200  dnl  dnl
201  dnl check for clock_gettime.  On Linux, this requires librt.  dnl check for clock_gettime.  On Linux, this requires librt.
# Line 236  Line 305 
305    esac    esac
306    if test -x $ac_cv_use_teem ; then    if test -x $ac_cv_use_teem ; then
307      TEEM_DIR=$ac_cv_use_teem      TEEM_DIR=$ac_cv_use_teem
308        # check that TEEM_DIR actually points to something that looks like teem
309        if test -f $TEEM_DIR/include/teem/nrrd.h ; then
310      AC_MSG_RESULT([ okay])      AC_MSG_RESULT([ okay])
311    else    else
312      TEEM_DIR=none      TEEM_DIR=none
313      AC_MSG_RESULT([ invalid])      AC_MSG_RESULT([ invalid])
314    fi    fi
315      else
316        TEEM_DIR=none
317        AC_MSG_RESULT([ invalid])
318      fi
319  fi  fi
320  if test x"$TEEM_DIR" = xnone ; then  if test x"$TEEM_DIR" = xnone ; then
321    AC_MSG_ERROR([unable to find teem])    AC_MSG_ERROR([unable to find teem])
# Line 340  Line 415 
415  dnl  dnl
416  dnl ******************** config.h stuff ********************  dnl ******************** config.h stuff ********************
417  dnl  dnl
418    
419    AC_DEFINE_UNQUOTED(DIDEROT_INCLUDE_PATH,["$DIDEROT_SRCDIR/include"], [path for Diderot header files])
420    
421  AH_TOP([  AH_TOP([
422  /*  /*
423   * COPYRIGHT (c) 2011 Diderot project. (http://diderot-language.cs.uchicago.edu)   * COPYRIGHT (c) 2011 Diderot project. (http://diderot-language.cs.uchicago.edu)
# Line 363  Line 441 
441  dnl  dnl
442  dnl ***** Makefiles *****  dnl ***** Makefiles *****
443    Makefile    Makefile
444      doc/Makefile
445      src/clinfo/Makefile
446    src/dnorm/Makefile    src/dnorm/Makefile
447    src/compiler/Makefile    src/compiler/Makefile
448    src/lib/build/Makefile    src/lib/build/Makefile
449    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
450    test/MIP/Makefile    test/MIP/Makefile
451    test/probe/Makefile    test/probe/Makefile
452  dnl    test/iso2d-polyline/Makefile
453  dnl ***** CM files *****    test/vr-lite-cam/Makefile
454    src/compiler/codegen/sources.cm:src/compiler/codegen/sources_cm.in    test/hlic/Makefile
455  dnl  dnl
456  dnl ***** SML source files *****  dnl ***** SML source files *****
457    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 386  Line 466 
466  AC_CONFIG_FILES([  AC_CONFIG_FILES([
467    bin/install-sml-wrapper.sh:config/install-sml-wrapper_sh.in    bin/install-sml-wrapper.sh:config/install-sml-wrapper_sh.in
468  ], [chmod +x bin/install-sml-wrapper.sh])  ], [chmod +x bin/install-sml-wrapper.sh])
469    AC_CONFIG_FILES([
470      src/compiler/gen/file2str/file2str.sh:src/compiler/gen/file2str/file2str_sh.in
471    ], [chmod +x src/compiler/gen/file2str/file2str.sh])
472    AC_CONFIG_FILES([
473      rtest/scripts/run.sh:rtest/scripts/run_sh.in
474    ], [chmod +x rtest/scripts/run.sh])
475    AC_CONFIG_FILES([
476      rtest/scripts/run-one.sh:rtest/scripts/run-one_sh.in
477    ], [chmod +x rtest/scripts/run-one.sh])
478    
479  dnl  dnl
480  dnl generate makefiles for runtime library builds  dnl generate makefiles for runtime library builds
# Line 404  Line 493 
493      AC_CONFIG_FILES(src/lib/build/$1/Makefile)      AC_CONFIG_FILES(src/lib/build/$1/Makefile)
494    ])    ])
495    
496  MK_BUILD_DIR(rt-c-f, c-target, [float])  MK_BUILD_DIR(rt-c-f, c, [float])
497  MK_BUILD_DIR(rt-c-f-debug, c-target, [float debug])  MK_BUILD_DIR(rt-c-d, c, [double])
498  MK_BUILD_DIR(rt-c-f-par, parallel-target, [parallel float])  MK_BUILD_DIR(rt-c-f-debug, c, [float debug])
499  MK_BUILD_DIR(rt-c-f-par-debug, parallel-target, [parallel float debug])  MK_BUILD_DIR(rt-c-d-debug, c, [double debug])
500    MK_BUILD_DIR(rt-c-f-par, parallel, [parallel float])
501    MK_BUILD_DIR(rt-c-d-par, parallel, [parallel double])
502    MK_BUILD_DIR(rt-c-f-par-debug, parallel, [parallel float debug])
503    MK_BUILD_DIR(rt-c-d-par-debug, parallel, [parallel double debug])
504    
505    if test x"$CL_ENABLED" = xtrue ; then
506      MK_BUILD_DIR(rt-cl-f, cl, [float])
507      MK_BUILD_DIR(rt-cl-d, cl, [double])
508      MK_BUILD_DIR(rt-cl-f-debug, cl, [float debug])
509      MK_BUILD_DIR(rt-cl-d-debug, cl, [double debug])
510    fi
511    
512  AC_OUTPUT  AC_OUTPUT

Legend:
Removed from v.1232  
changed lines
  Added in v.1833

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