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

SCM Repository

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

Diff of /branches/charisee_dev/configure.ac

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

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

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

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