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

SCM Repository

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

Diff of /branches/vis15/configure.ac

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

branches/vis12/configure.ac revision 1714, Sat Mar 10 00:00:50 2012 UTC branches/vis15/configure.ac revision 3609, Tue Jan 19 16:44:01 2016 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 This code is part of the Diderot Project (http://diderot-language.cs.uchicago.edu)
4    dnl
5    dnl COPYRIGHT (c) 2015 The University of Chicago
6  dnl All rights reserved.  dnl All rights reserved.
7  dnl  dnl
8    
9  AC_INIT(diderot,0.1,)  AC_INIT(diderot,1.0,)
10    
11  AC_PREREQ(2.60)  AC_PREREQ(2.60)
12  AC_COPYRIGHT([[COPYRIGHT (c) 2011 The Diderot Project (http://diderot-language.cs.uchicago.edu)]])  AC_COPYRIGHT([[COPYRIGHT (c) 2015 The University of Chicago]])
13  AC_CONFIG_SRCDIR(src/dnorm/dnorm.c)  AC_CONFIG_SRCDIR(src/compiler/options/ctl.sml)
14  AC_CONFIG_AUX_DIR(config)  AC_CONFIG_AUX_DIR(config)
15  AC_CONFIG_MACRO_DIR(config)  AC_CONFIG_MACRO_DIR(config)
16    
17  dnl  dnl
18    dnl set the following to the name of the branch
19    dnl
20    BRANCH="master"
21    AC_SUBST(BRANCH)
22    
23    dnl
24  dnl include additional macros  dnl include additional macros
25  dnl  dnl
26  sinclude(config/acx_pthread.m4)  sinclude(config/acx_pthread.m4)
# Line 47  Line 55 
55    AC_MSG_ERROR([Diderot requires c99 support])    AC_MSG_ERROR([Diderot requires c99 support])
56  fi  fi
57    
58    AC_ARG_ENABLE([32-bit],
59      AC_HELP_STRING([--enable-32-bit], [configure Diderot to produce 32-bit executables]),
60      [CFLAG_MXX="-m32"],
61      [CFLAG_MXX="-m64"])
62    
63  dnl extra C compiler options  dnl extra C compiler options
64  dnl  dnl
65  CFLAGS=""  CFLAGS=""
 CFLAG_M64="-m64"  
66  CFLAGS_BASE="-Wformat -Wreturn-type -Wuninitialized"  CFLAGS_BASE="-Wformat -Wreturn-type -Wuninitialized"
67  AC_SUBST(CFLAG_M64)  AC_SUBST(CFLAG_MXX)
68  AC_SUBST(CFLAGS_BASE)  AC_SUBST(CFLAGS_BASE)
69    
70  dnl  dnl
71  dnl check for pthreads support  dnl standard headers
72  dnl  dnl
73  ACX_PTHREAD()  AC_HEADER_STDBOOL
74    
 dnl check for doxygen  
75  dnl  dnl
76  AC_ARG_WITH([doxygen],  dnl check for pthreads support
   [AS_HELP_STRING([--with-doxygen=PATH], [specify location of doxygen executable])],  
   [DOXYGEN=$with_doxygen],  
   [DOXYGEN=none])  
 if test x$DOXYGEN = xnone ; then  
   # see if we can find doxygen in the user's path  
   AC_PATH_PROG(DOXYGEN, [doxygen], [none])  
 fi  
 if test x$with_doxygen = xyes -o x$with_doxygen = xno ; then  
   AC_MSG_ERROR([--with-doxygen option must specify directory argument])  
 elif test x$DOXYGEN != xnone -a ! -x $DOXYGEN ; then  
   AC_MSG_ERROR([doxygen not found at $DOXYGEN])  
 elif test x$DOXYGEN != xnone ; then  
 dnl  
 dnl verify that $DOXYGEN is an absolute path  
77  dnl  dnl
78    case $DOXYGEN in  ACX_PTHREAD
     /*) ;;  
     *) AC_MSG_ERROR([--with-doxygen path must be absolute]) ;;  
   esac  
 fi  
 if test $DOXYGEN = xnone ; then  
   DOXYGEN=:  
 fi  
 AC_SUBST(DOXYGEN)  
79    
80  dnl  dnl
81  dnl Look for NVIDIA's nvcc compiler  dnl Look for NVIDIA's nvcc compiler
# Line 107  Line 96 
96  dnl  dnl
97  dnl check for OpenCL support  dnl check for OpenCL support
98  dnl  dnl
99  CL_LIBS="none"  LIBS_CL="none"
100  case "$host_os" in  case "$host_os" in
101    darwin*) # On Mac OS X we check for installed frameworks    darwin*) # On Mac OS X we check for installed frameworks
102      AX_CHECK_FRAMEWORK([OpenCL], [CL_LIBS="-framework OpenCL"], [])      AX_CHECK_FRAMEWORK([OpenCL], [LIBS_CL="-framework OpenCL"], [])
103    ;;    ;;
104    *)    *)
105      AC_CHECK_LIB([OpenCL],[clGetPlatformIDs],[CL_LIBS="-lOpenCL"])      AC_CHECK_LIB([OpenCL],[clGetPlatformIDs],[LIBS_CL="-lOpenCL"])
106    ;;    ;;
107  esac  esac
108  if test x"$CL_LIBS" = xnone ; then  if test x"$LIBS_CL" = xnone ; then
109    AC_MSG_WARN([no OpenCL library found])    AC_MSG_WARN([no OpenCL library found])
110    CL_ENABLED=false    CL_ENABLED=false
111    CL_VERSION=0    CL_VERSION=0
112  else  else
113    CL_ENABLED=true    CL_ENABLED=true
114    AC_CHECK_HEADERS([CL/cl.h OpenCL/cl.h])    CPPFLAGS_CL=""
115      CL_HEADER=""
116      AC_CHECK_HEADERS([CL/cl.h OpenCL/cl.h], [HAVE_CL_H="yes"; CL_HEADER="$ac_header"; break], [HAVE_CL_H="no"])
117      if test x"$HAVE_CL_H" = xno ; then
118        # check for AMD's SDK
119        AC_MSG_CHECKING([for cl.h in AMD's SDK])
120        if test -d /opt/AMDAPP/include/CL ; then
121          HAVE_CL_H="yes"
122          CL_HEADER="/opt/AMDAPP/include/CL/cl.h"
123          AC_DEFINE([HAVE_CL_CL_H])
124          CPPFLAGS_CL="-I/opt/AMDAPP/include"
125        fi
126        AC_MSG_RESULT([$HAVE_CL_H])
127      fi
128      if test x"$HAVE_CL_H" = xno ; then
129        # check for NVIDIA's SDK
130        AC_MSG_CHECKING([for NVIDIA's SDK cl.h])
131        CUDA_HOME=none
132        for CUDA in cuda cuda-7.0 cuda-6.5 cuda-6.0 ; do
133          if test -d /usr/local/$CUDA/include/CL ; then
134            CUDA_HOME=/usr/local/$CUDA
135            break
136          fi
137        done
138        if test x"$CUDA_HOME" != xnone ; then
139          HAVE_CL_H="yes"
140          CL_HEADER="$CUDA_HOME/include/CL/cl.h"
141          AC_DEFINE([HAVE_CL_CL_H])
142          CPPFLAGS_CL="-I$CUDA_HOME/include"
143        fi
144        AC_MSG_RESULT([$HAVE_CL_H])
145      fi
146      if test x"$HAVE_CL_H" = xno ; then
147        AC_MSG_WARN([no cl.h found])
148        CL_ENABLED=false
149        CL_VERSION=0
150        SIZEOF_CL_INT=0
151        SIZEOF_CL_LONG=0
152        SIZEOF_CL_FLOAT=0
153        SIZEOF_CL_DOUBLE=0
154      else
155    # check the cl.h header for which version of OpenCL is supported    # check the cl.h header for which version of OpenCL is supported
156    AC_LANG([C])    AC_LANG([C])
157        save_CPPFLAGS=$CPPFLAGS
158        CPPFLAGS="$CPPFLAGS_CL $CPPFLAGS"
159    AC_LINK_IFELSE([AC_LANG_PROGRAM([[    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
160  #include <stdio.h>  #include <stdio.h>
161  # ifdef HAVE_CL_CL_H  # ifdef HAVE_CL_CL_H
# Line 134  Line 165 
165  # else  # else
166  #   error no cl.h  #   error no cl.h
167  # endif]],  # endif]],
168  [[#if defined(CL_VERSION_1_1)  [[#if defined(CL_VERSION_1_2)
169    printf("11000\n");    printf("120\n");
170    #elif defined(CL_VERSION_1_1)
171      printf("110\n");
172  #elif defined(CL_VERSION_1_0)  #elif defined(CL_VERSION_1_0)
173    printf("10000\n");    printf("100\n");
174  #else  #else
175    printf("0\n");    printf("0\n");
176  #endif  #endif
# Line 148  Line 181 
181  dnl the specification specifies the behavior, but it was unspecified in 1.0.  dnl the specification specifies the behavior, but it was unspecified in 1.0.
182  dnl  dnl
183    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
184  # ifdef HAVE_CL_CL_H  #include "$CL_HEADER"
185  #   include <CL/cl.h>  ]],
 # elif defined(HAVE_OPENCL_CL_H)  
 #   include <OpenCL/cl.h>  
 # else  
 #   error no cl.h  
 # endif]],  
186      [[cl_float4 x; x[0] = 0.0;]])],      [[cl_float4 x; x[0] = 0.0;]])],
187      [AC_DEFINE([CL_HOST_VECTORS_ARE_ARRAYS],[1],[host vector types are arrays])],      [AC_DEFINE([CL_HOST_VECTORS_ARE_ARRAYS],[1],[host vector types are arrays])],
188  dnl  dnl
189  dnl not arrays, so try the OpenCL 1.1 structure representation  dnl not arrays, so try the OpenCL 1.1 structure representation
190  dnl  dnl
191      [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[      [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
192  # ifdef HAVE_CL_CL_H  #include "$CL_HEADER"
193  #   include <CL/cl.h>  ]],
 # elif defined(HAVE_OPENCL_CL_H)  
 #   include <OpenCL/cl.h>  
 # else  
 #   error no cl.h  
 # endif]],  
194      [[cl_float4 x; x.s[0] = 0.0;]])],      [[cl_float4 x; x.s[0] = 0.0;]])],
195      [AC_DEFINE([CL_HOST_VECTORS_ARE_STRUCTS],[1],[host vector types are structs])],      [AC_DEFINE([CL_HOST_VECTORS_ARE_STRUCTS],[1],[host vector types are structs])],
196      [AC_MSG_ERROR([unable to figure out host types for OpenCL vectors])])])      [AC_MSG_ERROR([unable to figure out host types for OpenCL vectors])])])
197      # restore saved CPPFLAGS
198        CPPFLAGS=$save_CPPFLAGS
199    # substitutions    # substitutions
200    AC_SUBST(CL_LIBS)      AC_SUBST(LIBS_CL)
201        AC_SUBST(CPPFLAGS_CL)
202      #
203      # determine the sizes of the host-side OpenCL types
204      AC_CHECK_SIZEOF([cl_int], [], [#include "$CL_HEADER"])
205      SIZEOF_CL_INT=$ac_cv_sizeof_cl_int
206      AC_CHECK_SIZEOF([cl_long], [], [#include "$CL_HEADER"])
207      SIZEOF_CL_LONG=$ac_cv_sizeof_cl_long
208      AC_CHECK_SIZEOF([cl_float], [], [#include "$CL_HEADER"])
209      SIZEOF_CL_FLOAT=$ac_cv_sizeof_cl_float
210      AC_CHECK_SIZEOF([cl_double], [], [#include "$CL_HEADER"])
211      SIZEOF_CL_DOUBLE=$ac_cv_sizeof_cl_double
212      fi
213  fi  fi
214  AC_SUBST(CL_ENABLED)  AC_SUBST(CL_ENABLED)
215  AC_SUBST(CL_VERSION)  AC_SUBST(CL_VERSION)
216    AC_DEFINE_UNQUOTED(DIDEROT_CL_VERSION,[$CL_VERSION],[version of OpenCL supported by system])
217    
218    AC_SUBST(SIZEOF_CL_INT)
219    AC_SUBST(SIZEOF_CL_LONG)
220    AC_SUBST(SIZEOF_CL_FLOAT)
221    AC_SUBST(SIZEOF_CL_DOUBLE)
222    
223  dnl  dnl
224  dnl check for various library routines etc.  dnl check for various library routines etc.
# Line 285  Line 328 
328  AC_SUBST(LIBM)  AC_SUBST(LIBM)
329    
330  dnl  dnl
331  dnl get the path to the TEEM installation  dnl get the path to the TEEM installation.  We need this to build the Diderot
332    dnl runtime code and we use the path when searching for teem in the Diderot
333    dnl compiler.
334  dnl  dnl
335  AC_ARG_WITH(teem,  AC_ARG_WITH(teem,
336    AC_HELP_STRING([--with-teem=<path>], [specify path to teem installation]),    AC_HELP_STRING([--with-teem=<path>], [specify path to teem installation]),
# Line 302  Line 347 
347      TEEM_DIR=$ac_cv_use_teem      TEEM_DIR=$ac_cv_use_teem
348      # check that TEEM_DIR actually points to something that looks like teem      # check that TEEM_DIR actually points to something that looks like teem
349      if test -f $TEEM_DIR/include/teem/nrrd.h ; then      if test -f $TEEM_DIR/include/teem/nrrd.h ; then
350        AC_MSG_RESULT([ okay])        AC_MSG_RESULT([yes])
351      else      else
352        TEEM_DIR=none        TEEM_DIR=none
353        AC_MSG_RESULT([ invalid])        AC_MSG_RESULT([no])
354      fi      fi
355    else    else
356      TEEM_DIR=none      TEEM_DIR=none
357      AC_MSG_RESULT([ invalid])      AC_MSG_RESULT([no])
358    fi    fi
359  fi  fi
360  if test x"$TEEM_DIR" = xnone ; then  if test x"$TEEM_DIR" = xnone ; then
361    AC_MSG_ERROR([unable to find teem])    AC_MSG_ERROR([unable to find teem; use --with-teem option to specify location])
362    fi
363    dnl
364    dnl check that unu supports the dnorm command
365    dnl
366    if test x"$TEEM_DIR" != xnone ; then
367      AC_MSG_CHECKING([that \"unu dnorm\" works])
368      if test -x $TEEM_DIR/bin/unu ; then
369        $TEEM_DIR/bin/unu dnorm > /dev/null 2> /dev/null
370        if test $? -eq 0 ; then
371          AC_MSG_RESULT([yes])
372        else
373          AC_MSG_ERROR([\"unu dnorm\" is not supported; please update your teem installation])
374        fi
375      else
376        AC_MSG_ERROR([unable to find unu executable in $TEEM_DIR/bin"])
377      fi
378  fi  fi
379  AC_SUBST(TEEM_DIR)  AC_SUBST(TEEM_DIR)
380    
# Line 324  Line 385 
385  dnl  dnl
386  CHECK_SMLNJ([AC_MSG_ERROR([unable to find SML/NJ installation; check your PATH or set SMLNJ_CMD])])  CHECK_SMLNJ([AC_MSG_ERROR([unable to find SML/NJ installation; check your PATH or set SMLNJ_CMD])])
387  if test $SMLNJ_MAJOR_VERSION -lt 110 \  if test $SMLNJ_MAJOR_VERSION -lt 110 \
388    -o $SMLNJ_MINOR_VERSION -lt 73    -o $SMLNJ_MINOR_VERSION -lt 79
389  then  then
390    AC_MSG_ERROR([installation requires SML/NJ version 110.73+])    AC_MSG_ERROR([installation requires SML/NJ version 110.79+ (available from smlnj.org)])
391  fi  fi
392  AC_SUBST(SMLNJ_VERSION)  AC_SUBST(SMLNJ_VERSION)
393    
# Line 357  Line 418 
418  fi  fi
419  AC_SUBST(ML_BUILD)  AC_SUBST(ML_BUILD)
420    
421    dnl ******************** Documentation tools ********************
422    
423    dnl check for doxygen
424    dnl
425    AC_ARG_WITH([doxygen],
426      [AS_HELP_STRING([--with-doxygen=PATH], [specify location of doxygen executable])],
427      [DOXYGEN=$with_doxygen],
428      [DOXYGEN=none])
429    if test x$DOXYGEN = xnone ; then
430      # see if we can find doxygen in the user's path
431      AC_PATH_PROG(DOXYGEN, [doxygen], [none])
432    fi
433    if test x$with_doxygen = xyes -o x$with_doxygen = xno ; then
434      AC_MSG_ERROR([--with-doxygen option must specify directory argument])
435    elif test x$DOXYGEN != xnone -a ! -x $DOXYGEN ; then
436      AC_MSG_ERROR([doxygen not found at $DOXYGEN])
437    elif test x$DOXYGEN != xnone ; then
438    dnl
439    dnl verify that $DOXYGEN is an absolute path
440    dnl
441      case $DOXYGEN in
442        /*) ;;
443        *) AC_MSG_ERROR([--with-doxygen path must be absolute]) ;;
444      esac
445    fi
446    if test $DOXYGEN = xnone ; then
447      DOXYGEN=:
448    fi
449    AC_SUBST(DOXYGEN)
450    
451    dnl check for asciidoc and related tools
452    dnl
453    AC_PATH_PROGS([ASCIIDOC], [asciidoc], [none])
454    AC_PATH_PROGS([A2X], [a2x], [none])
455    AC_PATH_PROGS([HIGHLIGHTER], [pygmentize], [none])
456    AC_PATH_PROGS([DBLATEX], [dblatex], [none])
457    
458    dnl
459    dnl get the path to the asciidoc cofiguration files
460    dnl
461    if test x"$ASCIIDOC" != xnone ; then
462      AC_MSG_CHECKING([path to asciidoc configuration files])
463      ASCIIDOC_CONF_DIR=`$ASCIIDOC -v /dev/null 2>&1 | head -n 1 | sed 's|.*reading: \(.*\)/asciidoc.conf|\1|'`
464      AC_MSG_RESULT([$ASCIIDOC_CONF_DIR])
465    fi
466    AC_SUBST(ASCIIDOC)
467    AC_SUBST(A2X)
468    AC_SUBST(ASCIIDOC_CONF_DIR)
469    AC_SUBST(HIGHLIGHTER)
470    AC_SUBST(DBLATEX)
471    
472    
473  dnl ******************** Paths ********************  dnl ******************** Paths ********************
474    
475  DIDEROT_ROOT=`pwd`  DIDEROT_ROOT=`pwd`
# Line 386  Line 499 
499  dnl run the compiler tests in 64-bit mode  dnl run the compiler tests in 64-bit mode
500  dnl  dnl
501  save_CFLAGS=$CFLAGS  save_CFLAGS=$CFLAGS
502  CFLAGS="$CFLAGS $CFLAG_M64"  CFLAGS="$CFLAGS $CFLAG_MXX"
503    
504  dnl  dnl
505  dnl check for gcc builtin atomic operations  dnl check for gcc builtin atomic operations
# Line 402  Line 515 
515    
516  AC_C_BIGENDIAN  AC_C_BIGENDIAN
517    
518    #
519    # determine the sizes of the standard C types
520    AC_CHECK_SIZEOF([int])
521    SIZEOF_C_INT=$ac_cv_sizeof_int
522    AC_CHECK_SIZEOF([long])
523    SIZEOF_C_LONG=$ac_cv_sizeof_long
524    AC_CHECK_SIZEOF([float])
525    SIZEOF_C_FLOAT=$ac_cv_sizeof_float
526    AC_CHECK_SIZEOF([double])
527    SIZEOF_C_DOUBLE=$ac_cv_sizeof_double
528    
529    AC_SUBST(SIZEOF_C_INT)
530    AC_SUBST(SIZEOF_C_LONG)
531    AC_SUBST(SIZEOF_C_FLOAT)
532    AC_SUBST(SIZEOF_C_DOUBLE)
533    
534  dnl  dnl
535  dnl restore CFLAGS  dnl restore CFLAGS
536  dnl  dnl
# Line 415  Line 544 
544    
545  AH_TOP([  AH_TOP([
546  /*  /*
547   * COPYRIGHT (c) 2011 Diderot project. (http://diderot-language.cs.uchicago.edu)   * This code is part of the Diderot Project (http://diderot-language.cs.uchicago.edu)
548   * All rights reserved.   *
549     * COPYRIGHT (c) 2015 The University of Chicago * All rights reserved.
550   */   */
551    
552  #ifndef _DIDEROT_CONFIG_H_  #ifndef _DIDEROT_CONFIG_H_
# Line 425  Line 555 
555  ])  ])
556  AH_BOTTOM([  AH_BOTTOM([
557    
558    #ifdef NDEBUG
559    #define STATIC_INLINE   static inline
560    #else
561    #define STATIC_INLINE   static
562    #endif
563    
564  #endif /* !_DIDEROT_CONFIG_H_ */  #endif /* !_DIDEROT_CONFIG_H_ */
565  ])  ])
566    
# Line 436  Line 572 
572  dnl  dnl
573  dnl ***** Makefiles *****  dnl ***** Makefiles *****
574    Makefile    Makefile
575    doc/Makefile  dnl  doc/Makefile
576    src/clinfo/Makefile  dnl  doc/man/Makefile
577    src/dnorm/Makefile  dnl  src/clinfo/Makefile
578    src/compiler/Makefile    src/compiler/Makefile
579    src/lib/build/Makefile  dnl  src/lib/build/Makefile
580    src/lib/build/mk/build.gmk:src/lib/build/mk/build_gmk.in  dnl  src/lib/build/mk/build.gmk:src/lib/build/mk/build_gmk.in
581    test/MIP/Makefile  dnl  test/MIP/Makefile
582    test/probe/Makefile  dnl  test/probe/Makefile
583    dnl  test/iso2d-polyline/Makefile
584    dnl  test/vr-lite-cam/Makefile
585    dnl  test/hlic/Makefile
586  dnl  dnl
587  dnl ***** SML source files *****  dnl ***** SML source files *****
588    src/compiler/fields/run-dnorm.sml:src/compiler/fields/run-dnorm_sml.in    src/compiler/nrrd/run-dnorm.sml:src/compiler/nrrd/run-dnorm_sml.in
589    src/compiler/common/paths.sml:src/compiler/common/paths_sml.in    src/compiler/common/paths.sml:src/compiler/common/paths_sml.in
590      src/compiler/common/size-of.sml:src/compiler/common/size-of_sml.in
591      src/compiler/options/version.sml:src/compiler/options/version_sml.in
592  )  )
593    
594  AC_CONFIG_HEADERS(src/include/Diderot/config.h:config/config_h.in)  AC_CONFIG_HEADERS(src/include/Diderot/config.h:config/config_h.in)
# Line 458  Line 599 
599  AC_CONFIG_FILES([  AC_CONFIG_FILES([
600    bin/install-sml-wrapper.sh:config/install-sml-wrapper_sh.in    bin/install-sml-wrapper.sh:config/install-sml-wrapper_sh.in
601  ], [chmod +x bin/install-sml-wrapper.sh])  ], [chmod +x bin/install-sml-wrapper.sh])
602  AC_CONFIG_FILES([  # AC_CONFIG_FILES([
603    src/compiler/gen/file2str/file2str.sh:src/compiler/gen/file2str/file2str_sh.in  #   src/compiler/gen/file2str/file2str.sh:src/compiler/gen/file2str/file2str_sh.in
604  ], [chmod +x src/compiler/gen/file2str/file2str.sh])  # ], [chmod +x src/compiler/gen/file2str/file2str.sh])
605    # AC_CONFIG_FILES([
606    #   rtest/scripts/run.sh:rtest/scripts/run_sh.in
607    # ], [chmod +x rtest/scripts/run.sh])
608    # AC_CONFIG_FILES([
609    #   rtest/scripts/run-one.sh:rtest/scripts/run-one_sh.in
610    # ], [chmod +x rtest/scripts/run-one.sh])
611    #
612    # more regression tests; should merge with rtest at some point
613    #
614    # AC_CONFIG_FILES([
615    #   rtest2/scripts/run.sh:rtest2/scripts/run_sh.in
616    # ], [chmod +x rtest2/scripts/run.sh])
617    # AC_CONFIG_FILES([
618    #   rtest2/scripts/run-one.sh:rtest2/scripts/run-one_sh.in
619    # ], [chmod +x rtest2/scripts/run-one.sh])
620    
621  dnl  dnl
622  dnl generate makefiles for runtime library builds  dnl generate makefiles for runtime library builds
# Line 479  Line 635 
635      AC_CONFIG_FILES(src/lib/build/$1/Makefile)      AC_CONFIG_FILES(src/lib/build/$1/Makefile)
636    ])    ])
637    
638  MK_BUILD_DIR(rt-c-f, c, [float])  #MK_BUILD_DIR(rt-c-f, c, [float])
639  MK_BUILD_DIR(rt-c-d, c, [double])  #MK_BUILD_DIR(rt-c-d, c, [double])
640  MK_BUILD_DIR(rt-c-f-debug, c, [float debug])  #MK_BUILD_DIR(rt-c-f-debug, c, [float debug])
641  MK_BUILD_DIR(rt-c-d-debug, c, [double debug])  #MK_BUILD_DIR(rt-c-d-debug, c, [double debug])
642  MK_BUILD_DIR(rt-c-f-par, parallel, [parallel float])  #MK_BUILD_DIR(rt-c-f-par, parallel, [parallel float])
643  MK_BUILD_DIR(rt-c-d-par, parallel, [parallel double])  #MK_BUILD_DIR(rt-c-d-par, parallel, [parallel double])
644  MK_BUILD_DIR(rt-c-f-par-debug, parallel, [parallel float debug])  #MK_BUILD_DIR(rt-c-f-par-debug, parallel, [parallel float debug])
645  MK_BUILD_DIR(rt-c-d-par-debug, parallel, [parallel double debug])  #MK_BUILD_DIR(rt-c-d-par-debug, parallel, [parallel double debug])
646    
647  if test x"$CL_ENABLED" = xtrue ; then  #if test x"$CL_ENABLED" = xtrue ; then
648    MK_BUILD_DIR(rt-cl-f, cl, [float])  #  MK_BUILD_DIR(rt-cl-f, cl, [float])
649    MK_BUILD_DIR(rt-cl-d, cl, [double])  #  MK_BUILD_DIR(rt-cl-d, cl, [double])
650    MK_BUILD_DIR(rt-cl-f-debug, cl, [float debug])  #  MK_BUILD_DIR(rt-cl-f-debug, cl, [float debug])
651    MK_BUILD_DIR(rt-cl-d-debug, cl, [double debug])  #  MK_BUILD_DIR(rt-cl-d-debug, cl, [double debug])
652  fi  #fi
653    
654  AC_OUTPUT  AC_OUTPUT

Legend:
Removed from v.1714  
changed lines
  Added in v.3609

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