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 5500, Mon Nov 13 16:45:15 2017 UTC revision 5513, Mon Nov 20 16:31:01 2017 UTC
# Line 66  Line 66 
66  AC_PROG_INSTALL  AC_PROG_INSTALL
67  AC_PROG_MAKE_SET  AC_PROG_MAKE_SET
68    
 dnl FIXME: this works for now, but we should probably switch to libtool  
 dnl  
 AC_PATH_PROG(LD, [ld], [none])  
 if test x$LD = xnone ; then  
   AC_MSG_ERROR([cannot find ld command])  
 fi  
 AC_SUBST(LD)  
   
69  dnl extra compiler options  dnl extra compiler options
70  dnl  dnl
71  CXXFLAGS_BASE="-Wreturn-type -Wuninitialized"  CXXFLAGS_BASE="-Wreturn-type -Wuninitialized"
# Line 257  Line 249 
249  AC_CHECK_FUNCS([sched_getcpu])  AC_CHECK_FUNCS([sched_getcpu])
250  fi  fi
251    
252    #################### Linking configuration ####################
253    
254    dnl FIXME: this works for now, but we should probably switch to libtool
255    dnl
256    AC_PATH_PROG(LD, [ld], [none])
257    if test x$LD = xnone ; then
258      AC_MSG_ERROR([cannot find ld command])
259    fi
260    AC_SUBST(LD)
261    
262  dnl  dnl
263  dnl OS-specific linking issues  dnl OS-specific linking issues
264  dnl  dnl
# Line 276  Line 278 
278      if test -d /usr/local/Cellar -a /usr/local/bin/brew ; then      if test -d /usr/local/Cellar -a /usr/local/bin/brew ; then
279        LDPATHS="-L/usr/local/lib $LDPATHS"        LDPATHS="-L/usr/local/lib $LDPATHS"
280      fi      fi
281        DSLEXT="dylib"
282        LD_STATIC=$LD
283        LD_DYNAMIC="$CXX -dynamiclib"
284    ;;    ;;
285    linux*)    linux*)
286    # On Linux we include the -rpath option to pick up dynamically-loaded libraries    # On Linux we include the -rpath option to pick up dynamically-loaded libraries
# Line 283  Line 288 
288      LD_NEEDS_RPATH=true      LD_NEEDS_RPATH=true
289      LDFLAG_LIBM="-lm"      LDFLAG_LIBM="-lm"
290      CXXFLAG_fPIC="-fPIC"      CXXFLAG_fPIC="-fPIC"
291        DSLEXT="so"
292        LD_STATIC=$LD
293        LD_DYNAMIC="$CXX -shared"
294    ;;    ;;
295  esac  esac
296    
297    AC_SUBST(LD_STATIC)
298    AC_SUBST(LD_DYNAMIC)
299  AC_SUBST(LDPATHS)  AC_SUBST(LDPATHS)
300  AC_SUBST(LD_NEEDS_RPATH)  AC_SUBST(LD_NEEDS_RPATH)
301  AC_SUBST(LDFLAG_LIBM)  AC_SUBST(LDFLAG_LIBM)
302  AC_SUBST(CXXFLAG_fPIC)  AC_SUBST(CXXFLAG_fPIC)
303    AC_SUBST(DSLEXT)
304    
305    #################### end Linking configuration ####################
306    
307  #################### Logging configuration ####################  #################### Logging configuration ####################
308    

Legend:
Removed from v.5500  
changed lines
  Added in v.5513

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