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

SCM Repository

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

Diff of /branches/staging/configure.ac

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

revision 1301, Thu Jun 9 23:58:40 2011 UTC revision 1671, Sun Dec 4 10:56:10 2011 UTC
# Line 4  Line 4 
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) 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 43  Line 41 
41    
42  dnl extra C compiler options  dnl extra C compiler options
43  dnl  dnl
44    CFLAGS=""
45  CFLAG_M64="-m64"  CFLAG_M64="-m64"
46  CFLAGS_BASE="-Wformat -Wreturn-type -Wuninitialized"  CFLAGS_BASE="-Wformat -Wreturn-type -Wuninitialized"
47  AC_SUBST(CFLAG_M64)  AC_SUBST(CFLAG_M64)
# Line 53  Line 52 
52  dnl  dnl
53  ACX_PTHREAD()  ACX_PTHREAD()
54    
55    dnl check for doxygen
56    dnl
57    AC_ARG_WITH([doxygen],
58      [AS_HELP_STRING([--with-doxygen=PATH], [specify location of doxygen executable])],
59      [DOXYGEN=$with_doxygen],
60      [DOXYGEN=none])
61    if test x$DOXYGEN = xnone ; then
62      # see if we can find doxygen in the user's path
63      AC_PATH_PROG(DOXYGEN, [doxygen], [none])
64    fi
65    if test x$with_doxygen = xyes -o x$with_doxygen = xno ; then
66      AC_MSG_ERROR([--with-doxygen option must specify directory argument])
67    elif test x$DOXYGEN != xnone -a ! -x $DOXYGEN ; then
68      AC_MSG_ERROR([doxygen not found at $DOXYGEN])
69    elif test x$DOXYGEN != xnone ; then
70    dnl
71    dnl verify that $DOXYGEN is an absolute path
72    dnl
73      case $DOXYGEN in
74        /*) ;;
75        *) AC_MSG_ERROR([--with-doxygen path must be absolute]) ;;
76      esac
77    fi
78    if test $DOXYGEN = xnone ; then
79      DOXYGEN=:
80    fi
81    AC_SUBST(DOXYGEN)
82    
83  dnl  dnl
84  dnl Look for NVIDIA's nvcc compiler  dnl Look for NVIDIA's nvcc compiler
85  dnl  dnl
# Line 108  Line 135 
135  #endif  #endif
136      ]])],      ]])],
137      [CL_VERSION=`./conftest$EXEEXT`], [CL_VERSION=0])      [CL_VERSION=`./conftest$EXEEXT`], [CL_VERSION=0])
138    dnl
139    dnl check to see how we access the host-side vector types.  For OpenCL 1.1,
140    dnl the specification specifies the behavior, but it was unspecified in 1.0.
141    dnl
142      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
143    # ifdef HAVE_CL_CL_H
144    #   include <CL/cl.h>
145    # elif defined(HAVE_OPENCL_CL_H)
146    #   include <OpenCL/cl.h>
147    # else
148    #   error no cl.h
149    # endif]],
150        [[cl_float4 x; x[0] = 0.0;]])],
151        [AC_DEFINE([CL_HOST_VECTORS_ARE_ARRAYS],[1],[host vector types are arrays])],
152    dnl
153    dnl not arrays, so try the OpenCL 1.1 structure representation
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.s[0] = 0.0;]])],
164        [AC_DEFINE([CL_HOST_VECTORS_ARE_STRUCTS],[1],[host vector types are structs])],
165        [AC_MSG_ERROR([unable to figure out host types for OpenCL vectors])])])
166    # substitutions    # substitutions
167    AC_SUBST(CL_LIBS)    AC_SUBST(CL_LIBS)
168  fi  fi
# Line 237  Line 292 
292    esac    esac
293    if test -x $ac_cv_use_teem ; then    if test -x $ac_cv_use_teem ; then
294      TEEM_DIR=$ac_cv_use_teem      TEEM_DIR=$ac_cv_use_teem
295        # check that TEEM_DIR actually points to something that looks like teem
296        if test -f $TEEM_DIR/include/teem/nrrd.h ; then
297      AC_MSG_RESULT([ okay])      AC_MSG_RESULT([ okay])
298    else    else
299      TEEM_DIR=none      TEEM_DIR=none
300      AC_MSG_RESULT([ invalid])      AC_MSG_RESULT([ invalid])
301    fi    fi
302      else
303        TEEM_DIR=none
304        AC_MSG_RESULT([ invalid])
305      fi
306  fi  fi
307  if test x"$TEEM_DIR" = xnone ; then  if test x"$TEEM_DIR" = xnone ; then
308    AC_MSG_ERROR([unable to find teem])    AC_MSG_ERROR([unable to find teem])
# Line 367  Line 428 
428  dnl  dnl
429  dnl ***** Makefiles *****  dnl ***** Makefiles *****
430    Makefile    Makefile
431      doc/Makefile
432      src/clinfo/Makefile
433    src/dnorm/Makefile    src/dnorm/Makefile
434    src/compiler/Makefile    src/compiler/Makefile
435    src/lib/build/Makefile    src/lib/build/Makefile
436    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
437    test/MIP/Makefile    test/MIP/Makefile
438    test/probe/Makefile    test/probe/Makefile
   test/teem/Makefile  
 dnl  
 dnl ***** CM files *****  
   src/compiler/codegen/sources.cm:src/compiler/codegen/sources_cm.in  
439  dnl  dnl
440  dnl ***** SML source files *****  dnl ***** SML source files *****
441    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 391  Line 450 
450  AC_CONFIG_FILES([  AC_CONFIG_FILES([
451    bin/install-sml-wrapper.sh:config/install-sml-wrapper_sh.in    bin/install-sml-wrapper.sh:config/install-sml-wrapper_sh.in
452  ], [chmod +x bin/install-sml-wrapper.sh])  ], [chmod +x bin/install-sml-wrapper.sh])
453    AC_CONFIG_FILES([
454      src/compiler/gen/file2str/file2str.sh:src/compiler/gen/file2str/file2str_sh.in
455    ], [chmod +x src/compiler/gen/file2str/file2str.sh])
456    
457  dnl  dnl
458  dnl generate makefiles for runtime library builds  dnl generate makefiles for runtime library builds
# Line 410  Line 472 
472    ])    ])
473    
474  MK_BUILD_DIR(rt-c-f, c, [float])  MK_BUILD_DIR(rt-c-f, c, [float])
475    MK_BUILD_DIR(rt-c-d, c, [double])
476  MK_BUILD_DIR(rt-c-f-debug, c, [float debug])  MK_BUILD_DIR(rt-c-f-debug, c, [float debug])
477    MK_BUILD_DIR(rt-c-d-debug, c, [double debug])
478  MK_BUILD_DIR(rt-c-f-par, parallel, [parallel float])  MK_BUILD_DIR(rt-c-f-par, parallel, [parallel float])
479    MK_BUILD_DIR(rt-c-d-par, parallel, [parallel double])
480  MK_BUILD_DIR(rt-c-f-par-debug, parallel, [parallel float debug])  MK_BUILD_DIR(rt-c-f-par-debug, parallel, [parallel float debug])
481    MK_BUILD_DIR(rt-c-d-par-debug, parallel, [parallel double debug])
482    
483    if test x"$CL_ENABLED" = xtrue ; then
484      MK_BUILD_DIR(rt-cl-f, cl, [float])
485      MK_BUILD_DIR(rt-cl-d, cl, [double])
486      MK_BUILD_DIR(rt-cl-f-debug, cl, [float debug])
487      MK_BUILD_DIR(rt-cl-d-debug, cl, [double debug])
488    fi
489    
490  AC_OUTPUT  AC_OUTPUT

Legend:
Removed from v.1301  
changed lines
  Added in v.1671

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