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

SCM Repository

[diderot] Diff of /branches/pure-cfg/configure.ac
ViewVC logotype

Diff of /branches/pure-cfg/configure.ac

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

revision 671, Wed Mar 23 15:47:23 2011 UTC revision 997, Wed Apr 27 17:33:05 2011 UTC
# Line 21  Line 21 
21  sinclude(config/check_smlnj.m4)  sinclude(config/check_smlnj.m4)
22  sinclude(config/check_smlnj_heap_suffix.m4)  sinclude(config/check_smlnj_heap_suffix.m4)
23    
   
24  dnl  dnl
25  dnl get host information  dnl get host information
26  dnl  dnl
# Line 46  Line 45 
45  CFLAGS="$CFLAGS -Wformat -Wreturn-type -Wuninitialized"  CFLAGS="$CFLAGS -Wformat -Wreturn-type -Wuninitialized"
46    
47  dnl  dnl
48  dnl If we are on Mac OS X, check for the presence of macports and/or fink  dnl Look for NVIDIA's nvcc compiler
49    dnl
50    AC_MSG_CHECKING([for CUDA and nvcc])
51    AC_PATH_PROG(NVCC, nvcc, ":", $PATH)
52    if test $NVCC = none ; then
53      AC_MSG_WARN([nvcc not found])
54    else
55      AC_MSG_RESULT([$NVCC])
56    fi
57    AC_SUBST(NVCC)
58    
59    dnl
60    dnl check for pthreads support
61    dnl
62    ACX_PTHREAD()
63    
64  dnl  dnl
65    dnl OS-specific linking issues
66    dnl
67    LD_NEEDS_RPATH=false;
68    LIBM=""
69  case "$host_os" in  case "$host_os" in
70    darwin*) # On Mac OS X we check for installed frameworks    darwin*) # On Mac OS X we check for the presence of macports and/or fink
71      if test -x /opt/local/bin/port ; then      if test -x /opt/local/bin/port ; then
72        HAS_MACPORTS=yes        HAS_MACPORTS=yes
73      else      else
# Line 61  Line 79 
79        HAS_FINK=no        HAS_FINK=no
80      fi      fi
81    ;;    ;;
82      linux) # On Linux we include the -rpath option to pick up dynamically-loaded libraries
83        LD_NEEDS_RPATH=true
84        LIBM="-lm"
85      ;;
86  esac  esac
87    
88  if test x"$HAS_MACPORTS" = xyes ; then  if test x"$HAS_MACPORTS" = xyes ; then
# Line 71  Line 93 
93    LDPATHS=""    LDPATHS=""
94  fi  fi
95  AC_SUBST(LDPATHS)  AC_SUBST(LDPATHS)
96    AC_SUBST(LD_NEEDS_RPATH)
97    AC_SUBST(LIBM)
98    
99  dnl  dnl
100  dnl get the path to the TEEM installation  dnl get the path to the TEEM installation

Legend:
Removed from v.671  
changed lines
  Added in v.997

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