Ignore:
Timestamp:
Dec 11, 2014 11:11:42 AM (6 years ago)
Author:
gah
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/r9/configure.in

    r4212 r4840  
    1414    exec_prefix=$prefix
    1515fi
     16
     17AC_PROG_INSTALL
     18AC_PROG_INSTALL
     19AC_PROG_RANLIB
     20AC_PROG_LN_S
     21AC_PROG_MKDIR_P
     22AC_PROG_MAKE_SET
     23
     24# Check for C, C++, and FORTRAN
     25AC_PROG_CC
     26AC_PROG_CXX
     27# Avoid g95
     28AC_PROG_F77([g77 gfortran f77 fort77 f90 xlf xlf90 fl32])
     29
     30AC_LANG([C])
     31
     32AC_HEADER_STDC
     33AC_CHECK_FUNC(atol,,AC_MSG_ERROR(oops! no atol ?!?))
     34
     35AC_LANG([C++])
     36AC_PATH_X
    1637
    1738AC_ARG_WITH(
     
    2849fi
    2950
    30 
    3151if test "${libdir}" != "${prefix}/lib"; then
    3252    LIB_SEARCH_DIRS="-L${prefix}/lib -L${libdir}"
     
    3555fi
    3656
    37 
    38 AC_PROG_INSTALL
    39 AC_PROG_INSTALL
    40 AC_PROG_RANLIB
    41 AC_PROG_LN_S
    42 AC_PROG_MKDIR_P
    43 AC_PROG_MAKE_SET
    44 
    45 # Check for C, C++, and FORTRAN
    46 AC_PROG_CC
    47 AC_PROG_CXX
    48 # Avoid g95
    49 AC_PROG_F77([g77 gfortran f77 fort77 f90 xlf xlf90 fl32])
    50 
    51 AC_LANG([C])
    52 
    53 AC_HEADER_STDC
    54 AC_CHECK_FUNC(atol,,AC_MSG_ERROR(oops! no atol ?!?))
    55 
    56 AC_LANG([C++])
     57AC_ARG_WITH(
     58    [statsdir],
     59    [AS_HELP_STRING([--with-statsdir=DIR],
     60        [Write statistics in DIR])],
     61    [STATSDIR=$withval],
     62    [STATSDIR="/var/tmp/visservers"])
     63
    5764
    5865AC_CHECK_FUNCS(sysinfo)
     
    160167    [],
    161168    [with_ffmpeg=yes])
    162 
    163 AC_ARG_WITH(
    164     [tclsh],
    165     [AS_HELP_STRING([--with-tclsh[=DIR]],
    166         [location of tclsh @<:@default=yes@:>@])],
    167     [],
    168     [with_tclsh=yes])
    169 
    170 TCLSH=""
    171 if test "${with_tclsh}" != "no" ; then
    172   tclsh="tclsh${TCL_VERSION}"
    173   if test "${with_tclsh}" = "yes" ; then
    174     AC_PATH_PROG(TCLSH, ${tclsh}, [], [${exec_prefix}/bin:${PATH}])
    175   else
    176     AC_PATH_PROG(TCLSH, ${tclsh}, [], [${with_tclsh}/bin:${with_tclsh}])
    177   fi
    178   if test "x${TCLSH}" = "x" ; then
    179     AC_ERROR([can't find tclsh])
    180   fi
    181 fi
    182 
    183169
    184170TCL_INC_SPEC="$TCL_INCLUDE_SPEC"
     
    440426AC_SUBST(SIZEOF_VOID_P)
    441427AC_SUBST(STLIB_LD)
    442 AC_SUBST(TCLSH)
    443428AC_SUBST(TCL_INC_SPEC)
    444429AC_SUBST(TCL_LIB_SPEC)
     
    463448AC_SUBST(VTK_VERSION)
    464449AC_SUBST(XSUBPP)
     450AC_SUBST(STATSDIR)
     451AC_SUBST(X_INCLUDES)
     452AC_SUBST(X_LIBRARIES)
     453AC_SUBST(WORDSIZE)
    465454
    466455ac_configure_args="--disable-threads --enable-shared"
Note: See TracChangeset for help on using the changeset viewer.