ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-3.0/configure
(Generate patch)

Comparing trunk/OOPSE-3.0/configure (file contents):
Revision 1490 by gezelter, Fri Sep 24 04:16:43 2004 UTC vs.
Revision 2190 by gezelter, Wed Apr 13 22:30:22 2005 UTC

# Line 1 | Line 1
1   #! /bin/sh
2   # Guess values for system-dependent variables and create Makefiles.
3 < # Generated by GNU Autoconf 2.59 for OOPSE 1.0.
3 > # Generated by GNU Autoconf 2.59 for OOPSE 2.0.
4   #
5   # Report bugs to <gezelter@nd.edu>.
6   #
# Line 269 | Line 269 | PACKAGE_VERSION='1.0'
269   # Identity of this package.
270   PACKAGE_NAME='OOPSE'
271   PACKAGE_TARNAME='oopse'
272 < PACKAGE_VERSION='1.0'
273 < PACKAGE_STRING='OOPSE 1.0'
272 > PACKAGE_VERSION='2.0'
273 > PACKAGE_STRING='OOPSE 2.0'
274   PACKAGE_BUGREPORT='gezelter@nd.edu'
275  
276 < ac_unique_file="src/oopse.cpp"
276 > ac_unique_file="src/applications/oopse/oopse.cpp"
277   ac_default_prefix="/usr/local"
278   # Factoring default headers for most tests.
279   ac_includes_default="\
# Line 312 | Line 312 | ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKA
312   # include <unistd.h>
313   #endif"
314  
315 < 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 CPP EGREP LIBOBJS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB YACC LEX LEXLIB LEX_OUTPUT_ROOT AR 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 BATEXT MKINSTALLDIRS OOPSE OOPSE_HOME SUBDIRS FFLAGS LTLIBOBJS'
315 > 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 CXXCPP USE_CGAL CGAL_INC_DIR CGAL_LIB_DIR CGAL_RLIB_DIR CGAL_DEFINES CGAL_CXXFLAGS CGAL_LIBS DOXYGEN DOT DOC enable_dot enable_html_docs enable_latex_docs BATEXT MKINSTALLDIRS OOPSE OOPSE_HOME SUBDIRS FFLAGS LTLIBOBJS'
316   ac_subst_files=''
317  
318   # Initialize some variables set by options.
# Line 789 | Line 789 | ac_cv_env_CPP_value=$CPP
789   ac_env_CPP_value=$CPP
790   ac_cv_env_CPP_set=${CPP+set}
791   ac_cv_env_CPP_value=$CPP
792 + ac_env_CXXCPP_set=${CXXCPP+set}
793 + ac_env_CXXCPP_value=$CXXCPP
794 + ac_cv_env_CXXCPP_set=${CXXCPP+set}
795 + ac_cv_env_CXXCPP_value=$CXXCPP
796  
797   #
798   # Report the --help message.
# Line 797 | Line 801 | if test "$ac_init_help" = "long"; then
801    # Omit some internal or obsolete options to make the list less imposing.
802    # This message is too long to be a string in the A/UX 3.1 sh.
803    cat <<_ACEOF
804 < \`configure' configures OOPSE 1.0 to adapt to many kinds of systems.
804 > \`configure' configures OOPSE 2.0 to adapt to many kinds of systems.
805  
806   Usage: $0 [OPTION]... [VAR=VALUE]...
807  
# Line 858 | Line 862 | if test -n "$ac_init_help"; then
862  
863   if test -n "$ac_init_help"; then
864    case $ac_init_help in
865 <     short | recursive ) echo "Configuration of OOPSE 1.0:";;
865 >     short | recursive ) echo "Configuration of OOPSE 2.0:";;
866     esac
867    cat <<\_ACEOF
868  
# Line 866 | Line 870 | Optional Features:
870    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
871    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
872    --enable-debug          Compile OOPSE in debug mode
873 +  --enable-doxygen        enable documentation generation with doxygen (auto)
874 +  --enable-dot            use 'dot' to generate graphs in doxygen (auto)
875 +  --enable-html-docs      enable HTML generation with doxygen (yes)
876 +  --enable-latex-docs     enable LaTeX documentation generation with doxygen (no)
877    --enable-oopse-home=DIR      define oopse home dir PREFIX/oopse
878  
879   Optional Packages:
880    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
881    --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
882    --with-mpi=<prefix>     compile with MPI installed in <prefix> [default=no]
883 <  --with-sprng=<prefix>   compile with SPRNG installed in <prefix>
876 <                          [default=/usr/local]
877 <  --with-mkl              Do we want MKL will check /usr/local/intel/mkl61 /opt/intel/mkl61
883 >  --with-cgal-makefile=FILE  CGAL makefile that should be used
884  
885   Some influential environment variables:
886    CC          C compiler command
# Line 888 | Line 894 | Some influential environment variables:
894    F90         Fortran 90 compiler command
895    F90FLAGS    Fortran 90 compiler flags
896    CPP         C preprocessor
897 +  CXXCPP      C++ preprocessor
898  
899   Use these variables to override the choices made by `configure' or to help
900   it to find libraries and programs with nonstandard names/locations.
# Line 988 | Line 995 | OOPSE configure 1.0
995   test -n "$ac_init_help" && exit 0
996   if $ac_init_version; then
997    cat <<\_ACEOF
998 < OOPSE configure 1.0
998 > OOPSE configure 2.0
999   generated by GNU Autoconf 2.59
1000  
1001   Copyright (C) 2003 Free Software Foundation, Inc.
# Line 1002 | Line 1009 | It was created by OOPSE $as_me 1.0, which was
1009   This file contains any messages produced by compilers while
1010   running configure, to aid debugging if configure makes a mistake.
1011  
1012 < It was created by OOPSE $as_me 1.0, which was
1012 > It was created by OOPSE $as_me 2.0, which was
1013   generated by GNU Autoconf 2.59.  Invocation command line was
1014  
1015    $ $0 $@
# Line 1813 | Line 1820 | ac_configure="$SHELL $ac_aux_dir/configure" # This sho
1820   # $SHELLVAR to the Fortran 95 mangled name.  If the SHELLVAR
1821   # argument is not supplied, it defaults to NAME.
1822   # AC_F95_FUNC
1823 +
1824 + # AC_F90_MODULE_NAMES
1825 + # -------------------
1826 + #
1827 + # Figure out how the Fortran 90 compiler constructs module file names
1828 + #
1829 + # AC_F90_MODULE_NAMES
1830 +
1831 +
1832 +
1833  
1834  
1835  
# Line 1868 | Line 1885 | ac_configure="$SHELL $ac_aux_dir/configure" # This sho
1885  
1886  
1887  
1888 +
1889 +
1890   # set program name
1891   PROGNAME="oopse"
1892  
# Line 1944 | Line 1963 | host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\
1963   host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
1964   host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
1965   host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
1966 +
1967 +
1968  
1969  
1970  
# Line 3525 | Line 3546 | F90FLAGS="$F90FLAGS $ac_verb"
3546   ac_save_F90FLAGS=$F90FLAGS
3547   F90FLAGS="$F90FLAGS $ac_verb"
3548  
3549 < (eval echo $as_me:3528: \"$ac_link\") >&5
3549 > (eval echo $as_me:3549: \"$ac_link\") >&5
3550   ac_f90_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
3551   echo "$ac_f90_v_output" >&5
3552   F90FLAGS=$ac_save_F90FLAGS
# Line 3602 | Line 3623 | F90FLAGS="$F90FLAGS $ac_cv_prog_f90_v"
3623   ac_save_F90FLAGS=$F90FLAGS
3624   F90FLAGS="$F90FLAGS $ac_cv_prog_f90_v"
3625  
3626 < (eval echo $as_me:3605: \"$ac_link\") >&5
3626 > (eval echo $as_me:3626: \"$ac_link\") >&5
3627   ac_f90_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
3628   echo "$ac_f90_v_output" >&5
3629   F90FLAGS=$ac_save_F90FLAGS
# Line 4197 | Line 4218 | fi
4218  
4219     rm -f conftest* conf/conftest* conf/CONFTEST* CONFTEST* conf/mpimod*
4220     if test $madedir = 1 ; then rmdir conf ; fi
4221 + fi
4222 +
4223 +
4224 + echo "$as_me:$LINENO: checking for Fortran 90 module file names" >&5
4225 + echo $ECHO_N "checking for Fortran 90 module file names... $ECHO_C" >&6
4226 + if test "${ac_cv_f90_module_names+set}" = set; then
4227 +  echo $ECHO_N "(cached) $ECHO_C" >&6
4228 + else
4229 +  ac_ext=f90
4230 + ac_compile='$F90 -c $F90FLAGS conftest.$ac_ext >&5'
4231 + ac_link='$F90 -o conftest$ac_exeext $F90FLAGS $LD90FLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4232 + ac_compiler_gnu=$ac_cv_f90_compiler_gnu
4233 +
4234 + # carry out the test in a new directory, so that we don't miss anything
4235 + mkdir conftest
4236 + cd conftest
4237 + cat >conftest.$ac_ext <<_ACEOF
4238 + MODULE Bar
4239 + END MODULE Bar
4240 + _ACEOF
4241 + rm -f conftest.$ac_objext
4242 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4243 +  (eval $ac_compile) 2>conftest.er1
4244 +  ac_status=$?
4245 +  grep -v '^ *+' conftest.er1 >conftest.err
4246 +  rm -f conftest.er1
4247 +  cat conftest.err >&5
4248 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4249 +  (exit $ac_status); } &&
4250 +         { ac_try='test -z "$ac_f90_werror_flag"
4251 +                         || test ! -s conftest.err'
4252 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4253 +  (eval $ac_try) 2>&5
4254 +  ac_status=$?
4255 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4256 +  (exit $ac_status); }; } &&
4257 +         { ac_try='test -s conftest.$ac_objext'
4258 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4259 +  (eval $ac_try) 2>&5
4260 +  ac_status=$?
4261 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4262 +  (exit $ac_status); }; }; then
4263 +  ac_cv_f90_module_names=
4264 + ac_file_list=*
4265 + for ac_file in $ac_file_list; do
4266 +   case $ac_file in
4267 +      # don't care for original source and object files
4268 +      conftest.$ac_ext | conftest.$ac_objext | conftest.err )
4269 +          :
4270 +          ;;
4271 +      # look for new files derived from the file name
4272 +      *conftest*)
4273 +          ac_pat=`echo $ac_file | sed s/conftest/%FILE%/`
4274 +            ac_exists=false
4275 +  for ac_i in $ac_cv_f90_module_names; do
4276 +    if test x"$ac_pat" = x"$ac_i"; then
4277 +      ac_exists=true
4278 +      break
4279 +    fi
4280 +  done
4281 +
4282 +  if test x"$ac_exists" = xtrue; then
4283 +  :
4284 + else
4285 +  ac_cv_f90_module_names="$ac_cv_f90_module_names $ac_pat"
4286 + fi
4287 +
4288 +          ;;
4289 +      # look for new files derived from the module name,
4290 +      # with different case translation schemes
4291 +      *Bar*)
4292 +          ac_pat=`echo $ac_file | sed s/Bar/%Module%/`
4293 +            ac_exists=false
4294 +  for ac_i in $ac_cv_f90_module_names; do
4295 +    if test x"$ac_pat" = x"$ac_i"; then
4296 +      ac_exists=true
4297 +      break
4298 +    fi
4299 +  done
4300 +
4301 +  if test x"$ac_exists" = xtrue; then
4302 +  :
4303 + else
4304 +  ac_cv_f90_module_names="$ac_cv_f90_module_names $ac_pat"
4305 + fi
4306 +
4307 +          ;;
4308 +      *bar*)
4309 +          ac_pat=`echo $ac_file | sed s/bar/%module%/`
4310 +            ac_exists=false
4311 +  for ac_i in $ac_cv_f90_module_names; do
4312 +    if test x"$ac_pat" = x"$ac_i"; then
4313 +      ac_exists=true
4314 +      break
4315 +    fi
4316 +  done
4317 +
4318 +  if test x"$ac_exists" = xtrue; then
4319 +  :
4320 + else
4321 +  ac_cv_f90_module_names="$ac_cv_f90_module_names $ac_pat"
4322 + fi
4323 +
4324 +          ;;
4325 +      *BAR*)
4326 +          ac_pat=`echo $ac_file | sed s/BAR/%MODULE%/`
4327 +            ac_exists=false
4328 +  for ac_i in $ac_cv_f90_module_names; do
4329 +    if test x"$ac_pat" = x"$ac_i"; then
4330 +      ac_exists=true
4331 +      break
4332 +    fi
4333 +  done
4334 +
4335 +  if test x"$ac_exists" = xtrue; then
4336 +  :
4337 + else
4338 +  ac_cv_f90_module_names="$ac_cv_f90_module_names $ac_pat"
4339 + fi
4340 +
4341 +          ;;
4342 +       # Other files - we have no idea how they are generated
4343 +       *)
4344 +          { echo "$as_me:$LINENO: WARNING: Bogus file found: $ac_file" >&5
4345 + echo "$as_me: WARNING: Bogus file found: $ac_file" >&2;}
4346 +          ;;
4347 +   esac
4348 + done
4349 + if test "x$ac_cv_f90_module_names" = "x"; then
4350 +  { echo "$as_me:$LINENO: WARNING: Couldn't determine module file names" >&5
4351 + echo "$as_me: WARNING: Couldn't determine module file names" >&2;}
4352 + fi
4353 +
4354 + else
4355 +  echo "$as_me: failed program was:" >&5
4356 + sed 's/^/| /' conftest.$ac_ext >&5
4357 +
4358 + ac_cv_f90_module_names=
4359 + { echo "$as_me:$LINENO: WARNING: Couldn't determine module file names" >&5
4360 + echo "$as_me: WARNING: Couldn't determine module file names" >&2;}
4361 + fi
4362 + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
4363 + cd ..
4364 + # cleanup
4365 + rm -rf conftest
4366 + ac_ext=f90
4367 + ac_compile='$F90 -c $F90FLAGS conftest.$ac_ext >&5'
4368 + ac_link='$F90 -o conftest$ac_exeext $F90FLAGS $LD90FLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4369 + ac_compiler_gnu=$ac_cv_f90_compiler_gnu
4370 +
4371 + fi
4372 + echo "$as_me:$LINENO: result: $ac_cv_f90_module_names" >&5
4373 + echo "${ECHO_T}$ac_cv_f90_module_names" >&6 # AC_CACHE_CHECK
4374 +
4375 + # We now generate a shell script that will help us to figure out the correct
4376 + # module file names, using the value of ac_cv_f90_module_names
4377 +
4378 + echo "Generating shell script modnam"
4379 +
4380 + cat > scripts/modnam << EOF
4381 + #! /bin/sh
4382 + # This script is auto-generated by configure
4383 + #
4384 + usage="\\
4385 + Usage: \$0 [FILES]
4386 +
4387 + [FILES] are Fortran 90 source files.
4388 + The output is a list of module file names that the Fortran 90 compiler
4389 + generates when compiling [FILES]."
4390 +
4391 + list=
4392 + empty=
4393 +
4394 + if test \$# -eq 0; then
4395 +   echo "\$usage"; exit 0
4396   fi
4397  
4398 + while test \$# != 0; do
4399 +
4400 +  file=\$1
4401 +  shift
4402 +
4403 + # strip suffix
4404 +  base=\`echo \$file | sed 's/[.][^.]*$//'\`
4405 +
4406 +  test ! -f \$file && continue
4407 +
4408 + # Look for module definitions and transform them to upper / lower case
4409 +  mods=\`cat \$file | sed '/^ *[mM][oO][dD][uU][lL][eE]/!d;s/^ *[mM][oO][dD][uU][lL][eE] *\([A-Za-z_][A-Za-z0-9_]*\).*\$/\1/'\`
4410 +  upper=\`echo \$mods | tr a-z A-Z\`
4411 +  lower=\`echo \$mods | tr A-Z a-z\`
4412 +
4413 + # Here, the patterns for generating module file names were inserted by configure
4414 +  for trans in $ac_cv_f90_module_names; do
4415 +
4416 +    pat=\`echo \$trans | sed 's/.*\(%.*%\).*/\1/'\`
4417 +    var=empty
4418 +    case \$pat in
4419 +       %MODULE%)
4420 +          var=upper ;;
4421 +       %Module%)
4422 +          var=mods ;;
4423 +       %module%)
4424 +          var=lower ;;
4425 +       %FILE%)
4426 +          test -n "\$mods" && var=base ;;
4427 +    esac
4428 +    new=\`eval '(for i in \$'\$var '; do echo \$trans | sed s/\$pat/\$i/; done)'\`
4429 +    list="\$list \$new"
4430 +  done
4431 + done
4432 +
4433 + echo \$list
4434 + # end of configure-generated script
4435 + EOF
4436 + chmod 755 scripts/modnam
4437 +
4438 + pat=`echo $ac_cv_f90_module_names | sed 's/.*\(%.*%\).*/\1/'`
4439 + F90_MODULE_NAMES=empty
4440 + case $pat in
4441 +       %MODULE%)
4442 +          F90_MODULE_NAMES=UPPER ;;
4443 +       %Module%)
4444 +          F90_MODULE_NAMES=Mixed ;;
4445 +       %module%)
4446 +          F90_MODULE_NAMES=lower ;;
4447 +       *)
4448 +          F90_MODULE_NAMES=unknown ;;
4449 + esac
4450  
4451   ac_ext=c
4452   ac_cpp='$CPP $CPPFLAGS'
# Line 4699 | Line 4947 | done
4947   fi
4948  
4949   done
4950 +
4951 +
4952 +
4953 +
4954 +
4955 +
4956 +
4957  
4958  
4959 +
4960 +
4961 + for ac_header in unistd.h sys/pstat.h sys/sysmp.h sys/sysinfo.h sys/table.h sys/param.h sys/sysctl.h sys/sytemcfg.h machine/hal_sysinfo.h
4962 + do
4963 + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
4964 + if eval "test \"\${$as_ac_Header+set}\" = set"; then
4965 +  echo "$as_me:$LINENO: checking for $ac_header" >&5
4966 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
4967 + if eval "test \"\${$as_ac_Header+set}\" = set"; then
4968 +  echo $ECHO_N "(cached) $ECHO_C" >&6
4969 + fi
4970 + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
4971 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
4972 + else
4973 +  # Is the header compilable?
4974 + echo "$as_me:$LINENO: checking $ac_header usability" >&5
4975 + echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
4976 + cat >conftest.$ac_ext <<_ACEOF
4977 + /* confdefs.h.  */
4978 + _ACEOF
4979 + cat confdefs.h >>conftest.$ac_ext
4980 + cat >>conftest.$ac_ext <<_ACEOF
4981 + /* end confdefs.h.  */
4982 + $ac_includes_default
4983 + #include <$ac_header>
4984 + _ACEOF
4985 + rm -f conftest.$ac_objext
4986 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4987 +  (eval $ac_compile) 2>conftest.er1
4988 +  ac_status=$?
4989 +  grep -v '^ *+' conftest.er1 >conftest.err
4990 +  rm -f conftest.er1
4991 +  cat conftest.err >&5
4992 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4993 +  (exit $ac_status); } &&
4994 +         { ac_try='test -z "$ac_c_werror_flag"
4995 +                         || test ! -s conftest.err'
4996 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4997 +  (eval $ac_try) 2>&5
4998 +  ac_status=$?
4999 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5000 +  (exit $ac_status); }; } &&
5001 +         { ac_try='test -s conftest.$ac_objext'
5002 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5003 +  (eval $ac_try) 2>&5
5004 +  ac_status=$?
5005 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5006 +  (exit $ac_status); }; }; then
5007 +  ac_header_compiler=yes
5008 + else
5009 +  echo "$as_me: failed program was:" >&5
5010 + sed 's/^/| /' conftest.$ac_ext >&5
5011 +
5012 + ac_header_compiler=no
5013 + fi
5014 + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
5015 + echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
5016 + echo "${ECHO_T}$ac_header_compiler" >&6
5017 +
5018 + # Is the header present?
5019 + echo "$as_me:$LINENO: checking $ac_header presence" >&5
5020 + echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
5021 + cat >conftest.$ac_ext <<_ACEOF
5022 + /* confdefs.h.  */
5023 + _ACEOF
5024 + cat confdefs.h >>conftest.$ac_ext
5025 + cat >>conftest.$ac_ext <<_ACEOF
5026 + /* end confdefs.h.  */
5027 + #include <$ac_header>
5028 + _ACEOF
5029 + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
5030 +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
5031 +  ac_status=$?
5032 +  grep -v '^ *+' conftest.er1 >conftest.err
5033 +  rm -f conftest.er1
5034 +  cat conftest.err >&5
5035 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5036 +  (exit $ac_status); } >/dev/null; then
5037 +  if test -s conftest.err; then
5038 +    ac_cpp_err=$ac_c_preproc_warn_flag
5039 +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
5040 +  else
5041 +    ac_cpp_err=
5042 +  fi
5043 + else
5044 +  ac_cpp_err=yes
5045 + fi
5046 + if test -z "$ac_cpp_err"; then
5047 +  ac_header_preproc=yes
5048 + else
5049 +  echo "$as_me: failed program was:" >&5
5050 + sed 's/^/| /' conftest.$ac_ext >&5
5051 +
5052 +  ac_header_preproc=no
5053 + fi
5054 + rm -f conftest.err conftest.$ac_ext
5055 + echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
5056 + echo "${ECHO_T}$ac_header_preproc" >&6
5057 +
5058 + # So?  What about this header?
5059 + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
5060 +  yes:no: )
5061 +    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
5062 + echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
5063 +    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
5064 + echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
5065 +    ac_header_preproc=yes
5066 +    ;;
5067 +  no:yes:* )
5068 +    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
5069 + echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
5070 +    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
5071 + echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
5072 +    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
5073 + echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
5074 +    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
5075 + echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
5076 +    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
5077 + echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
5078 +    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
5079 + echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
5080 +    (
5081 +      cat <<\_ASBOX
5082 + ## ------------------------------ ##
5083 + ## Report this to gezelter@nd.edu ##
5084 + ## ------------------------------ ##
5085 + _ASBOX
5086 +    ) |
5087 +      sed "s/^/$as_me: WARNING:     /" >&2
5088 +    ;;
5089 + esac
5090 + echo "$as_me:$LINENO: checking for $ac_header" >&5
5091 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
5092 + if eval "test \"\${$as_ac_Header+set}\" = set"; then
5093 +  echo $ECHO_N "(cached) $ECHO_C" >&6
5094 + else
5095 +  eval "$as_ac_Header=\$ac_header_preproc"
5096 + fi
5097 + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
5098 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
5099 +
5100 + fi
5101 + if test `eval echo '${'$as_ac_Header'}'` = yes; then
5102 +  cat >>confdefs.h <<_ACEOF
5103 + #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
5104 + _ACEOF
5105 +
5106 + fi
5107 +
5108 + done
5109 +
5110 +
5111 +
5112 +
5113 +
5114 +
5115 + for ac_func in pstat_getstatic sysmp getsysinfo sysctl table
5116 + do
5117 + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
5118 + echo "$as_me:$LINENO: checking for $ac_func" >&5
5119 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
5120 + if eval "test \"\${$as_ac_var+set}\" = set"; then
5121 +  echo $ECHO_N "(cached) $ECHO_C" >&6
5122 + else
5123 +  cat >conftest.$ac_ext <<_ACEOF
5124 + /* confdefs.h.  */
5125 + _ACEOF
5126 + cat confdefs.h >>conftest.$ac_ext
5127 + cat >>conftest.$ac_ext <<_ACEOF
5128 + /* end confdefs.h.  */
5129 + /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
5130 +   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
5131 + #define $ac_func innocuous_$ac_func
5132 +
5133 + /* System header to define __stub macros and hopefully few prototypes,
5134 +    which can conflict with char $ac_func (); below.
5135 +    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
5136 +    <limits.h> exists even on freestanding compilers.  */
5137 +
5138 + #ifdef __STDC__
5139 + # include <limits.h>
5140 + #else
5141 + # include <assert.h>
5142 + #endif
5143 +
5144 + #undef $ac_func
5145 +
5146 + /* Override any gcc2 internal prototype to avoid an error.  */
5147 + #ifdef __cplusplus
5148 + extern "C"
5149 + {
5150 + #endif
5151 + /* We use char because int might match the return type of a gcc2
5152 +   builtin and then its argument prototype would still apply.  */
5153 + char $ac_func ();
5154 + /* The GNU C library defines this for functions which it implements
5155 +    to always fail with ENOSYS.  Some functions are actually named
5156 +    something starting with __ and the normal name is an alias.  */
5157 + #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
5158 + choke me
5159 + #else
5160 + char (*f) () = $ac_func;
5161 + #endif
5162 + #ifdef __cplusplus
5163 + }
5164 + #endif
5165 +
5166 + int
5167 + main ()
5168 + {
5169 + return f != $ac_func;
5170 +  ;
5171 +  return 0;
5172 + }
5173 + _ACEOF
5174 + rm -f conftest.$ac_objext conftest$ac_exeext
5175 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5176 +  (eval $ac_link) 2>conftest.er1
5177 +  ac_status=$?
5178 +  grep -v '^ *+' conftest.er1 >conftest.err
5179 +  rm -f conftest.er1
5180 +  cat conftest.err >&5
5181 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5182 +  (exit $ac_status); } &&
5183 +         { ac_try='test -z "$ac_c_werror_flag"
5184 +                         || test ! -s conftest.err'
5185 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5186 +  (eval $ac_try) 2>&5
5187 +  ac_status=$?
5188 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5189 +  (exit $ac_status); }; } &&
5190 +         { ac_try='test -s conftest$ac_exeext'
5191 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5192 +  (eval $ac_try) 2>&5
5193 +  ac_status=$?
5194 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5195 +  (exit $ac_status); }; }; then
5196 +  eval "$as_ac_var=yes"
5197 + else
5198 +  echo "$as_me: failed program was:" >&5
5199 + sed 's/^/| /' conftest.$ac_ext >&5
5200 +
5201 + eval "$as_ac_var=no"
5202 + fi
5203 + rm -f conftest.err conftest.$ac_objext \
5204 +      conftest$ac_exeext conftest.$ac_ext
5205 + fi
5206 + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
5207 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
5208 + if test `eval echo '${'$as_ac_var'}'` = yes; then
5209 +  cat >>confdefs.h <<_ACEOF
5210 + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
5211 + _ACEOF
5212 +
5213 + fi
5214 + done
5215 +
5216 + # special check for _system_configuration because AIX <4.3.2 do not
5217 + # contain the `physmem' member.
5218 + echo "$as_me:$LINENO: checking for external symbol _system_configuration" >&5
5219 + echo $ECHO_N "checking for external symbol _system_configuration... $ECHO_C" >&6
5220 + cat >conftest.$ac_ext <<_ACEOF
5221 + /* confdefs.h.  */
5222 + _ACEOF
5223 + cat confdefs.h >>conftest.$ac_ext
5224 + cat >>conftest.$ac_ext <<_ACEOF
5225 + /* end confdefs.h.  */
5226 + #include <sys/systemcfg.h>
5227 + int
5228 + main ()
5229 + {
5230 + double x = _system_configuration.physmem;
5231 +  ;
5232 +  return 0;
5233 + }
5234 + _ACEOF
5235 + rm -f conftest.$ac_objext
5236 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5237 +  (eval $ac_compile) 2>conftest.er1
5238 +  ac_status=$?
5239 +  grep -v '^ *+' conftest.er1 >conftest.err
5240 +  rm -f conftest.er1
5241 +  cat conftest.err >&5
5242 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5243 +  (exit $ac_status); } &&
5244 +         { ac_try='test -z "$ac_c_werror_flag"
5245 +                         || test ! -s conftest.err'
5246 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5247 +  (eval $ac_try) 2>&5
5248 +  ac_status=$?
5249 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5250 +  (exit $ac_status); }; } &&
5251 +         { ac_try='test -s conftest.$ac_objext'
5252 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5253 +  (eval $ac_try) 2>&5
5254 +  ac_status=$?
5255 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5256 +  (exit $ac_status); }; }; then
5257 +  echo "$as_me:$LINENO: result: yes" >&5
5258 + echo "${ECHO_T}yes" >&6
5259 +
5260 + cat >>confdefs.h <<\_ACEOF
5261 + #define HAVE__SYSTEM_CONFIGURATION 1
5262 + _ACEOF
5263 +
5264 + else
5265 +  echo "$as_me: failed program was:" >&5
5266 + sed 's/^/| /' conftest.$ac_ext >&5
5267 +
5268 + echo "$as_me:$LINENO: result: no" >&5
5269 + echo "${ECHO_T}no" >&6
5270 + fi
5271 + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
5272 +
5273    # clean out junk possibly left behind by a previous configuration
5274 <  rm -f utils/getopt.h
5274 >  rm -f src/getopt.h
5275    # Check for getopt_long support
5276  
5277   for ac_header in getopt.h
# Line 5042 | Line 5611 | esac
5611    *) LIBOBJS="$LIBOBJS getopt1.$ac_objext" ;;
5612   esac
5613  
5614 <                ac_config_links="$ac_config_links utils/getopt.h:utils/gnugetopt.h"
5614 >                ac_config_links="$ac_config_links src/getopt.h:src/utils/gnugetopt.h"
5615  
5616   fi
5617  
# Line 5136 | Line 5705 | if test "$ac_test_CFLAGS" != "set"; then
5705          fi;;
5706     *darwin*)
5707          if test "$CC" = xlc -o "$CC" = cc; then
5708 <                CFLAGS="-qthreaded -O5 -qtune=auto -qarch=auto -qunroll=auto -qaltivec"
5708 >                CFLAGS="-qthreaded -O -qtune=auto -qarch=auto -qunroll=auto -qaltivec"
5709          fi;;
5710    esac
5711  
# Line 5587 | Line 6156 | if test "$ac_test_CXXFLAGS" != "set"; then
6156                  echo "*******************************************************"
6157          fi;;
6158     *darwin*)
6159 <        if test "$CXX" = xlc++; then
6160 <                CXXFLAGS="-qthreaded -O5 -qtune=auto -qarch=auto -qunroll=auto -qaltivec"
6159 >        if test "$CXX" = xlc++ -o "$CXX" = xlC ; then
6160 >                CXXFLAGS="-qthreaded -O -qtune=auto -qarch=auto -qunroll=auto -qaltivec"
6161          fi;;
6162    esac
6163  
# Line 6000 | Line 6569 | if test x"$F90FLAGS" = x ; then
6569          fi;;
6570     *darwin*)
6571          if test "$F90" = f90 -o "$F90" = xlf90 -o "$F90" = xlf95; then
6572 <                F90FLAGS="-qthreaded -O5 -qtune=auto -qarch=auto -qunroll=auto"
6572 >                F90FLAGS="-qthreaded -O -qtune=auto -qarch=auto -qunroll=auto"
6573          fi;;
6574    esac
6575  
# Line 6688 | Line 7257 | fi
7257   fi
7258   rm -f confcache
7259    exit 1
7260 + fi
7261 +
7262 + # Extract the first word of "ps", so it can be a program name with args.
7263 + set dummy ps; ac_word=$2
7264 + echo "$as_me:$LINENO: checking for $ac_word" >&5
7265 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
7266 + if test "${ac_cv_path_PS+set}" = set; then
7267 +  echo $ECHO_N "(cached) $ECHO_C" >&6
7268 + else
7269 +  case $PS in
7270 +  [\\/]* | ?:[\\/]*)
7271 +  ac_cv_path_PS="$PS" # Let the user override the test with a path.
7272 +  ;;
7273 +  *)
7274 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7275 + for as_dir in $PATH
7276 + do
7277 +  IFS=$as_save_IFS
7278 +  test -z "$as_dir" && as_dir=.
7279 +  for ac_exec_ext in '' $ac_executable_extensions; do
7280 +  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7281 +    ac_cv_path_PS="$as_dir/$ac_word$ac_exec_ext"
7282 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7283 +    break 2
7284 +  fi
7285 + done
7286 + done
7287 +
7288 +  ;;
7289 + esac
7290 + fi
7291 + PS=$ac_cv_path_PS
7292 +
7293 + if test -n "$PS"; then
7294 +  echo "$as_me:$LINENO: result: $PS" >&5
7295 + echo "${ECHO_T}$PS" >&6
7296 + else
7297 +  echo "$as_me:$LINENO: result: no" >&5
7298 + echo "${ECHO_T}no" >&6
7299   fi
7300  
7301 + echo "$as_me:$LINENO: checking for POSIX or BSD ps syntax" >&5
7302 + echo $ECHO_N "checking for POSIX or BSD ps syntax... $ECHO_C" >&6
7303 + if test "${ac_cv_prog_ps_syntax+set}" = set; then
7304 +  echo $ECHO_N "(cached) $ECHO_C" >&6
7305 + else
7306  
7307 +        if $PS ax -o rss > /dev/null 2>&1; then
7308 +                ac_cv_prog_ps_ax=yes
7309 +        else
7310 +                ac_cv_prog_ps_ax=no
7311 +        fi
7312 +        if $PS -ef -o rss > /dev/null 2>&1; then
7313 +                ac_cv_prog_ps_ef=yes
7314 +        else
7315 +                ac_cv_prog_ps_ef=no
7316 +        fi
7317 +        if test "$ac_cv_prog_ps_ax" = yes; then
7318 +                ac_cv_prog_ps_syntax=BSD
7319 +        else
7320 +                if test "$ac_cv_prog_ps_ef" = yes; then
7321 +                        ac_cv_prog_ps_syntax=POSIX
7322 +                else
7323 +                        { { echo "$as_me:$LINENO: error: Could not determine ps syntax" >&5
7324 + echo "$as_me: error: Could not determine ps syntax" >&2;}
7325 +   { (exit 1); exit 1; }; }
7326 +                fi
7327 +        fi
7328  
7329 + fi
7330 + echo "$as_me:$LINENO: result: $ac_cv_prog_ps_syntax" >&5
7331 + echo "${ECHO_T}$ac_cv_prog_ps_syntax" >&6
7332 +
7333 +
7334 + cat >>confdefs.h <<_ACEOF
7335 + #define PSCOMMAND $PS
7336 + _ACEOF
7337 +
7338 +
7339 + if test "$ac_cv_prog_ps_syntax" = BSD; then
7340 +  cat >>confdefs.h <<\_ACEOF
7341 + #define PSTYPE_IS_BSD 1
7342 + _ACEOF
7343 +
7344 + else
7345 +   if test "$ac_cv_prog_ps_syntax" = POSIX; then
7346 +       cat >>confdefs.h <<\_ACEOF
7347 + #define PSTYPE_IS_POSIX 1
7348 + _ACEOF
7349 +
7350 +   else
7351 +       { { echo "$as_me:$LINENO: error: Unknown ps syntax type!" >&5
7352 + echo "$as_me: error: Unknown ps syntax type!" >&2;}
7353 +   { (exit 1); exit 1; }; }
7354 +   fi
7355 + fi
7356 +
7357 +
7358   # Check whether --with-mpi or --without-mpi was given.
7359   if test "${with_mpi+set}" = set; then
7360    withval="$with_mpi"
# Line 6991 | Line 7654 | fi
7654   fi
7655  
7656   fi
7657 <
6995 < $as_unset ac_cv_lib_mpi_MPI_Init
7657 > $as_unset ac_cv_lib_mpich_MPI_Init
7658   if test x = x"$MPI_LIB"; then
7659 < echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5
7660 < echo $ECHO_N "checking for MPI_Init in -lmpi... $ECHO_C" >&6
7661 < if test "${ac_cv_lib_mpi_MPI_Init+set}" = set; then
7659 >        echo "$as_me:$LINENO: checking for MPI_Init in -lmpich" >&5
7660 > echo $ECHO_N "checking for MPI_Init in -lmpich... $ECHO_C" >&6
7661 > if test "${ac_cv_lib_mpich_MPI_Init+set}" = set; then
7662    echo $ECHO_N "(cached) $ECHO_C" >&6
7663   else
7664    ac_check_lib_save_LIBS=$LIBS
7665 < LIBS="-lmpi -llam -lpthread $LIBS"
7665 > LIBS="-lmpich "-lpmpich" $LIBS"
7666   cat >conftest.$ac_ext <<_ACEOF
7667   /* confdefs.h.  */
7668   _ACEOF
# Line 7045 | Line 7707 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
7707    ac_status=$?
7708    echo "$as_me:$LINENO: \$? = $ac_status" >&5
7709    (exit $ac_status); }; }; then
7710 <  ac_cv_lib_mpi_MPI_Init=yes
7710 >  ac_cv_lib_mpich_MPI_Init=yes
7711   else
7712    echo "$as_me: failed program was:" >&5
7713   sed 's/^/| /' conftest.$ac_ext >&5
7714  
7715 < ac_cv_lib_mpi_MPI_Init=no
7715 > ac_cv_lib_mpich_MPI_Init=no
7716   fi
7717   rm -f conftest.err conftest.$ac_objext \
7718        conftest$ac_exeext conftest.$ac_ext
7719   LIBS=$ac_check_lib_save_LIBS
7720   fi
7721 < echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_MPI_Init" >&5
7722 < echo "${ECHO_T}$ac_cv_lib_mpi_MPI_Init" >&6
7723 < if test $ac_cv_lib_mpi_MPI_Init = yes; then
7724 <  MPI_LIB="-lmpi -llam -lpthread"
7063 < else
7064 <
7065 <             { { echo "$as_me:$LINENO: error: Didn't find liblam, libmpi, or libmpich; check path for MPI package first..." >&5
7066 < echo "$as_me: error: Didn't find liblam, libmpi, or libmpich; check path for MPI package first..." >&2;}
7067 <   { (exit 1); exit 1; }; }
7068 <             USE_MPI="no"
7069 <
7070 < fi
7071 <
7072 < fi
7073 <
7074 <
7075 <
7076 < echo "$as_me:$LINENO: checking for MPI Fortran library" >&5
7077 < echo $ECHO_N "checking for MPI Fortran library... $ECHO_C" >&6
7078 < MPI_F90_LIB=""
7079 < if test -f "$MPI_LIB_DIR/libfmpich.a" ; then
7080 <        MPI_F90_LIB="-lfmpich"
7081 < elif test -f "$MPI_LIB_DIR/liblamf77mpi.a" ; then
7082 <        MPI_F90_LIB="-llamf77mpi"
7083 < else
7084 <                        MPI_F90_LIB="  "
7085 < fi
7086 < echo "$as_me:$LINENO: result: found $MPI_F90_LIB" >&5
7087 < echo "${ECHO_T}found $MPI_F90_LIB" >&6
7088 <
7089 <
7090 < fi
7091 <
7092 <
7093 <
7094 < # Check whether --with-sprng or --without-sprng was given.
7095 < if test "${with_sprng+set}" = set; then
7096 <  withval="$with_sprng"
7097 <  with_sprng=$withval
7098 < else
7099 <  with_sprng="/usr/local"
7100 < fi;
7101 <
7102 < case "x$with_sprng" in
7103 <        xyes | "x")  USE_SPRNG=yes;;
7104 <        xno) USE_SPRNG=no ;;
7105 <        *) SPRNG="$with_sprng"; USE_SPRNG=yes ;;
7106 < esac
7107 < if test "$USE_SPRNG" = "yes" -a -z "$with_sprng"; then
7108 <        SPRNG="/usr/local"
7721 > echo "$as_me:$LINENO: result: $ac_cv_lib_mpich_MPI_Init" >&5
7722 > echo "${ECHO_T}$ac_cv_lib_mpich_MPI_Init" >&6
7723 > if test $ac_cv_lib_mpich_MPI_Init = yes; then
7724 >  MPI_LIB="-lmpich -lpmpich"
7725   fi
7110 – if test "$USE_SPRNG" = "yes"; then
7726  
7112 –
7113 – # Set variables...
7114 – SPRNG_LIB_DIR="$SPRNG/lib"
7115 – SPRNG_INC_DIR="$SPRNG/include"
7116 –
7117 –
7118 –
7119 – echo "$as_me:$LINENO: checking for sprng.h" >&5
7120 – echo $ECHO_N "checking for sprng.h... $ECHO_C" >&6
7121 – have_sprng_h=0
7122 – echo '#include <sprng.h>' > conftest.cc
7123 – if test -z "`${CXX} -I${SPRNG_INC_DIR} -c conftest.cc 2>&1`"; then
7124 –        echo "$as_me:$LINENO: result: yes" >&5
7125 – echo "${ECHO_T}yes" >&6
7126 –        have_sprng_h=1
7127 – else
7128 –        echo "$as_me:$LINENO: result: no! Check SPRNG include path!" >&5
7129 – echo "${ECHO_T}no! Check SPRNG include path!" >&6
7130 –        USE_SPRNG="no"
7727   fi
7132 – rm -f conftest*
7133 – if test "$have_sprng_h" = 1; then
7728  
7729 < cat >>confdefs.h <<\_ACEOF
7730 < #define HAVE_SPRNG_H 1
7731 < _ACEOF
7732 <
7733 < fi
7140 <
7141 < ac_ext=c
7142 < ac_cpp='$CPP $CPPFLAGS'
7143 < ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7144 < ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7145 < ac_compiler_gnu=$ac_cv_c_compiler_gnu
7146 <
7147 < ac_save_LDFLAGS=$LDFLAGS
7148 < LDFLAGS="${LDFLAGS} -L${SPRNG_LIB_DIR} "
7149 <
7150 < echo "$as_me:$LINENO: checking for init_rng in -lsprng" >&5
7151 < echo $ECHO_N "checking for init_rng in -lsprng... $ECHO_C" >&6
7152 < if test "${ac_cv_lib_sprng_init_rng+set}" = set; then
7729 > $as_unset ac_cv_lib_mpi_MPI_Init
7730 > if test x = x"$MPI_LIB"; then
7731 > echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5
7732 > echo $ECHO_N "checking for MPI_Init in -lmpi... $ECHO_C" >&6
7733 > if test "${ac_cv_lib_mpi_MPI_Init+set}" = set; then
7734    echo $ECHO_N "(cached) $ECHO_C" >&6
7735   else
7736    ac_check_lib_save_LIBS=$LIBS
7737 < LIBS="-lsprng  $LIBS"
7737 > LIBS="-lmpi -llam -lpthread $LIBS"
7738   cat >conftest.$ac_ext <<_ACEOF
7739   /* confdefs.h.  */
7740   _ACEOF
# Line 7167 | Line 7748 | char init_rng ();
7748   #endif
7749   /* We use char because int might match the return type of a gcc2
7750     builtin and then its argument prototype would still apply.  */
7751 < char init_rng ();
7751 > char MPI_Init ();
7752   int
7753   main ()
7754   {
7755 < init_rng ();
7755 > MPI_Init ();
7756    ;
7757    return 0;
7758   }
# Line 7198 | Line 7779 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
7779    ac_status=$?
7780    echo "$as_me:$LINENO: \$? = $ac_status" >&5
7781    (exit $ac_status); }; }; then
7782 <  ac_cv_lib_sprng_init_rng=yes
7782 >  ac_cv_lib_mpi_MPI_Init=yes
7783   else
7784    echo "$as_me: failed program was:" >&5
7785   sed 's/^/| /' conftest.$ac_ext >&5
7786  
7787 < ac_cv_lib_sprng_init_rng=no
7787 > ac_cv_lib_mpi_MPI_Init=no
7788   fi
7789   rm -f conftest.err conftest.$ac_objext \
7790        conftest$ac_exeext conftest.$ac_ext
7791   LIBS=$ac_check_lib_save_LIBS
7792   fi
7793 < echo "$as_me:$LINENO: result: $ac_cv_lib_sprng_init_rng" >&5
7794 < echo "${ECHO_T}$ac_cv_lib_sprng_init_rng" >&6
7795 < if test $ac_cv_lib_sprng_init_rng = yes; then
7796 <  SPRNG_LIB="-lsprng"
7793 > echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_MPI_Init" >&5
7794 > echo "${ECHO_T}$ac_cv_lib_mpi_MPI_Init" >&6
7795 > if test $ac_cv_lib_mpi_MPI_Init = yes; then
7796 >  MPI_LIB="-lmpi -llam -lpthread"
7797   else
7798  
7799 <             { { echo "$as_me:$LINENO: error: Didn't find libsprng; check path for SPRNG package first..." >&5
7800 < echo "$as_me: error: Didn't find libsprng; check path for SPRNG package first..." >&2;}
7799 >             { { echo "$as_me:$LINENO: error: Didn't find liblam, libmpi, or libmpich; check path for MPI package first..." >&5
7800 > echo "$as_me: error: Didn't find liblam, libmpi, or libmpich; check path for MPI package first..." >&2;}
7801     { (exit 1); exit 1; }; }
7802 <             USE_SPRNG="no"
7802 >             USE_MPI="no"
7803  
7804   fi
7805  
7806 + fi
7807  
7808 < if test "$USE_SPRNG" = "no"; then
7809 <  { { echo "$as_me:$LINENO: error: No working SPRNG library found" >&5
7810 < echo "$as_me: error: No working SPRNG library found" >&2;}
7811 <   { (exit 1); exit 1; }; }
7808 >
7809 >
7810 > echo "$as_me:$LINENO: checking for MPI Fortran library" >&5
7811 > echo $ECHO_N "checking for MPI Fortran library... $ECHO_C" >&6
7812 > MPI_F90_LIB=""
7813 > if test -f "$MPI_LIB_DIR/libfmpich.a" ; then
7814 >        MPI_F90_LIB="-lfmpich"
7815 > elif test -f "$MPI_LIB_DIR/liblamf77mpi.a" ; then
7816 >        MPI_F90_LIB="-llamf77mpi"
7817 > else
7818 >                        MPI_F90_LIB="  "
7819   fi
7820 + echo "$as_me:$LINENO: result: found $MPI_F90_LIB" >&5
7821 + echo "${ECHO_T}found $MPI_F90_LIB" >&6
7822  
7823  
7824   fi
7825  
7826  
7827  
7237 – echo "$as_me:$LINENO: checking if MKL is wanted" >&5
7238 – echo $ECHO_N "checking if MKL is wanted... $ECHO_C" >&6
7828  
7829 < # Check whether --with-mkl or --without-mkl was given.
7830 < if test "${with_mkl+set}" = set; then
7831 <  withval="$with_mkl"
7832 <     echo "$as_me:$LINENO: result: yes" >&5
7833 < echo "${ECHO_T}yes" >&6
7834 <    for dir in $withval /usr/local/intel/mkl61 /opt/intel/mkl61; do
7835 <        mkldir="$dir"
7836 <        if test -f "$dir/include/mkl.h"; then
7837 <            found_mkl="yes";
7838 <            break;
7839 <        fi
7840 <    done
7841 <    if test x_$found_mkl != x_yes; then
7842 <        { { echo "$as_me:$LINENO: error: Cannot find MKL includes" >&5
7843 < echo "$as_me: error: Cannot find MKL includes" >&2;}
7844 <   { (exit 1); exit 1; }; }
7845 <    else
7846 <        printf "MKL includes found in $mkldir/include\n";
7829 > USE_CGAL=no
7830 > cgal_makefile=auto
7831 >
7832 > # Check whether --with-cgal-makefile or --without-cgal-makefile was given.
7833 > if test "${with_cgal_makefile+set}" = set; then
7834 >  withval="$with_cgal_makefile"
7835 >  cgal_makefile="$withval"
7836 > fi;
7837 >
7838 > if test "x$cgal_makefile" != xno; then
7839 >
7840 >  if test "x$cgal_makefile" = xauto -a "x$CGAL_MAKEFILE" != x; then
7841 >    cgal_makefile="$CGAL_MAKEFILE"
7842 >  fi
7843 >
7844 >  echo "cgal_makefile      $cgal_makefile"
7845 >
7846 >  if test -f "$cgal_makefile"; then
7847 >
7848 >    cat >config.tmp.Makefile <<EOF
7849 > include $cgal_makefile
7850 > default:
7851 >        @echo CGAL_OS_COMPILER=\"\${CGAL_OS_COMPILER}\" >config.tmp.cgalvariables
7852 >        @echo CGAL_INCLDIR=\"\${CGAL_INCL_DIR}\" >>config.tmp.cgalvariables
7853 >        @echo CGAL_INCLCONFDIR=\"\${CGAL_INCL_CONF_DIR}\" >>config.tmp.cgalvariables
7854 >        @echo CGAL_LIBDIR=\"\${CGAL_LIB_DIR}/\${CGAL_OS_COMPILER}\" >>config.tmp.cgalvariables
7855 >        @echo CGAL_RLIBDIR=\"\${CGAL_LIB_DIR}/\${CGAL_OS_COMPILER}\" >>config.tmp.cgalvariables
7856 >        @echo CGAL_CXXFLAGS=\"\${CGAL_CXXFLAGS}\" >>config.tmp.cgalvariables
7857 >        @echo GMP_INCLDIR=\"\${GMP_INCL_DIR}\" >>config.tmp.cgalvariables
7858 >        @echo GMP_LIBDIR=\"\${GMP_LIB_DIR}\" >>config.tmp.cgalvariables
7859 >        @echo GMP_RLIBDIR=\"\${GMP_LIB_DIR}\" >>config.tmp.cgalvariables
7860 >        @echo LEDA_INCLDIR=\"\${LEDA_INCL_DIR}\" >>config.tmp.cgalvariables
7861 >        @echo LEDA_LIBDIR=\"\${LEDA_LIB_DIR}\" >>config.tmp.cgalvariables
7862 >        @echo LEDA_RLIBDIR=\"\${LEDA_LIB_DIR}\" >>config.tmp.cgalvariables
7863 > EOF
7864 >
7865 >    make -s -f config.tmp.Makefile
7866 >    . config.tmp.cgalvariables
7867 >
7868 >    rm -f config.tmp.Makefile config.tmp.cgalvariables
7869 >
7870 >    if test "x$CGAL_INCLDIR" = "x"; then
7871 >      CGAL_INCLDIR=""
7872      fi
7873  
7874 +    if test "x$CGAL_LIBDIR" = "x"; then
7875 +      CGAL_LIBDIR=""
7876 +    fi
7877  
7878 +    if test "x$CGAL_RLIBDIR" = "x"; then
7879 +      CGAL_RLIBDIR=""
7880 +    fi
7881  
7882 <  ac_ext=c
7883 < ac_cpp='$CPP $CPPFLAGS'
7884 < ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7265 < ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7266 < ac_compiler_gnu=$ac_cv_c_compiler_gnu
7882 >    if test "x$LEDA_INCLDIR" = "x"; then
7883 >      LEDA_INCLDIR=""
7884 >    fi
7885  
7886 <  ac_save_CPPFLAGS=$CPPFLAGS
7887 <  CPPFLAGS="${CPPFLAGS} -I${mkldir}/include"
7888 <  ac_save_LDFLAGS=$LDFLAGS
7889 <  LDFLAGS="${LDFLAGS} -L${mkldir}/lib/32 -lmkl -lvml -lguide"
7890 <  if test "${ac_cv_header_mkl_h+set}" = set; then
7891 <  echo "$as_me:$LINENO: checking for mkl.h" >&5
7892 < echo $ECHO_N "checking for mkl.h... $ECHO_C" >&6
7893 < if test "${ac_cv_header_mkl_h+set}" = set; then
7886 >    if test "x$LEDA_LIBDIR" = "x"; then
7887 >      LEDA_LIBDIR=""
7888 >    fi
7889 >
7890 >    if test "x$LEDA_RLIBDIR" = "x"; then
7891 >      LEDA_RLIBDIR=""
7892 >    fi
7893 >
7894 >    if test "x$GMP_INCLDIR" = "x"; then
7895 >      GMP_INCLDIR=""
7896 >    fi
7897 >
7898 >    if test "x$GMP_LIBDIR" = "x"; then
7899 >      GMP_LIBDIR=""
7900 >    fi
7901 >
7902 >    if test "x$GMP_RLIBDIR" = "x"; then
7903 >      GMP_RLIBDIR=""
7904 >    fi
7905 >
7906 >    echo "CGAL_OS_COMPILER   $CGAL_OS_COMPILER"
7907 >    echo "CGAL_INCLDIR       $CGAL_INCLDIR"
7908 >    echo "CGAL_INCLCONFDIR   $CGAL_INCLCONFDIR"
7909 >    echo "CGAL_LIBDIR        $CGAL_LIBDIR"
7910 >    echo "CGAL_CXXFLAGS      $CGAL_CXXFLAGS"
7911 >    echo "LEDA_INCLDIR       $LEDA_INCLDIR"
7912 >    echo "LEDA_LIBDIR        $LEDA_LIBDIR"
7913 >    echo "GMP_INCLDIR        $GMP_INCLDIR"
7914 >    echo "GMP_LIBDIR         $GMP_LIBDIR"
7915 >
7916 >    ac_ext=cc
7917 > ac_cpp='$CXXCPP $CPPFLAGS'
7918 > ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7919 > ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7920 > ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
7921 >
7922 >    save_CXXFLAGS="$CXXFLAGS"
7923 >    CXXFLAGS="$CXXFLAGS -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR"
7924 >
7925 > ac_ext=cc
7926 > ac_cpp='$CXXCPP $CPPFLAGS'
7927 > ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7928 > ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7929 > ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
7930 > echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
7931 > echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
7932 > if test -z "$CXXCPP"; then
7933 >  if test "${ac_cv_prog_CXXCPP+set}" = set; then
7934    echo $ECHO_N "(cached) $ECHO_C" >&6
7935 + else
7936 +      # Double quotes because CXXCPP needs to be expanded
7937 +    for CXXCPP in "$CXX -E" "/lib/cpp"
7938 +    do
7939 +      ac_preproc_ok=false
7940 + for ac_cxx_preproc_warn_flag in '' yes
7941 + do
7942 +  # Use a header file that comes with gcc, so configuring glibc
7943 +  # with a fresh cross-compiler works.
7944 +  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
7945 +  # <limits.h> exists even on freestanding compilers.
7946 +  # On the NeXT, cc -E runs the code through the compiler's parser,
7947 +  # not just through cpp. "Syntax error" is here to catch this case.
7948 +  cat >conftest.$ac_ext <<_ACEOF
7949 + /* confdefs.h.  */
7950 + _ACEOF
7951 + cat confdefs.h >>conftest.$ac_ext
7952 + cat >>conftest.$ac_ext <<_ACEOF
7953 + /* end confdefs.h.  */
7954 + #ifdef __STDC__
7955 + # include <limits.h>
7956 + #else
7957 + # include <assert.h>
7958 + #endif
7959 +                     Syntax error
7960 + _ACEOF
7961 + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
7962 +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
7963 +  ac_status=$?
7964 +  grep -v '^ *+' conftest.er1 >conftest.err
7965 +  rm -f conftest.er1
7966 +  cat conftest.err >&5
7967 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
7968 +  (exit $ac_status); } >/dev/null; then
7969 +  if test -s conftest.err; then
7970 +    ac_cpp_err=$ac_cxx_preproc_warn_flag
7971 +    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
7972 +  else
7973 +    ac_cpp_err=
7974 +  fi
7975 + else
7976 +  ac_cpp_err=yes
7977   fi
7978 < echo "$as_me:$LINENO: result: $ac_cv_header_mkl_h" >&5
7979 < echo "${ECHO_T}$ac_cv_header_mkl_h" >&6
7978 > if test -z "$ac_cpp_err"; then
7979 >  :
7980 > else
7981 >  echo "$as_me: failed program was:" >&5
7982 > sed 's/^/| /' conftest.$ac_ext >&5
7983 >
7984 >  # Broken: fails on valid input.
7985 > continue
7986 > fi
7987 > rm -f conftest.err conftest.$ac_ext
7988 >
7989 >  # OK, works on sane cases.  Now check whether non-existent headers
7990 >  # can be detected and how.
7991 >  cat >conftest.$ac_ext <<_ACEOF
7992 > /* confdefs.h.  */
7993 > _ACEOF
7994 > cat confdefs.h >>conftest.$ac_ext
7995 > cat >>conftest.$ac_ext <<_ACEOF
7996 > /* end confdefs.h.  */
7997 > #include <ac_nonexistent.h>
7998 > _ACEOF
7999 > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
8000 >  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
8001 >  ac_status=$?
8002 >  grep -v '^ *+' conftest.er1 >conftest.err
8003 >  rm -f conftest.er1
8004 >  cat conftest.err >&5
8005 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
8006 >  (exit $ac_status); } >/dev/null; then
8007 >  if test -s conftest.err; then
8008 >    ac_cpp_err=$ac_cxx_preproc_warn_flag
8009 >    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
8010 >  else
8011 >    ac_cpp_err=
8012 >  fi
8013   else
8014 +  ac_cpp_err=yes
8015 + fi
8016 + if test -z "$ac_cpp_err"; then
8017 +  # Broken: success on invalid input.
8018 + continue
8019 + else
8020 +  echo "$as_me: failed program was:" >&5
8021 + sed 's/^/| /' conftest.$ac_ext >&5
8022 +
8023 +  # Passes both tests.
8024 + ac_preproc_ok=:
8025 + break
8026 + fi
8027 + rm -f conftest.err conftest.$ac_ext
8028 +
8029 + done
8030 + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
8031 + rm -f conftest.err conftest.$ac_ext
8032 + if $ac_preproc_ok; then
8033 +  break
8034 + fi
8035 +
8036 +    done
8037 +    ac_cv_prog_CXXCPP=$CXXCPP
8038 +
8039 + fi
8040 +  CXXCPP=$ac_cv_prog_CXXCPP
8041 + else
8042 +  ac_cv_prog_CXXCPP=$CXXCPP
8043 + fi
8044 + echo "$as_me:$LINENO: result: $CXXCPP" >&5
8045 + echo "${ECHO_T}$CXXCPP" >&6
8046 + ac_preproc_ok=false
8047 + for ac_cxx_preproc_warn_flag in '' yes
8048 + do
8049 +  # Use a header file that comes with gcc, so configuring glibc
8050 +  # with a fresh cross-compiler works.
8051 +  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
8052 +  # <limits.h> exists even on freestanding compilers.
8053 +  # On the NeXT, cc -E runs the code through the compiler's parser,
8054 +  # not just through cpp. "Syntax error" is here to catch this case.
8055 +  cat >conftest.$ac_ext <<_ACEOF
8056 + /* confdefs.h.  */
8057 + _ACEOF
8058 + cat confdefs.h >>conftest.$ac_ext
8059 + cat >>conftest.$ac_ext <<_ACEOF
8060 + /* end confdefs.h.  */
8061 + #ifdef __STDC__
8062 + # include <limits.h>
8063 + #else
8064 + # include <assert.h>
8065 + #endif
8066 +                     Syntax error
8067 + _ACEOF
8068 + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
8069 +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
8070 +  ac_status=$?
8071 +  grep -v '^ *+' conftest.er1 >conftest.err
8072 +  rm -f conftest.er1
8073 +  cat conftest.err >&5
8074 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
8075 +  (exit $ac_status); } >/dev/null; then
8076 +  if test -s conftest.err; then
8077 +    ac_cpp_err=$ac_cxx_preproc_warn_flag
8078 +    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
8079 +  else
8080 +    ac_cpp_err=
8081 +  fi
8082 + else
8083 +  ac_cpp_err=yes
8084 + fi
8085 + if test -z "$ac_cpp_err"; then
8086 +  :
8087 + else
8088 +  echo "$as_me: failed program was:" >&5
8089 + sed 's/^/| /' conftest.$ac_ext >&5
8090 +
8091 +  # Broken: fails on valid input.
8092 + continue
8093 + fi
8094 + rm -f conftest.err conftest.$ac_ext
8095 +
8096 +  # OK, works on sane cases.  Now check whether non-existent headers
8097 +  # can be detected and how.
8098 +  cat >conftest.$ac_ext <<_ACEOF
8099 + /* confdefs.h.  */
8100 + _ACEOF
8101 + cat confdefs.h >>conftest.$ac_ext
8102 + cat >>conftest.$ac_ext <<_ACEOF
8103 + /* end confdefs.h.  */
8104 + #include <ac_nonexistent.h>
8105 + _ACEOF
8106 + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
8107 +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
8108 +  ac_status=$?
8109 +  grep -v '^ *+' conftest.er1 >conftest.err
8110 +  rm -f conftest.er1
8111 +  cat conftest.err >&5
8112 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
8113 +  (exit $ac_status); } >/dev/null; then
8114 +  if test -s conftest.err; then
8115 +    ac_cpp_err=$ac_cxx_preproc_warn_flag
8116 +    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
8117 +  else
8118 +    ac_cpp_err=
8119 +  fi
8120 + else
8121 +  ac_cpp_err=yes
8122 + fi
8123 + if test -z "$ac_cpp_err"; then
8124 +  # Broken: success on invalid input.
8125 + continue
8126 + else
8127 +  echo "$as_me: failed program was:" >&5
8128 + sed 's/^/| /' conftest.$ac_ext >&5
8129 +
8130 +  # Passes both tests.
8131 + ac_preproc_ok=:
8132 + break
8133 + fi
8134 + rm -f conftest.err conftest.$ac_ext
8135 +
8136 + done
8137 + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
8138 + rm -f conftest.err conftest.$ac_ext
8139 + if $ac_preproc_ok; then
8140 +  :
8141 + else
8142 +  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
8143 + See \`config.log' for more details." >&5
8144 + echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
8145 + See \`config.log' for more details." >&2;}
8146 +   { (exit 1); exit 1; }; }
8147 + fi
8148 +
8149 + ac_ext=cc
8150 + ac_cpp='$CXXCPP $CPPFLAGS'
8151 + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
8152 + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
8153 + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
8154 +
8155 +
8156 + if test "${ac_cv_header_CGAL_Cartesian_h+set}" = set; then
8157 +  echo "$as_me:$LINENO: checking for CGAL/Cartesian.h" >&5
8158 + echo $ECHO_N "checking for CGAL/Cartesian.h... $ECHO_C" >&6
8159 + if test "${ac_cv_header_CGAL_Cartesian_h+set}" = set; then
8160 +  echo $ECHO_N "(cached) $ECHO_C" >&6
8161 + fi
8162 + echo "$as_me:$LINENO: result: $ac_cv_header_CGAL_Cartesian_h" >&5
8163 + echo "${ECHO_T}$ac_cv_header_CGAL_Cartesian_h" >&6
8164 + else
8165    # Is the header compilable?
8166 < echo "$as_me:$LINENO: checking mkl.h usability" >&5
8167 < echo $ECHO_N "checking mkl.h usability... $ECHO_C" >&6
8166 > echo "$as_me:$LINENO: checking CGAL/Cartesian.h usability" >&5
8167 > echo $ECHO_N "checking CGAL/Cartesian.h usability... $ECHO_C" >&6
8168   cat >conftest.$ac_ext <<_ACEOF
8169   /* confdefs.h.  */
8170   _ACEOF
# Line 7288 | Line 8172 | $ac_includes_default
8172   cat >>conftest.$ac_ext <<_ACEOF
8173   /* end confdefs.h.  */
8174   $ac_includes_default
8175 < #include <mkl.h>
8175 > #include <CGAL/Cartesian.h>
8176   _ACEOF
8177   rm -f conftest.$ac_objext
8178   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
# Line 7299 | Line 8183 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8183    cat conftest.err >&5
8184    echo "$as_me:$LINENO: \$? = $ac_status" >&5
8185    (exit $ac_status); } &&
8186 <         { ac_try='test -z "$ac_c_werror_flag"
8186 >         { ac_try='test -z "$ac_cxx_werror_flag"
8187                           || test ! -s conftest.err'
8188    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8189    (eval $ac_try) 2>&5
# Line 7324 | Line 8208 | echo "$as_me:$LINENO: checking mkl.h presence" >&5
8208   echo "${ECHO_T}$ac_header_compiler" >&6
8209  
8210   # Is the header present?
8211 < echo "$as_me:$LINENO: checking mkl.h presence" >&5
8212 < echo $ECHO_N "checking mkl.h presence... $ECHO_C" >&6
8211 > echo "$as_me:$LINENO: checking CGAL/Cartesian.h presence" >&5
8212 > echo $ECHO_N "checking CGAL/Cartesian.h presence... $ECHO_C" >&6
8213   cat >conftest.$ac_ext <<_ACEOF
8214   /* confdefs.h.  */
8215   _ACEOF
8216   cat confdefs.h >>conftest.$ac_ext
8217   cat >>conftest.$ac_ext <<_ACEOF
8218   /* end confdefs.h.  */
8219 < #include <mkl.h>
8219 > #include <CGAL/Cartesian.h>
8220   _ACEOF
8221   if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
8222    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
# Line 7343 | Line 8227 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$a
8227    echo "$as_me:$LINENO: \$? = $ac_status" >&5
8228    (exit $ac_status); } >/dev/null; then
8229    if test -s conftest.err; then
8230 <    ac_cpp_err=$ac_c_preproc_warn_flag
8231 <    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
8230 >    ac_cpp_err=$ac_cxx_preproc_warn_flag
8231 >    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
8232    else
8233      ac_cpp_err=
8234    fi
# Line 7364 | Line 8248 | case $ac_header_compiler:$ac_header_preproc:$ac_c_prep
8248   echo "${ECHO_T}$ac_header_preproc" >&6
8249  
8250   # So?  What about this header?
8251 < case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
8251 > case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
8252    yes:no: )
8253 <    { echo "$as_me:$LINENO: WARNING: mkl.h: accepted by the compiler, rejected by the preprocessor!" >&5
8254 < echo "$as_me: WARNING: mkl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
8255 <    { echo "$as_me:$LINENO: WARNING: mkl.h: proceeding with the compiler's result" >&5
8256 < echo "$as_me: WARNING: mkl.h: proceeding with the compiler's result" >&2;}
8253 >    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: accepted by the compiler, rejected by the preprocessor!" >&5
8254 > echo "$as_me: WARNING: CGAL/Cartesian.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
8255 >    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: proceeding with the compiler's result" >&5
8256 > echo "$as_me: WARNING: CGAL/Cartesian.h: proceeding with the compiler's result" >&2;}
8257      ac_header_preproc=yes
8258      ;;
8259    no:yes:* )
8260 <    { echo "$as_me:$LINENO: WARNING: mkl.h: present but cannot be compiled" >&5
8261 < echo "$as_me: WARNING: mkl.h: present but cannot be compiled" >&2;}
8262 <    { echo "$as_me:$LINENO: WARNING: mkl.h:     check for missing prerequisite headers?" >&5
8263 < echo "$as_me: WARNING: mkl.h:     check for missing prerequisite headers?" >&2;}
8264 <    { echo "$as_me:$LINENO: WARNING: mkl.h: see the Autoconf documentation" >&5
8265 < echo "$as_me: WARNING: mkl.h: see the Autoconf documentation" >&2;}
8266 <    { echo "$as_me:$LINENO: WARNING: mkl.h:     section \"Present But Cannot Be Compiled\"" >&5
8267 < echo "$as_me: WARNING: mkl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
8268 <    { echo "$as_me:$LINENO: WARNING: mkl.h: proceeding with the preprocessor's result" >&5
8269 < echo "$as_me: WARNING: mkl.h: proceeding with the preprocessor's result" >&2;}
8270 <    { echo "$as_me:$LINENO: WARNING: mkl.h: in the future, the compiler will take precedence" >&5
8271 < echo "$as_me: WARNING: mkl.h: in the future, the compiler will take precedence" >&2;}
8260 >    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: present but cannot be compiled" >&5
8261 > echo "$as_me: WARNING: CGAL/Cartesian.h: present but cannot be compiled" >&2;}
8262 >    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h:     check for missing prerequisite headers?" >&5
8263 > echo "$as_me: WARNING: CGAL/Cartesian.h:     check for missing prerequisite headers?" >&2;}
8264 >    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: see the Autoconf documentation" >&5
8265 > echo "$as_me: WARNING: CGAL/Cartesian.h: see the Autoconf documentation" >&2;}
8266 >    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h:     section \"Present But Cannot Be Compiled\"" >&5
8267 > echo "$as_me: WARNING: CGAL/Cartesian.h:     section \"Present But Cannot Be Compiled\"" >&2;}
8268 >    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: proceeding with the preprocessor's result" >&5
8269 > echo "$as_me: WARNING: CGAL/Cartesian.h: proceeding with the preprocessor's result" >&2;}
8270 >    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: in the future, the compiler will take precedence" >&5
8271 > echo "$as_me: WARNING: CGAL/Cartesian.h: in the future, the compiler will take precedence" >&2;}
8272      (
8273        cat <<\_ASBOX
8274   ## ------------------------------ ##
# Line 7395 | Line 8279 | echo "$as_me:$LINENO: checking for mkl.h" >&5
8279        sed "s/^/$as_me: WARNING:     /" >&2
8280      ;;
8281   esac
8282 < echo "$as_me:$LINENO: checking for mkl.h" >&5
8283 < echo $ECHO_N "checking for mkl.h... $ECHO_C" >&6
8284 < if test "${ac_cv_header_mkl_h+set}" = set; then
8282 > echo "$as_me:$LINENO: checking for CGAL/Cartesian.h" >&5
8283 > echo $ECHO_N "checking for CGAL/Cartesian.h... $ECHO_C" >&6
8284 > if test "${ac_cv_header_CGAL_Cartesian_h+set}" = set; then
8285    echo $ECHO_N "(cached) $ECHO_C" >&6
8286   else
8287 <  ac_cv_header_mkl_h=$ac_header_preproc
8287 >  ac_cv_header_CGAL_Cartesian_h=$ac_header_preproc
8288   fi
8289 < echo "$as_me:$LINENO: result: $ac_cv_header_mkl_h" >&5
8290 < echo "${ECHO_T}$ac_cv_header_mkl_h" >&6
8289 > echo "$as_me:$LINENO: result: $ac_cv_header_CGAL_Cartesian_h" >&5
8290 > echo "${ECHO_T}$ac_cv_header_CGAL_Cartesian_h" >&6
8291  
8292   fi
8293 < if test $ac_cv_header_mkl_h = yes; then
8294 <
7411 <    echo "$as_me:$LINENO: checking for vslNewStream in -lmkl" >&5
7412 < echo $ECHO_N "checking for vslNewStream in -lmkl... $ECHO_C" >&6
7413 < if test "${ac_cv_lib_mkl_vslNewStream+set}" = set; then
7414 <  echo $ECHO_N "(cached) $ECHO_C" >&6
8293 > if test $ac_cv_header_CGAL_Cartesian_h = yes; then
8294 >  cgal=yes
8295   else
8296 <  ac_check_lib_save_LIBS=$LIBS
8297 < LIBS="-lmkl  $LIBS"
8296 >  cgal=no
8297 > fi
8298 >
8299 >
8300 >    CXXFLAGS="$save_CXXFLAGS"
8301 >
8302 >    if test "x$cgal" = xyes; then
8303 >      echo "$as_me:$LINENO: checking for CGAL version" >&5
8304 > echo $ECHO_N "checking for CGAL version... $ECHO_C" >&6
8305 >      LOCATION=${CGAL_INCLDIR}
8306 >      LOCATION=${LOCATION:-/usr/include}
8307 >      if test -f $LOCATION/CGAL/version.h; then
8308 >        CGAL_VERSION=`grep '#define.*\<CGAL_VERSION\>.*' $LOCATION/CGAL/version.h | sed 's/[^0-9\.]*//g'`
8309 >      else
8310 >        CGAL_VERSION=`grep '#define.*\<CGAL_VERSION\>.*' $LOCATION/CGAL/config.h | sed 's/[^0-9\.]*//g'`
8311 >      fi
8312 >      if echo $CGAL_VERSION | grep -q "^[3456789]"; then
8313 >        echo "$as_me:$LINENO: result: ($CGAL_VERSION) yes" >&5
8314 > echo "${ECHO_T}($CGAL_VERSION) yes" >&6
8315 >      else
8316 >        echo "$as_me:$LINENO: result: ($CGAL_VERSION) no" >&5
8317 > echo "${ECHO_T}($CGAL_VERSION) no" >&6
8318 >        cgal=no
8319 >      fi
8320 >    fi
8321 >
8322 >    if test "x$cgal" = xyes; then
8323 >      CGAL_LIBS="-lCGAL"
8324 >      echo "$as_me:$LINENO: checking whether CGAL uses LEDA" >&5
8325 > echo $ECHO_N "checking whether CGAL uses LEDA... $ECHO_C" >&6
8326 >      if echo $CGAL_CXXFLAGS | grep -q -- -DCGAL_USE_LEDA; then
8327 >        CGAL_USES_LEDA=yes
8328 >        echo "$as_me:$LINENO: result: yes" >&5
8329 > echo "${ECHO_T}yes" >&6
8330 >        CGAL_DEFINES="-DCGAL_USE_LEDA -DLEDA_PREFIX"
8331 >      else
8332 >        echo "$as_me:$LINENO: result: no" >&5
8333 > echo "${ECHO_T}no" >&6
8334 >        CGAL_USES_LEDA=no
8335 >      fi
8336 >
8337 >      echo "$as_me:$LINENO: checking whether CGAL uses GMP" >&5
8338 > echo $ECHO_N "checking whether CGAL uses GMP... $ECHO_C" >&6
8339 >      if echo $CGAL_CXXFLAGS | grep -q -- -DCGAL_USE_GMP; then
8340 >        CGAL_USES_GMP=yes
8341 >        echo "$as_me:$LINENO: result: yes" >&5
8342 > echo "${ECHO_T}yes" >&6
8343 >        CGAL_DEFINES="-DCGAL_USE_GMP $CGAL_DEFINES"
8344 >      else
8345 >        echo "$as_me:$LINENO: result: no" >&5
8346 > echo "${ECHO_T}no" >&6
8347 >        CGAL_USES_GMP=no
8348 >      fi
8349 >
8350 >      CGAL_LIBS="$CGAL_LIBS -lm"
8351 >
8352 >      CGAL_CXXFLAGS="-ftemplate-depth-50"
8353 >
8354 >      echo "CGAL_USES_LEDA     $CGAL_USES_LEDA"
8355 >      echo "CGAL_USES_GMP      $CGAL_USES_GMP"
8356 >      echo "CGAL_INCLDIR       $CGAL_INCLDIR"
8357 >      echo "CGAL_LIBDIR        $CGAL_LIBDIR"
8358 >      echo "CGAL_DEFINES       $CGAL_DEFINES"
8359 >      echo "CGAL_CXXFLAGS      $CGAL_CXXFLAGS"
8360 >      echo "CGAL_LIBS          $CGAL_LIBS"
8361 >    fi
8362 >
8363 >    if test "x$cgal" = xyes; then
8364 >      save_LIBS="$LIBS"
8365 >      LIBS="$LIBS -L$CGAL_LIBDIR"
8366 >      if test "x$CGAL_USES_LEDA" = xyes; then
8367 >        LIBS="-lL $LIBS -L$LEDA_LIBDIR"
8368 >      fi
8369 >      # if test "x$CGAL_USES_GMP" = xyes; then
8370 >      #   LIBS="-lgmp $LIBS $GMP_LIBDIR"
8371 >      # fi
8372 >      echo "$as_me:$LINENO: checking for ::CGAL::Cartesian<int>::Point_2 in -lCGAL" >&5
8373 > echo $ECHO_N "checking for ::CGAL::Cartesian<int>::Point_2 in -lCGAL... $ECHO_C" >&6
8374 > save_CXXFLAGS_CHECK_CXX_LIB="$CXXFLAGS"
8375 > CXXFLAGS="$CXXFLAGS -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR"
8376 > save_LIBS_CHECK_CXX_LIB="$LIBS"
8377 > LIBS="-lCGAL  $LIBS"
8378   cat >conftest.$ac_ext <<_ACEOF
8379   /* confdefs.h.  */
8380   _ACEOF
8381   cat confdefs.h >>conftest.$ac_ext
8382   cat >>conftest.$ac_ext <<_ACEOF
8383   /* end confdefs.h.  */
8384 <
7425 < /* Override any gcc2 internal prototype to avoid an error.  */
7426 < #ifdef __cplusplus
7427 < extern "C"
7428 < #endif
7429 < /* We use char because int might match the return type of a gcc2
7430 <   builtin and then its argument prototype would still apply.  */
7431 < char vslNewStream ();
8384 > #include <CGAL/Cartesian.h>
8385   int
8386   main ()
8387   {
8388 < vslNewStream ();
8388 > ::CGAL::Cartesian<int>::Point_2 P
8389    ;
8390    return 0;
8391   }
# Line 7446 | Line 8399 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8399    cat conftest.err >&5
8400    echo "$as_me:$LINENO: \$? = $ac_status" >&5
8401    (exit $ac_status); } &&
8402 <         { ac_try='test -z "$ac_c_werror_flag"
8402 >         { ac_try='test -z "$ac_cxx_werror_flag"
8403                           || test ! -s conftest.err'
8404    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8405    (eval $ac_try) 2>&5
# Line 7459 | Line 8412 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8412    ac_status=$?
8413    echo "$as_me:$LINENO: \$? = $ac_status" >&5
8414    (exit $ac_status); }; }; then
8415 <  ac_cv_lib_mkl_vslNewStream=yes
8415 >  echo "$as_me:$LINENO: result: yes" >&5
8416 > echo "${ECHO_T}yes" >&6
8417 > cgal=yes
8418   else
8419    echo "$as_me: failed program was:" >&5
8420   sed 's/^/| /' conftest.$ac_ext >&5
8421  
8422 < ac_cv_lib_mkl_vslNewStream=no
8422 > echo "$as_me:$LINENO: result: no" >&5
8423 > echo "${ECHO_T}no" >&6
8424 > cgal=no
8425   fi
8426   rm -f conftest.err conftest.$ac_objext \
8427        conftest$ac_exeext conftest.$ac_ext
8428 < LIBS=$ac_check_lib_save_LIBS
8428 > CXXFLAGS="$save_CXXFLAGS_CHECK_CXX_LIB"
8429 > LIBS="$save_LIBS_CHECK_CXX_LIB"
8430 >      LIBS="$save_LIBS"
8431 >    fi
8432 >
8433 >  fi
8434 >  ac_ext=c
8435 > ac_cpp='$CPP $CPPFLAGS'
8436 > ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
8437 > ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
8438 > ac_compiler_gnu=$ac_cv_c_compiler_gnu
8439 >
8440 >
8441   fi
7473 – echo "$as_me:$LINENO: result: $ac_cv_lib_mkl_vslNewStream" >&5
7474 – echo "${ECHO_T}$ac_cv_lib_mkl_vslNewStream" >&6
7475 – if test $ac_cv_lib_mkl_vslNewStream = yes; then
7476 –  MKL_LIBDIR="${mkldir}/lib/32",
7477 –                     MKL_LIB="-lmkl -lvml -lguide",
7478 –                     HAVE_MKL="yes"
7479 – fi
8442  
8443 + if test "x$cgal" = xyes; then
8444 +  USE_CGAL=yes
8445  
8446 + cat >>confdefs.h <<\_ACEOF
8447 + #define HAVE_CGAL 1
8448 + _ACEOF
8449 +
8450 +
8451 + cat >>confdefs.h <<_ACEOF
8452 + #define CGAL_VERSION $CGAL_VERSION
8453 + _ACEOF
8454 +
8455 +  if ! echo $CGAL_VERSION | grep -q "^3.0"; then
8456 +    { echo "$as_me:$LINENO: WARNING: *****************************************************" >&5
8457 + echo "$as_me: WARNING: *****************************************************" >&2;}
8458 +    { echo "$as_me:$LINENO: WARNING: *** Warning: Your CGAL version is newer than the  ***" >&5
8459 + echo "$as_me: WARNING: *** Warning: Your CGAL version is newer than the  ***" >&2;}
8460 +    { echo "$as_me:$LINENO: WARNING: *** supported versions. It may still work though. ***" >&5
8461 + echo "$as_me: WARNING: *** supported versions. It may still work though. ***" >&2;}
8462 +    { echo "$as_me:$LINENO: WARNING: *****************************************************" >&5
8463 + echo "$as_me: WARNING: *****************************************************" >&2;}
8464 +  fi
8465   else
8466 <  MKL_INC="-I${mkldir}/include"
8466 >   if test "x$cgal_makefile" != xno; then
8467 >    { echo "$as_me:$LINENO: WARNING: *********************************************************" >&5
8468 > echo "$as_me: WARNING: *********************************************************" >&2;}
8469 >    { echo "$as_me:$LINENO: WARNING: *** Warning: CGAL was not found.                      ***" >&5
8470 > echo "$as_me: WARNING: *** Warning: CGAL was not found.                      ***" >&2;}
8471 >    { echo "$as_me:$LINENO: WARNING: *** Run \"configure\" with the appropriate options.     ***" >&5
8472 > echo "$as_me: WARNING: *** Run \"configure\" with the appropriate options.     ***" >&2;}
8473 >    { echo "$as_me:$LINENO: WARNING: *** CGAL support will be disabled.                    ***" >&5
8474 > echo "$as_me: WARNING: *** CGAL support will be disabled.                    ***" >&2;}
8475 >    { echo "$as_me:$LINENO: WARNING: *********************************************************" >&5
8476 > echo "$as_me: WARNING: *********************************************************" >&2;}
8477 >  fi
8478 >  CGAL_INCLDIR=
8479 >  CGAL_LIBDIR=
8480 >  CGAL_RLIBDIR=
8481 >  CGAL_DEFINES=
8482 >  CGAL_CXXFLAGS=
8483 >  CGAL_LIBS=
8484   fi
8485  
8486  
8487 <  CPPFLAGS=$ac_save_CPPFLAGS
7488 <  LDFLAGS=$ac_save_LDFLAGS
7489 <  ac_ext=c
7490 < ac_cpp='$CPP $CPPFLAGS'
7491 < ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7492 < ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7493 < ac_compiler_gnu=$ac_cv_c_compiler_gnu
8487 > CGAL_INC_DIR="${CGAL_INCLDIR} ${CGAL_INCLCONFDIR}"
8488  
8489 + CGAL_LIB_DIR=${CGAL_LIBDIR}
8490  
8491 <  if test x_$HAVE_MKL != x_yes; then
8492 <        { { echo "$as_me:$LINENO: error: Can't build with MKL" >&5
8493 < echo "$as_me: error: Can't build with MKL" >&2;}
8491 > CGAL_RLIB_DIR=${CGAL_RLIBDIR}
8492 >
8493 >
8494 >
8495 >
8496 >
8497 >
8498 >
8499 > # Check whether --enable-doxygen or --disable-doxygen was given.
8500 > if test "${enable_doxygen+set}" = set; then
8501 >  enableval="$enable_doxygen"
8502 >
8503 > fi;
8504 > # Check whether --enable-dot or --disable-dot was given.
8505 > if test "${enable_dot+set}" = set; then
8506 >  enableval="$enable_dot"
8507 >
8508 > fi;
8509 > # Check whether --enable-html-docs or --disable-html-docs was given.
8510 > if test "${enable_html_docs+set}" = set; then
8511 >  enableval="$enable_html_docs"
8512 >
8513 > else
8514 >   enable_html_docs=yes
8515 > fi;
8516 > # Check whether --enable-latex-docs or --disable-latex-docs was given.
8517 > if test "${enable_latex_docs+set}" = set; then
8518 >  enableval="$enable_latex_docs"
8519 >
8520 > else
8521 >   enable_latex_docs=no
8522 > fi;
8523 > if test "x$enable_doxygen" = xno; then
8524 >        enable_doc=no
8525 > else
8526 >        # Extract the first word of "doxygen", so it can be a program name with args.
8527 > set dummy doxygen; ac_word=$2
8528 > echo "$as_me:$LINENO: checking for $ac_word" >&5
8529 > echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
8530 > if test "${ac_cv_path_DOXYGEN+set}" = set; then
8531 >  echo $ECHO_N "(cached) $ECHO_C" >&6
8532 > else
8533 >  case $DOXYGEN in
8534 >  [\\/]* | ?:[\\/]*)
8535 >  ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path.
8536 >  ;;
8537 >  *)
8538 >  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8539 > for as_dir in $PATH
8540 > do
8541 >  IFS=$as_save_IFS
8542 >  test -z "$as_dir" && as_dir=.
8543 >  for ac_exec_ext in '' $ac_executable_extensions; do
8544 >  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8545 >    ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"
8546 >    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8547 >    break 2
8548 >  fi
8549 > done
8550 > done
8551 >
8552 >  ;;
8553 > esac
8554 > fi
8555 > DOXYGEN=$ac_cv_path_DOXYGEN
8556 >
8557 > if test -n "$DOXYGEN"; then
8558 >  echo "$as_me:$LINENO: result: $DOXYGEN" >&5
8559 > echo "${ECHO_T}$DOXYGEN" >&6
8560 > else
8561 >  echo "$as_me:$LINENO: result: no" >&5
8562 > echo "${ECHO_T}no" >&6
8563 > fi
8564 >
8565 >        if test "x$DOXYGEN" = x; then
8566 >                if test "x$enable_doxygen" = xyes; then
8567 >                        { { echo "$as_me:$LINENO: error: could not find doxygen" >&5
8568 > echo "$as_me: error: could not find doxygen" >&2;}
8569     { (exit 1); exit 1; }; }
8570 +                fi
8571 +                enable_doc=no
8572 +        else
8573 +                enable_doc=yes
8574 +                # Extract the first word of "dot", so it can be a program name with args.
8575 + set dummy dot; ac_word=$2
8576 + echo "$as_me:$LINENO: checking for $ac_word" >&5
8577 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
8578 + if test "${ac_cv_path_DOT+set}" = set; then
8579 +  echo $ECHO_N "(cached) $ECHO_C" >&6
8580 + else
8581 +  case $DOT in
8582 +  [\\/]* | ?:[\\/]*)
8583 +  ac_cv_path_DOT="$DOT" # Let the user override the test with a path.
8584 +  ;;
8585 +  *)
8586 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8587 + for as_dir in $PATH
8588 + do
8589 +  IFS=$as_save_IFS
8590 +  test -z "$as_dir" && as_dir=.
8591 +  for ac_exec_ext in '' $ac_executable_extensions; do
8592 +  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8593 +    ac_cv_path_DOT="$as_dir/$ac_word$ac_exec_ext"
8594 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8595 +    break 2
8596    fi
8597 + done
8598 + done
8599  
8600 +  ;;
8601 + esac
8602 + fi
8603 + DOT=$ac_cv_path_DOT
8604  
8605 + if test -n "$DOT"; then
8606 +  echo "$as_me:$LINENO: result: $DOT" >&5
8607 + echo "${ECHO_T}$DOT" >&6
8608 + else
8609 +  echo "$as_me:$LINENO: result: no" >&5
8610 + echo "${ECHO_T}no" >&6
8611 + fi
8612  
8613 +        fi
8614 + fi
8615  
8616 + if test "x$enable_doc" = xyes; then
8617 +  DOC=1
8618 + else
8619 +  DOC=0
8620 + fi
8621  
8622 +
8623 + if test x$DOT = x; then
8624 +        if test "x$enable_dot" = xyes; then
8625 +                { { echo "$as_me:$LINENO: error: could not find dot" >&5
8626 + echo "$as_me: error: could not find dot" >&2;}
8627 +   { (exit 1); exit 1; }; }
8628 +        fi
8629 +        enable_dot=no
8630   else
8631 +        enable_dot=yes
8632 + fi
8633  
7508 –    echo "$as_me:$LINENO: result: no" >&5
7509 – echo "${ECHO_T}no" >&6
8634  
7511 – fi;
8635  
8636  
8637  
# Line 7537 | Line 8660 | SUBDIRS="libBASS libmdtools src forceFields samples ut
8660  
8661   MKINSTALLDIRS=`pwd`/ac-tools/"shtool mkdir -p -f"
8662  
7540 – SUBDIRS="libBASS libmdtools src forceFields samples utils utils/sysbuilder third-party "
7541 –
8663   CFLAGS=${CFLAGS-""}
8664   CXXFLAGS=${CXXFLAGS-""}
8665   CPPFLAGS=${CPPFLAGS-""}
# Line 7572 | Line 8693 | esac
8693  
8694  
8695  
7575 –                    ac_config_headers="$ac_config_headers libBASS/config.h libmdtools/config.h"
8696  
8697 <                                                                                                                                                                                                                            ac_config_files="$ac_config_files Makefile libBASS/Makefile libmdtools/Makefile src/Makefile utils/Makefile utils/sysbuilder/Makefile forceFields/Makefile samples/Makefile third-party/Makefile samples/alkane/Makefile samples/argon/Makefile samples/lipid/Makefile samples/minimizer/Makefile samples/metals/Makefile samples/water/Makefile samples/water/dimer/Makefile samples/water/spce/Makefile samples/water/ssd/Makefile samples/water/ssde/Makefile samples/water/tip4p/Makefile samples/water/tip3p_ice/Makefile samples/zcons/Makefile"
8697 >          ac_config_headers="$ac_config_headers src/config.h"
8698  
8699 +                              ac_config_files="$ac_config_files make/Makefile src/utils/Makefile src/applications/nanoRodBuilder/Makefile"
8700  
8701 +
8702   cat >confcache <<\_ACEOF
8703   # This file is a shell script that caches the results of configure
8704   # tests run on this system so they can be shared between configure
# Line 7939 | Line 9061 | This file was extended by OOPSE $as_me 1.0, which was
9061   } >&5
9062   cat >&5 <<_CSEOF
9063  
9064 < This file was extended by OOPSE $as_me 1.0, which was
9064 > This file was extended by OOPSE $as_me 2.0, which was
9065   generated by GNU Autoconf 2.59.  Invocation command line was
9066  
9067    CONFIG_FILES    = $CONFIG_FILES
# Line 8002 | Line 9124 | OOPSE config.status 1.0
9124  
9125   cat >>$CONFIG_STATUS <<_ACEOF
9126   ac_cs_version="\\
9127 < OOPSE config.status 1.0
9127 > OOPSE config.status 2.0
9128   configured by $0, generated by GNU Autoconf 2.59,
9129    with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
9130  
# Line 8105 | Line 9227 | do
9227   do
9228    case "$ac_config_target" in
9229    # Handling of arguments.
9230 <  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
9231 <  "libBASS/Makefile" ) CONFIG_FILES="$CONFIG_FILES libBASS/Makefile" ;;
9232 <  "libmdtools/Makefile" ) CONFIG_FILES="$CONFIG_FILES libmdtools/Makefile" ;;
9233 <  "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
9234 <  "utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;;
8113 <  "utils/sysbuilder/Makefile" ) CONFIG_FILES="$CONFIG_FILES utils/sysbuilder/Makefile" ;;
8114 <  "forceFields/Makefile" ) CONFIG_FILES="$CONFIG_FILES forceFields/Makefile" ;;
8115 <  "samples/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;;
8116 <  "third-party/Makefile" ) CONFIG_FILES="$CONFIG_FILES third-party/Makefile" ;;
8117 <  "samples/alkane/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/alkane/Makefile" ;;
8118 <  "samples/argon/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/argon/Makefile" ;;
8119 <  "samples/lipid/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/lipid/Makefile" ;;
8120 <  "samples/minimizer/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/minimizer/Makefile" ;;
8121 <  "samples/metals/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/metals/Makefile" ;;
8122 <  "samples/water/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/water/Makefile" ;;
8123 <  "samples/water/dimer/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/water/dimer/Makefile" ;;
8124 <  "samples/water/spce/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/water/spce/Makefile" ;;
8125 <  "samples/water/ssd/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/water/ssd/Makefile" ;;
8126 <  "samples/water/ssde/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/water/ssde/Makefile" ;;
8127 <  "samples/water/tip4p/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/water/tip4p/Makefile" ;;
8128 <  "samples/water/tip3p_ice/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/water/tip3p_ice/Makefile" ;;
8129 <  "samples/zcons/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/zcons/Makefile" ;;
8130 <  "utils/getopt.h" ) CONFIG_LINKS="$CONFIG_LINKS utils/getopt.h:utils/gnugetopt.h" ;;
8131 <  "libBASS/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS libBASS/config.h" ;;
8132 <  "libmdtools/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS libmdtools/config.h" ;;
9230 >  "make/Makefile" ) CONFIG_FILES="$CONFIG_FILES make/Makefile" ;;
9231 >  "src/utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/utils/Makefile" ;;
9232 >  "src/applications/nanoRodBuilder/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/applications/nanoRodBuilder/Makefile" ;;
9233 >  "src/getopt.h" ) CONFIG_LINKS="$CONFIG_LINKS src/getopt.h:src/utils/gnugetopt.h" ;;
9234 >  "src/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
9235    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
9236   echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
9237     { (exit 1); exit 1; }; };;
# Line 8249 | Line 9351 | s,@CPP@,$CPP,;t t
9351   s,@F90_WORK_FILES_ARG@,$F90_WORK_FILES_ARG,;t t
9352   s,@MODDIRFLAG@,$MODDIRFLAG,;t t
9353   s,@F90MODINCSPEC@,$F90MODINCSPEC,;t t
9354 + s,@F90_MODULE_NAMES@,$F90_MODULE_NAMES,;t t
9355   s,@CPP@,$CPP,;t t
9356   s,@EGREP@,$EGREP,;t t
9357   s,@LIBOBJS@,$LIBOBJS,;t t
# Line 8264 | Line 9367 | s,@MPI_LIB_DIR@,$MPI_LIB_DIR,;t t
9367   s,@LEXLIB@,$LEXLIB,;t t
9368   s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
9369   s,@AR@,$AR,;t t
9370 + s,@PS@,$PS,;t t
9371   s,@MPI_LIB_DIR@,$MPI_LIB_DIR,;t t
9372   s,@MPI_INC_DIR@,$MPI_INC_DIR,;t t
9373   s,@MPI_F90_INC@,$MPI_F90_INC,;t t
9374   s,@MPI_LIB@,$MPI_LIB,;t t
9375   s,@MPI_F90_LIB@,$MPI_F90_LIB,;t t
9376   s,@USE_MPI@,$USE_MPI,;t t
9377 < s,@SPRNG_LIB_DIR@,$SPRNG_LIB_DIR,;t t
9378 < s,@SPRNG_INC_DIR@,$SPRNG_INC_DIR,;t t
9379 < s,@SPRNG_LIB@,$SPRNG_LIB,;t t
9380 < s,@USE_SPRNG@,$USE_SPRNG,;t t
9381 < s,@MKL_LIBDIR@,$MKL_LIBDIR,;t t
9382 < s,@MKL_LIB@,$MKL_LIB,;t t
9383 < s,@MKL_INC@,$MKL_INC,;t t
9384 < s,@HAVE_MKL@,$HAVE_MKL,;t t
9377 > s,@CXXCPP@,$CXXCPP,;t t
9378 > s,@USE_CGAL@,$USE_CGAL,;t t
9379 > s,@CGAL_INC_DIR@,$CGAL_INC_DIR,;t t
9380 > s,@CGAL_LIB_DIR@,$CGAL_LIB_DIR,;t t
9381 > s,@CGAL_RLIB_DIR@,$CGAL_RLIB_DIR,;t t
9382 > s,@CGAL_DEFINES@,$CGAL_DEFINES,;t t
9383 > s,@CGAL_CXXFLAGS@,$CGAL_CXXFLAGS,;t t
9384 > s,@CGAL_LIBS@,$CGAL_LIBS,;t t
9385 > s,@DOXYGEN@,$DOXYGEN,;t t
9386 > s,@DOT@,$DOT,;t t
9387 > s,@DOC@,$DOC,;t t
9388 > s,@enable_dot@,$enable_dot,;t t
9389 > s,@enable_html_docs@,$enable_html_docs,;t t
9390 > s,@enable_latex_docs@,$enable_latex_docs,;t t
9391   s,@BATEXT@,$BATEXT,;t t
9392   s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
9393   s,@OOPSE@,$OOPSE,;t t

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines