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

SCM Repository

[diderot] Diff of /branches/pure-cfg/configure.ac
ViewVC logotype

Diff of /branches/pure-cfg/configure.ac

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

revision 1269, Sun Jun 5 11:46:52 2011 UTC revision 1403, Wed Jun 29 18:33:46 2011 UTC
# Line 43  Line 43 
43    
44  dnl extra C compiler options  dnl extra C compiler options
45  dnl  dnl
46    CFLAGS=""
47  CFLAG_M64="-m64"  CFLAG_M64="-m64"
48  CFLAGS_BASE="-Wformat -Wreturn-type -Wuninitialized"  CFLAGS_BASE="-Wformat -Wreturn-type -Wuninitialized"
49  AC_SUBST(CFLAG_M64)  AC_SUBST(CFLAG_M64)
# Line 108  Line 109 
109  #endif  #endif
110      ]])],      ]])],
111      [CL_VERSION=`./conftest$EXEEXT`], [CL_VERSION=0])      [CL_VERSION=`./conftest$EXEEXT`], [CL_VERSION=0])
112    dnl
113    dnl check to see how we access the host-side vector types.  For OpenCL 1.1,
114    dnl the specification specifies the behavior, but it was unspecified in 1.0.
115    dnl
116      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
117    # ifdef HAVE_CL_CL_H
118    #   include <CL/cl.h>
119    # elif defined(HAVE_OPENCL_CL_H)
120    #   include <OpenCL/cl.h>
121    # else
122    #   error no cl.h
123    # endif]],
124        [[cl_float4 x; x[0] = 0.0;]])],
125        [AC_DEFINE([CL_HOST_VECTORS_ARE_ARRAYS],[1],[host vector types are arrays])],
126    dnl
127    dnl not arrays, so try the OpenCL 1.1 structure representation
128    dnl
129        [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
130    # ifdef HAVE_CL_CL_H
131    #   include <CL/cl.h>
132    # elif defined(HAVE_OPENCL_CL_H)
133    #   include <OpenCL/cl.h>
134    # else
135    #   error no cl.h
136    # endif]],
137        [[cl_float4 x; x.s[0] = 0.0;]])],
138        [AC_DEFINE([CL_HOST_VECTORS_ARE_STRUCTS],[1],[host vector types are structs])],
139        [AC_MSG_ERROR([unable to figure out host types for OpenCL vectors])])])
140    # substitutions    # substitutions
141    AC_SUBST(CL_LIBS)    AC_SUBST(CL_LIBS)
142  fi  fi
# Line 237  Line 266 
266    esac    esac
267    if test -x $ac_cv_use_teem ; then    if test -x $ac_cv_use_teem ; then
268      TEEM_DIR=$ac_cv_use_teem      TEEM_DIR=$ac_cv_use_teem
269        # check that TEEM_DIR actually points to something that looks like teem
270        if test -f $TEEM_DIR/include/teem/nrrd.h ; then
271      AC_MSG_RESULT([ okay])      AC_MSG_RESULT([ okay])
272    else    else
273      TEEM_DIR=none      TEEM_DIR=none
274      AC_MSG_RESULT([ invalid])      AC_MSG_RESULT([ invalid])
275    fi    fi
276      else
277        TEEM_DIR=none
278        AC_MSG_RESULT([ invalid])
279      fi
280  fi  fi
281  if test x"$TEEM_DIR" = xnone ; then  if test x"$TEEM_DIR" = xnone ; then
282    AC_MSG_ERROR([unable to find teem])    AC_MSG_ERROR([unable to find teem])
# Line 341  Line 376 
376  dnl  dnl
377  dnl ******************** config.h stuff ********************  dnl ******************** config.h stuff ********************
378  dnl  dnl
379    
380    AC_DEFINE_UNQUOTED(DIDEROT_INCLUDE_PATH,["$DIDEROT_SRCDIR/include"], [path for Diderot header files])
381    
382  AH_TOP([  AH_TOP([
383  /*  /*
384   * COPYRIGHT (c) 2011 Diderot project. (http://diderot-language.cs.uchicago.edu)   * COPYRIGHT (c) 2011 Diderot project. (http://diderot-language.cs.uchicago.edu)
# Line 406  Line 444 
444      AC_CONFIG_FILES(src/lib/build/$1/Makefile)      AC_CONFIG_FILES(src/lib/build/$1/Makefile)
445    ])    ])
446    
447  MK_BUILD_DIR(rt-c-f, c-target, [float])  MK_BUILD_DIR(rt-c-f, c, [float])
448  MK_BUILD_DIR(rt-c-f-debug, c-target, [float debug])  MK_BUILD_DIR(rt-c-f-debug, c, [float debug])
449  MK_BUILD_DIR(rt-c-f-par, parallel-target, [parallel float])  MK_BUILD_DIR(rt-c-f-par, parallel, [parallel float])
450  MK_BUILD_DIR(rt-c-f-par-debug, parallel-target, [parallel float debug])  MK_BUILD_DIR(rt-c-f-par-debug, parallel, [parallel float debug])
451    
452  if test x"$CL_ENABLED" = xtrue ; then  if test x"$CL_ENABLED" = xtrue ; then
453    MK_BUILD_DIR(rt-cl-f, cl-target, [float])    MK_BUILD_DIR(rt-cl-f, cl, [float])
454    MK_BUILD_DIR(rt-cl-f-debug, cl-target, [float debug])    MK_BUILD_DIR(rt-cl-f-debug, cl, [float debug])
455  fi  fi
456    
457  AC_OUTPUT  AC_OUTPUT

Legend:
Removed from v.1269  
changed lines
  Added in v.1403

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