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

revision 3776, Tue Apr 26 20:57:01 2016 UTC revision 3914, Wed May 25 15:47:42 2016 UTC
# Line 2  Line 2 
2  dnl  dnl
3  dnl This code is part of the Diderot Project (http://diderot-language.cs.uchicago.edu)  dnl This code is part of the Diderot Project (http://diderot-language.cs.uchicago.edu)
4  dnl  dnl
5  dnl COPYRIGHT (c) 2015 The University of Chicago  dnl COPYRIGHT (c) 2016 The University of Chicago
6  dnl All rights reserved.  dnl All rights reserved.
7  dnl  dnl
8    
9  AC_INIT(diderot,1.0,)  AC_INIT(diderot,1.0,)
10    
11  AC_PREREQ(2.60)  AC_PREREQ(2.60)
12  AC_COPYRIGHT([[COPYRIGHT (c) 2015 The University of Chicago]])  AC_COPYRIGHT([[COPYRIGHT (c) 2016 The University of Chicago]])
13  AC_CONFIG_SRCDIR(src/compiler/options/ctl.sml)  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)
# Line 27  Line 27 
27  sinclude(config/check_smlnj.m4)  sinclude(config/check_smlnj.m4)
28  sinclude(config/check_smlnj_heap_suffix.m4)  sinclude(config/check_smlnj_heap_suffix.m4)
29  sinclude(config/ax_check_framework.m4)  sinclude(config/ax_check_framework.m4)
30    sinclude(config/ax_cxx_compile_stdcxx.m4)
31    
32  dnl  dnl
33  dnl get host information  dnl get host information
# Line 35  Line 36 
36    
37  dnl check for standard programs  dnl check for standard programs
38  dnl  dnl
 AC_PROG_CC([clang gcc cc])  
39  AC_PROG_CPP  AC_PROG_CPP
40    AC_PROG_CXX([clang++ g++ c++])
41    AX_CXX_COMPILE_STDCXX(11,[],[mandatory])
42  AC_PROG_INSTALL  AC_PROG_INSTALL
43  AC_PROG_MAKE_SET  AC_PROG_MAKE_SET
44    
# Line 48  Line 50 
50  fi  fi
51  AC_SUBST(LD)  AC_SUBST(LD)
52    
53  dnl check for c99 support  dnl extra compiler options
54  dnl  dnl
55  AC_PROG_CC_C99  CXXFLAGS_BASE="$CXXFLAGS -Wformat -Wreturn-type -Wuninitialized"
 if test x"$ac_cv_prog_cc_c99" = xno ; then  
   AC_MSG_ERROR([Diderot requires c99 support])  
 fi  
56    
57  AC_ARG_ENABLE([32-bit],  AC_ARG_ENABLE([32-bit],
58    AC_HELP_STRING([--enable-32-bit], [configure Diderot to produce 32-bit executables]),    AC_HELP_STRING([--enable-32-bit], [configure Diderot to produce 32-bit executables]),
59    [CFLAG_MXX="-m32"],    [CXXFLAG_Mxx="-m32"],
60    [CFLAG_MXX="-m64"])    [CXXFLAG_Mxx="-m64"])
61    if test x"$CXX" != "xclang++" ; then
62      CXXFLAGS_BASE="$CXXFLAGS_BASE -fno-implicit-templates"
63    fi
64    
65  dnl extra C compiler options  CXXFLAGS="$CXXFLAG_Mxx $CXXFLAGS_BASE"
66  dnl  AC_SUBST(CXXFLAG_Mxx)
67  CFLAGS=""  AC_SUBST(CXXFLAGS_BASE)
 CFLAGS_BASE="-Wformat -Wreturn-type -Wuninitialized"  
 AC_SUBST(CFLAG_MXX)  
 AC_SUBST(CFLAGS_BASE)  
68    
69  dnl  dnl
70  dnl standard headers  dnl check for <stdbool.h>, which we use in the C API
71  dnl  dnl
72  AC_HEADER_STDBOOL  AC_HEADER_STDBOOL
73    
# Line 579  Line 578 
578  dnl ******************** config.h stuff ********************  dnl ******************** config.h stuff ********************
579  dnl  dnl
580    
581  AC_DEFINE_UNQUOTED(DIDEROT_INCLUDE_PATH,["$DIDEROT_SRCDIR/include"], [path for Diderot header files])  AC_DEFINE_UNQUOTED(DIDEROT_INCLUDE_PATH,["$DIDEROT_SRCDIR/lib/include"], [path for Diderot header files])
582    
583  AH_TOP([  AH_TOP([
584  /*  /*
585   * This code is part of the Diderot Project (http://diderot-language.cs.uchicago.edu)   * This code is part of the Diderot Project (http://diderot-language.cs.uchicago.edu)
586   *   *
587   * COPYRIGHT (c) 2015 The University of Chicago * All rights reserved.   * COPYRIGHT (c) 2016 The University of Chicago * All rights reserved.
588   */   */
589    
590  #ifndef _DIDEROT_CONFIG_H_  #ifndef _DIDEROT_CONFIG_H_
# Line 594  Line 593 
593  ])  ])
594  AH_BOTTOM([  AH_BOTTOM([
595    
 #ifdef NDEBUG  
 #define STATIC_INLINE   static inline  
 #else  
 #define STATIC_INLINE   static  
 #endif  
   
596  #endif /* !_DIDEROT_CONFIG_H_ */  #endif /* !_DIDEROT_CONFIG_H_ */
597  ])  ])
598    
# Line 638  Line 631 
631    src/compiler/options/version.sml:src/compiler/options/version_sml.in    src/compiler/options/version.sml:src/compiler/options/version_sml.in
632  )  )
633    
634  AC_CONFIG_HEADERS(src/include/Diderot/config.h:config/config_h.in)  #AC_CONFIG_HEADERS(src/compiler/c-util/fragments/config.in:config/config_h.in)
635    AC_CONFIG_HEADERS(src/lib/include/diderot/config.h:config/config_h.in)
636    
637  dnl  dnl
638  dnl shell scripts  dnl shell scripts
# Line 649  Line 643 
643  AC_CONFIG_FILES([  AC_CONFIG_FILES([
644    src/compiler/gen/fragments/mkfrags.sh:src/compiler/gen/fragments/mkfrags_sh.in    src/compiler/gen/fragments/mkfrags.sh:src/compiler/gen/fragments/mkfrags_sh.in
645  ], [chmod +x src/compiler/gen/fragments/mkfrags.sh])  ], [chmod +x src/compiler/gen/fragments/mkfrags.sh])
646    AC_CONFIG_FILES([
647      src/compiler/gen/fragments/mkmk.sh:src/compiler/gen/fragments/mkmk_sh.in
648    ], [chmod +x src/compiler/gen/fragments/mkmk.sh])
649  # AC_CONFIG_FILES([  # AC_CONFIG_FILES([
650  #   rtest/scripts/run.sh:rtest/scripts/run_sh.in  #   rtest/scripts/run.sh:rtest/scripts/run_sh.in
651  # ], [chmod +x rtest/scripts/run.sh])  # ], [chmod +x rtest/scripts/run.sh])
# Line 682  Line 679 
679      AC_CONFIG_FILES(src/lib/build/$1/Makefile)      AC_CONFIG_FILES(src/lib/build/$1/Makefile)
680    ])    ])
681    
682  #MK_BUILD_DIR(rt-c-f, c, [float])  #MK_BUILD_DIR(rt-seq-f, c, [float])
683  #MK_BUILD_DIR(rt-c-d, c, [double])  #MK_BUILD_DIR(rt-seq-d, c, [double])
684  #MK_BUILD_DIR(rt-c-f-debug, c, [float debug])  #MK_BUILD_DIR(rt-seq-f-debug, c, [float debug])
685  #MK_BUILD_DIR(rt-c-d-debug, c, [double debug])  #MK_BUILD_DIR(rt-seq-d-debug, c, [double debug])
686  #MK_BUILD_DIR(rt-c-f-par, parallel, [parallel float])  #MK_BUILD_DIR(rt-par-f, parallel, [parallel float])
687  #MK_BUILD_DIR(rt-c-d-par, parallel, [parallel double])  #MK_BUILD_DIR(rt-par-d, parallel, [parallel double])
688  #MK_BUILD_DIR(rt-c-f-par-debug, parallel, [parallel float debug])  #MK_BUILD_DIR(rt-par-f-debug, parallel, [parallel float debug])
689  #MK_BUILD_DIR(rt-c-d-par-debug, parallel, [parallel double debug])  #MK_BUILD_DIR(rt-par-d-debug, parallel, [parallel double debug])
690    
691  #if test x"$CL_ENABLED" = xtrue ; then  #if test x"$CL_ENABLED" = xtrue ; then
692  #  MK_BUILD_DIR(rt-cl-f, cl, [float])  #  MK_BUILD_DIR(rt-cl-f, cl, [float])

Legend:
Removed from v.3776  
changed lines
  Added in v.3914

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