Changeset 4840 for branches/r9/configure.in

Timestamp:

Dec 11, 2014 11:11:42 AM (9 years ago)

Author:

gah

Message:

 

File:

• branches/r9/configure.in (modified) (6 diffs)

branches/r9/configure.in

@@ -14 +14 @@
     exec_prefix=$prefix
 fi
+
+AC_PROG_INSTALL
+AC_PROG_INSTALL
+AC_PROG_RANLIB
+AC_PROG_LN_S
+AC_PROG_MKDIR_P
+AC_PROG_MAKE_SET
+
+# Check for C, C++, and FORTRAN 
+AC_PROG_CC
+AC_PROG_CXX
+# Avoid g95 
+AC_PROG_F77([g77 gfortran f77 fort77 f90 xlf xlf90 fl32])
+
+AC_LANG([C])
+
+AC_HEADER_STDC
+AC_CHECK_FUNC(atol,,AC_MSG_ERROR(oops! no atol ?!?))
+
+AC_LANG([C++])
+AC_PATH_X
 
 AC_ARG_WITH(
@@ -28 +49 @@
 fi
 
-
 if test "${libdir}" != "${prefix}/lib"; then
     LIB_SEARCH_DIRS="-L${prefix}/lib -L${libdir}"
@@ -35 +55 @@
 fi
 
-
-AC_PROG_INSTALL
-AC_PROG_INSTALL
-AC_PROG_RANLIB
-AC_PROG_LN_S
-AC_PROG_MKDIR_P
-AC_PROG_MAKE_SET
-
-# Check for C, C++, and FORTRAN 
-AC_PROG_CC
-AC_PROG_CXX
-# Avoid g95 
-AC_PROG_F77([g77 gfortran f77 fort77 f90 xlf xlf90 fl32])
-
-AC_LANG([C])
-
-AC_HEADER_STDC
-AC_CHECK_FUNC(atol,,AC_MSG_ERROR(oops! no atol ?!?))
-
-AC_LANG([C++])
+AC_ARG_WITH(
+    [statsdir],
+    [AS_HELP_STRING([--with-statsdir=DIR],
+        [Write statistics in DIR])],
+    [STATSDIR=$withval],
+    [STATSDIR="/var/tmp/visservers"])
+
 
 AC_CHECK_FUNCS(sysinfo)
@@ -160 +167 @@
     [],
     [with_ffmpeg=yes])
-
-AC_ARG_WITH(
-    [tclsh],
-    [AS_HELP_STRING([--with-tclsh[=DIR]],
-        [location of tclsh @<:@default=yes@:>@])],
-    [],
-    [with_tclsh=yes])
-
-TCLSH=""
-if test "${with_tclsh}" != "no" ; then
-  tclsh="tclsh${TCL_VERSION}"
-  if test "${with_tclsh}" = "yes" ; then 
-    AC_PATH_PROG(TCLSH, ${tclsh}, [], [${exec_prefix}/bin:${PATH}])
-  else 
-    AC_PATH_PROG(TCLSH, ${tclsh}, [], [${with_tclsh}/bin:${with_tclsh}])
-  fi
-  if test "x${TCLSH}" = "x" ; then
-    AC_ERROR([can't find tclsh])
-  fi
-fi
-
 
 TCL_INC_SPEC="$TCL_INCLUDE_SPEC"
@@ -440 +426 @@
 AC_SUBST(SIZEOF_VOID_P)
 AC_SUBST(STLIB_LD)
-AC_SUBST(TCLSH)
 AC_SUBST(TCL_INC_SPEC)
 AC_SUBST(TCL_LIB_SPEC)
@@ -463 +448 @@
 AC_SUBST(VTK_VERSION)
 AC_SUBST(XSUBPP)
+AC_SUBST(STATSDIR)
+AC_SUBST(X_INCLUDES)
+AC_SUBST(X_LIBRARIES)
+AC_SUBST(WORDSIZE)
 
 ac_configure_args="--disable-threads --enable-shared"