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

SCM Repository

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

Diff of /branches/opencl/configure.ac

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

revision 1299, Thu Jun 9 17:24:26 2011 UTC revision 1531, Fri Oct 14 18:45:50 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)
# 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 127  Line 126 
126    
127  AC_CHECK_FUNCS(mach_absolute_time)  AC_CHECK_FUNCS(mach_absolute_time)
128  AC_CHECK_TYPES([struct timespec])  AC_CHECK_TYPES([struct timespec])
129    AC_CHECK_FUNCS(pthread_barrier_init)
130    
131  dnl  dnl
132  dnl check for clock_gettime.  On Linux, this requires librt.  dnl check for clock_gettime.  On Linux, this requires librt.
# Line 236  Line 236 
236    esac    esac
237    if test -x $ac_cv_use_teem ; then    if test -x $ac_cv_use_teem ; then
238      TEEM_DIR=$ac_cv_use_teem      TEEM_DIR=$ac_cv_use_teem
239        # check that TEEM_DIR actually points to something that looks like teem
240        if test -f $TEEM_DIR/include/teem/nrrd.h ; then
241      AC_MSG_RESULT([ okay])      AC_MSG_RESULT([ okay])
242    else    else
243      TEEM_DIR=none      TEEM_DIR=none
244      AC_MSG_RESULT([ invalid])      AC_MSG_RESULT([ invalid])
245    fi    fi
246      else
247        TEEM_DIR=none
248        AC_MSG_RESULT([ invalid])
249      fi
250  fi  fi
251  if test x"$TEEM_DIR" = xnone ; then  if test x"$TEEM_DIR" = xnone ; then
252    AC_MSG_ERROR([unable to find teem])    AC_MSG_ERROR([unable to find teem])
# Line 340  Line 346 
346  dnl  dnl
347  dnl ******************** config.h stuff ********************  dnl ******************** config.h stuff ********************
348  dnl  dnl
349    
350    AC_DEFINE_UNQUOTED(DIDEROT_INCLUDE_PATH,["$DIDEROT_SRCDIR/include"], [path for Diderot header files])
351    
352  AH_TOP([  AH_TOP([
353  /*  /*
354   * COPYRIGHT (c) 2011 Diderot project. (http://diderot-language.cs.uchicago.edu)   * COPYRIGHT (c) 2011 Diderot project. (http://diderot-language.cs.uchicago.edu)
# Line 387  Line 396 
396  AC_CONFIG_FILES([  AC_CONFIG_FILES([
397    bin/install-sml-wrapper.sh:config/install-sml-wrapper_sh.in    bin/install-sml-wrapper.sh:config/install-sml-wrapper_sh.in
398  ], [chmod +x bin/install-sml-wrapper.sh])  ], [chmod +x bin/install-sml-wrapper.sh])
399    AC_CONFIG_FILES([
400      rtest/scripts/run-one.sh:rtest/scripts/run-one_sh.in
401    ], [chmod +x rtest/scripts/run-one.sh])
402    AC_CONFIG_FILES([
403      rtest/scripts/run.sh:rtest/scripts/run_sh.in
404    ], [chmod +x rtest/scripts/run.sh])
405    
406  dnl  dnl
407  dnl generate makefiles for runtime library builds  dnl generate makefiles for runtime library builds
# Line 405  Line 420 
420      AC_CONFIG_FILES(src/lib/build/$1/Makefile)      AC_CONFIG_FILES(src/lib/build/$1/Makefile)
421    ])    ])
422    
423  MK_BUILD_DIR(rt-c-f, c-target, [float])  MK_BUILD_DIR(rt-c-f, c, [float])
424  MK_BUILD_DIR(rt-c-f-debug, c-target, [float debug])  MK_BUILD_DIR(rt-c-f-debug, c, [float debug])
425  MK_BUILD_DIR(rt-c-f-par, parallel-target, [parallel float])  MK_BUILD_DIR(rt-c-f-par, parallel, [parallel float])
426  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])
427    
428  AC_OUTPUT  AC_OUTPUT

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

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