--- trunk/OOPSE-3.0/configure	2005/02/14 23:16:48	2022
+++ trunk/OOPSE-3.0/configure	2005/03/04 15:29:03	2081
@@ -312,7 +312,7 @@ ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKA
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PROGNAME debug build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX OOPSE_TEMPLATE_FLAGS EXTRA_CC_FLAG F90 F90FLAGS ac_ct_F90 PREPFLAG PREPDEFFLAG F90LIBS F90_FUNC F90_FUNC_ MOD F90_WORK_FILES_ARG MODDIRFLAG F90MODINCSPEC F90_MODULE_NAMES CPP EGREP LIBOBJS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB YACC LEX LEXLIB LEX_OUTPUT_ROOT AR PS_PATH BSD_PS POSIX_PS MPI_LIB_DIR MPI_INC_DIR MPI_F90_INC MPI_LIB MPI_F90_LIB USE_MPI SPRNG_LIB_DIR SPRNG_INC_DIR SPRNG_LIB USE_SPRNG MKL_LIBDIR MKL_LIB MKL_INC HAVE_MKL DOXYGEN DOT DOC enable_dot enable_html_docs enable_latex_docs BATEXT MKINSTALLDIRS OOPSE OOPSE_HOME SUBDIRS FFLAGS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PROGNAME debug build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX OOPSE_TEMPLATE_FLAGS EXTRA_CC_FLAG F90 F90FLAGS ac_ct_F90 PREPFLAG PREPDEFFLAG F90LIBS F90_FUNC F90_FUNC_ MOD F90_WORK_FILES_ARG MODDIRFLAG F90MODINCSPEC F90_MODULE_NAMES CPP EGREP LIBOBJS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB YACC LEX LEXLIB LEX_OUTPUT_ROOT AR PS MPI_LIB_DIR MPI_INC_DIR MPI_F90_INC MPI_LIB MPI_F90_LIB USE_MPI DOXYGEN DOT DOC enable_dot enable_html_docs enable_latex_docs BATEXT MKINSTALLDIRS OOPSE OOPSE_HOME SUBDIRS FFLAGS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -876,9 +876,6 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-mpi=<prefix>     compile with MPI installed in <prefix> [default=no]
-  --with-sprng=<prefix>   compile with SPRNG installed in <prefix>
-                          [default=/usr/local]
-  --with-mkl              Do we want MKL will check /usr/local/intel/mkl61 /opt/intel/mkl61
 
 Some influential environment variables:
   CC          C compiler command
@@ -3542,7 +3539,7 @@ F90FLAGS="$F90FLAGS $ac_verb"
 ac_save_F90FLAGS=$F90FLAGS
 F90FLAGS="$F90FLAGS $ac_verb"
 
-(eval echo $as_me:3545: \"$ac_link\") >&5
+(eval echo $as_me:3542: \"$ac_link\") >&5
 ac_f90_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
 echo "$ac_f90_v_output" >&5
 F90FLAGS=$ac_save_F90FLAGS
@@ -3619,7 +3616,7 @@ F90FLAGS="$F90FLAGS $ac_cv_prog_f90_v"
 ac_save_F90FLAGS=$F90FLAGS
 F90FLAGS="$F90FLAGS $ac_cv_prog_f90_v"
 
-(eval echo $as_me:3622: \"$ac_link\") >&5
+(eval echo $as_me:3619: \"$ac_link\") >&5
 ac_f90_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
 echo "$ac_f90_v_output" >&5
 F90FLAGS=$ac_save_F90FLAGS
@@ -7259,12 +7256,12 @@ if test "${ac_cv_path_PS_PATH+set}" = set; then
 set dummy ps; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PS_PATH+set}" = set; then
+if test "${ac_cv_path_PS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  case $PS_PATH in
+  case $PS in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_PS_PATH="$PS_PATH" # Let the user override the test with a path.
+  ac_cv_path_PS="$PS" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -7274,7 +7271,7 @@ do
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PS_PATH="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_path_PS="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -7284,41 +7281,71 @@ PS_PATH=$ac_cv_path_PS_PATH
   ;;
 esac
 fi
-PS_PATH=$ac_cv_path_PS_PATH
+PS=$ac_cv_path_PS
 
-if test -n "$PS_PATH"; then
-  echo "$as_me:$LINENO: result: $PS_PATH" >&5
-echo "${ECHO_T}$PS_PATH" >&6
+if test -n "$PS"; then
+  echo "$as_me:$LINENO: result: $PS" >&5
+echo "${ECHO_T}$PS" >&6
 else
   echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:$LINENO: checking for POSIX ps" >&5
-echo $ECHO_N "checking for POSIX ps... $ECHO_C" >&6
-if test "${ac_cv_prog_ps_posix+set}" = set; then
+echo "$as_me:$LINENO: checking for POSIX or BSD ps syntax" >&5
+echo $ECHO_N "checking for POSIX or BSD ps syntax... $ECHO_C" >&6
+if test "${ac_cv_prog_ps_syntax+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-	USER=${USER:-${LOGNAME:-`logname`}}
-	if $PS_PATH -U $USER -opid,args >/dev/null 2>&1; then
-		ac_cv_prog_ps_posix=yes
+	if $PS ax -o rss > /dev/null 2>&1; then
+		ac_cv_prog_ps_ax=yes
 	else
-		ac_cv_prog_ps_posix=no
+		ac_cv_prog_ps_ax=no
 	fi
+	if $PS -ef -o rss > /dev/null 2>&1; then
+		ac_cv_prog_ps_ef=yes
+	else
+		ac_cv_prog_ps_ef=no
+	fi
+	if test "$ac_cv_prog_ps_ax" = yes; then
+		ac_cv_prog_ps_syntax=BSD
+        else
+		if test "$ac_cv_prog_ps_ef" = yes; then
+			ac_cv_prog_ps_syntax=POSIX
+		else
+			{ { echo "$as_me:$LINENO: error: Could not determine ps syntax" >&5
+echo "$as_me: error: Could not determine ps syntax" >&2;}
+   { (exit 1); exit 1; }; }
+		fi
+	fi
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_ps_posix" >&5
-echo "${ECHO_T}$ac_cv_prog_ps_posix" >&6
-if test "$ac_cv_prog_ps_posix" = yes; then
-	BSD_PS=yes
-else
-	POSIX_PS=yes
-fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_ps_syntax" >&5
+echo "${ECHO_T}$ac_cv_prog_ps_syntax" >&6
+
+
+cat >>confdefs.h <<_ACEOF
+#define PSCOMMAND $PS
+_ACEOF
 
 
+if test "$ac_cv_prog_ps_syntax" = BSD; then
+  cat >>confdefs.h <<\_ACEOF
+#define PSTYPE_IS_BSD 1
+_ACEOF
 
+else
+   if test "$ac_cv_prog_ps_syntax" = POSIX; then
+       cat >>confdefs.h <<\_ACEOF
+#define PSTYPE_IS_POSIX 1
+_ACEOF
 
+   else
+       { { echo "$as_me:$LINENO: error: Unknown ps syntax type!" >&5
+echo "$as_me: error: Unknown ps syntax type!" >&2;}
+   { (exit 1); exit 1; }; }
+   fi
+fi
 
 
 # Check whether --with-mpi or --without-mpi was given.
@@ -7785,433 +7812,14 @@ echo "${ECHO_T}found $MPI_F90_LIB" >&6
 fi
 echo "$as_me:$LINENO: result: found $MPI_F90_LIB" >&5
 echo "${ECHO_T}found $MPI_F90_LIB" >&6
-
-
-fi
-
-
-
-# Check whether --with-sprng or --without-sprng was given.
-if test "${with_sprng+set}" = set; then
-  withval="$with_sprng"
-  with_sprng=$withval
-else
-  with_sprng="/usr/local"
-fi;
-
-case "x$with_sprng" in
-        xyes | "x")  USE_SPRNG=yes;;
-        xno) USE_SPRNG=no ;;
-        *) SPRNG="$with_sprng"; USE_SPRNG=yes ;;
-esac
-if test "$USE_SPRNG" = "yes" -a -z "$with_sprng"; then
-        SPRNG="/usr/local"
-fi
-if test "$USE_SPRNG" = "yes"; then
-
-
-# Set variables...
-SPRNG_LIB_DIR="$SPRNG/lib"
-SPRNG_INC_DIR="$SPRNG/include"
-
-
-
-echo "$as_me:$LINENO: checking for sprng.h" >&5
-echo $ECHO_N "checking for sprng.h... $ECHO_C" >&6
-have_sprng_h=0
-echo '#include <sprng.h>' > conftest.cc
-if test -z "`${CXX} -I${SPRNG_INC_DIR} -c conftest.cc 2>&1`"; then
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-        have_sprng_h=1
-else
-        echo "$as_me:$LINENO: result: no! Check SPRNG include path!" >&5
-echo "${ECHO_T}no! Check SPRNG include path!" >&6
-        USE_SPRNG="no"
-fi
-rm -f conftest*
-if test "$have_sprng_h" = 1; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SPRNG_H 1
-_ACEOF
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-ac_save_LDFLAGS=$LDFLAGS
-LDFLAGS="${LDFLAGS} -L${SPRNG_LIB_DIR} "
-
-echo "$as_me:$LINENO: checking for init_rng in -lsprng" >&5
-echo $ECHO_N "checking for init_rng in -lsprng... $ECHO_C" >&6
-if test "${ac_cv_lib_sprng_init_rng+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsprng  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char init_rng ();
-int
-main ()
-{
-init_rng ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_sprng_init_rng=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_sprng_init_rng=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_sprng_init_rng" >&5
-echo "${ECHO_T}$ac_cv_lib_sprng_init_rng" >&6
-if test $ac_cv_lib_sprng_init_rng = yes; then
-  SPRNG_LIB="-lsprng"
-else
-
-             { { echo "$as_me:$LINENO: error: Didn't find libsprng; check path for SPRNG package first..." >&5
-echo "$as_me: error: Didn't find libsprng; check path for SPRNG package first..." >&2;}
-   { (exit 1); exit 1; }; }
-             USE_SPRNG="no"
-
-fi
-
-
-if test "$USE_SPRNG" = "no"; then
-  { { echo "$as_me:$LINENO: error: No working SPRNG library found" >&5
-echo "$as_me: error: No working SPRNG library found" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-fi
-
-
-
-echo "$as_me:$LINENO: checking if MKL is wanted" >&5
-echo $ECHO_N "checking if MKL is wanted... $ECHO_C" >&6
-
-# Check whether --with-mkl or --without-mkl was given.
-if test "${with_mkl+set}" = set; then
-  withval="$with_mkl"
-     echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-    for dir in $withval /usr/local/intel/mkl61 /opt/intel/mkl61; do
-        mkldir="$dir"
-        if test -f "$dir/include/mkl.h"; then
-            found_mkl="yes";
-            break;
-        fi
-    done
-    if test x_$found_mkl != x_yes; then
-        { { echo "$as_me:$LINENO: error: Cannot find MKL includes" >&5
-echo "$as_me: error: Cannot find MKL includes" >&2;}
-   { (exit 1); exit 1; }; }
-    else
-        printf "MKL includes found in $mkldir/include\n";
-    fi
-
-
-
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-  ac_save_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS="${CPPFLAGS} -I${mkldir}/include"
-  ac_save_LDFLAGS=$LDFLAGS
-  LDFLAGS="${LDFLAGS} -L${mkldir}/lib/32 -lmkl -lvml -lguide"
-  if test "${ac_cv_header_mkl_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for mkl.h" >&5
-echo $ECHO_N "checking for mkl.h... $ECHO_C" >&6
-if test "${ac_cv_header_mkl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_mkl_h" >&5
-echo "${ECHO_T}$ac_cv_header_mkl_h" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking mkl.h usability" >&5
-echo $ECHO_N "checking mkl.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <mkl.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking mkl.h presence" >&5
-echo $ECHO_N "checking mkl.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <mkl.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: mkl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: mkl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: mkl.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: mkl.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: mkl.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: mkl.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: mkl.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: mkl.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: mkl.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: mkl.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: mkl.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: mkl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: mkl.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: mkl.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: mkl.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: mkl.h: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------ ##
-## Report this to gezelter@nd.edu ##
-## ------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for mkl.h" >&5
-echo $ECHO_N "checking for mkl.h... $ECHO_C" >&6
-if test "${ac_cv_header_mkl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_mkl_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_mkl_h" >&5
-echo "${ECHO_T}$ac_cv_header_mkl_h" >&6
 
-fi
-if test $ac_cv_header_mkl_h = yes; then
 
-    echo "$as_me:$LINENO: checking for vslNewStream in -lmkl" >&5
-echo $ECHO_N "checking for vslNewStream in -lmkl... $ECHO_C" >&6
-if test "${ac_cv_lib_mkl_vslNewStream+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmkl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char vslNewStream ();
-int
-main ()
-{
-vslNewStream ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_mkl_vslNewStream=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_mkl_vslNewStream=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_mkl_vslNewStream" >&5
-echo "${ECHO_T}$ac_cv_lib_mkl_vslNewStream" >&6
-if test $ac_cv_lib_mkl_vslNewStream = yes; then
-  MKL_LIBDIR="${mkldir}/lib/32",
-                     MKL_LIB="-lmkl -lvml -lguide",
-                     HAVE_MKL="yes"
-fi
 
 
-else
-  MKL_INC="-I${mkldir}/include"
-fi
 
 
-  CPPFLAGS=$ac_save_CPPFLAGS
-  LDFLAGS=$ac_save_LDFLAGS
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-
-  if test x_$HAVE_MKL != x_yes; then
-        { { echo "$as_me:$LINENO: error: Can't build with MKL" >&5
-echo "$as_me: error: Can't build with MKL" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-
-
-
-
-
-else
-
-    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
-fi;
-
-
-
 # Check whether --enable-doxygen or --disable-doxygen was given.
 if test "${enable_doxygen+set}" = set; then
   enableval="$enable_doxygen"
@@ -9082,23 +8690,13 @@ s,@PS_PATH@,$PS_PATH,;t t
 s,@LEXLIB@,$LEXLIB,;t t
 s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
 s,@AR@,$AR,;t t
-s,@PS_PATH@,$PS_PATH,;t t
-s,@BSD_PS@,$BSD_PS,;t t
-s,@POSIX_PS@,$POSIX_PS,;t t
+s,@PS@,$PS,;t t
 s,@MPI_LIB_DIR@,$MPI_LIB_DIR,;t t
 s,@MPI_INC_DIR@,$MPI_INC_DIR,;t t
 s,@MPI_F90_INC@,$MPI_F90_INC,;t t
 s,@MPI_LIB@,$MPI_LIB,;t t
 s,@MPI_F90_LIB@,$MPI_F90_LIB,;t t
 s,@USE_MPI@,$USE_MPI,;t t
-s,@SPRNG_LIB_DIR@,$SPRNG_LIB_DIR,;t t
-s,@SPRNG_INC_DIR@,$SPRNG_INC_DIR,;t t
-s,@SPRNG_LIB@,$SPRNG_LIB,;t t
-s,@USE_SPRNG@,$USE_SPRNG,;t t
-s,@MKL_LIBDIR@,$MKL_LIBDIR,;t t
-s,@MKL_LIB@,$MKL_LIB,;t t
-s,@MKL_INC@,$MKL_INC,;t t
-s,@HAVE_MKL@,$HAVE_MKL,;t t
 s,@DOXYGEN@,$DOXYGEN,;t t
 s,@DOT@,$DOT,;t t
 s,@DOC@,$DOC,;t t