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 3815, Wed May 4 15:06:28 2016 UTC revision 3816, Wed May 4 16:34:21 2016 UTC
# Line 578  Line 578 
578  dnl  dnl
579  dnl ******************** config.h stuff ********************  dnl ******************** config.h stuff ********************
580  dnl  dnl
581    dnl We generate the header info as a fragment that then gets directly included in the
582  AC_DEFINE_UNQUOTED(DIDEROT_INCLUDE_PATH,["$DIDEROT_SRCDIR/include"], [path for Diderot header files])  dnl C/C++ code produced by the compiler
583    dnl
584    
585  AH_TOP([  AH_TOP([
586  /*  /******************** BEGIN CONFIGURATION ********************/
  * This code is part of the Diderot Project (http://diderot-language.cs.uchicago.edu)  
  *  
  * COPYRIGHT (c) 2015 The University of Chicago * All rights reserved.  
  */  
   
 #ifndef _DIDEROT_CONFIG_H_  
 #define _DIDEROT_CONFIG_H_  
   
587  ])  ])
588  AH_BOTTOM([  AH_BOTTOM([
589    /******************** END CONFIGURATION ********************/
 #ifdef NDEBUG  
 #define STATIC_INLINE   static inline  
 #else  
 #define STATIC_INLINE   static  
 #endif  
   
 #endif /* !_DIDEROT_CONFIG_H_ */  
590  ])  ])
591    
592  dnl  dnl
# Line 638  Line 624 
624    src/compiler/options/version.sml:src/compiler/options/version_sml.in    src/compiler/options/version.sml:src/compiler/options/version_sml.in
625  )  )
626    
627  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)
628    
629  dnl  dnl
630  dnl shell scripts  dnl shell scripts
# Line 649  Line 635 
635  AC_CONFIG_FILES([  AC_CONFIG_FILES([
636    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
637  ], [chmod +x src/compiler/gen/fragments/mkfrags.sh])  ], [chmod +x src/compiler/gen/fragments/mkfrags.sh])
638    AC_CONFIG_FILES([
639      src/compiler/gen/fragments/mkmk.sh:src/compiler/gen/fragments/mkmk_sh.in
640    ], [chmod +x src/compiler/gen/fragments/mkmk.sh])
641  # AC_CONFIG_FILES([  # AC_CONFIG_FILES([
642  #   rtest/scripts/run.sh:rtest/scripts/run_sh.in  #   rtest/scripts/run.sh:rtest/scripts/run_sh.in
643  # ], [chmod +x rtest/scripts/run.sh])  # ], [chmod +x rtest/scripts/run.sh])
# Line 682  Line 671 
671      AC_CONFIG_FILES(src/lib/build/$1/Makefile)      AC_CONFIG_FILES(src/lib/build/$1/Makefile)
672    ])    ])
673    
674  #MK_BUILD_DIR(rt-c-f, c, [float])  #MK_BUILD_DIR(rt-seq-f, c, [float])
675  #MK_BUILD_DIR(rt-c-d, c, [double])  #MK_BUILD_DIR(rt-seq-d, c, [double])
676  #MK_BUILD_DIR(rt-c-f-debug, c, [float debug])  #MK_BUILD_DIR(rt-seq-f-debug, c, [float debug])
677  #MK_BUILD_DIR(rt-c-d-debug, c, [double debug])  #MK_BUILD_DIR(rt-seq-d-debug, c, [double debug])
678  #MK_BUILD_DIR(rt-c-f-par, parallel, [parallel float])  #MK_BUILD_DIR(rt-par-f, parallel, [parallel float])
679  #MK_BUILD_DIR(rt-c-d-par, parallel, [parallel double])  #MK_BUILD_DIR(rt-par-d, parallel, [parallel double])
680  #MK_BUILD_DIR(rt-c-f-par-debug, parallel, [parallel float debug])  #MK_BUILD_DIR(rt-par-f-debug, parallel, [parallel float debug])
681  #MK_BUILD_DIR(rt-c-d-par-debug, parallel, [parallel double debug])  #MK_BUILD_DIR(rt-par-d-debug, parallel, [parallel double debug])
682    
683  #if test x"$CL_ENABLED" = xtrue ; then  #if test x"$CL_ENABLED" = xtrue ; then
684  #  MK_BUILD_DIR(rt-cl-f, cl, [float])  #  MK_BUILD_DIR(rt-cl-f, cl, [float])

Legend:
Removed from v.3815  
changed lines
  Added in v.3816

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