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

Comparing trunk/OOPSE-4/configure (file contents):
Revision 1499 by gezelter, Tue Sep 28 22:14:11 2004 UTC vs.
Revision 2315 by gezelter, Tue Sep 20 22:03:35 2005 UTC

# Line 273 | Line 273 | ac_unique_file="src/applications/oopse.cpp"
273   PACKAGE_STRING='OOPSE 2.0'
274   PACKAGE_BUGREPORT='gezelter@nd.edu'
275  
276 < ac_unique_file="src/applications/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 PERLINTERP PERL_SHEBANG 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 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-zlib=DIR root directory path of zlib installation defaults to
883 +                    /usr/local or /usr if not found in /usr/local
884 +  --without-zlib to disable zlib usage completely
885 +  --with-perl-shebang     override what perl thinks is the way for the kernel
886 +                          to start it (seldom needed)
887    --with-mpi=<prefix>     compile with MPI installed in <prefix> [default=no]
888 <  --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
888 >  --with-cgal-makefile=FILE  CGAL makefile that should be used
889  
890   Some influential environment variables:
891    CC          C compiler command
# Line 888 | Line 899 | Some influential environment variables:
899    F90         Fortran 90 compiler command
900    F90FLAGS    Fortran 90 compiler flags
901    CPP         C preprocessor
902 +  CXXCPP      C++ preprocessor
903  
904   Use these variables to override the choices made by `configure' or to help
905   it to find libraries and programs with nonstandard names/locations.
# Line 1813 | Line 1825 | ac_configure="$SHELL $ac_aux_dir/configure" # This sho
1825   # $SHELLVAR to the Fortran 95 mangled name.  If the SHELLVAR
1826   # argument is not supplied, it defaults to NAME.
1827   # AC_F95_FUNC
1828 +
1829 + # AC_F90_MODULE_NAMES
1830 + # -------------------
1831 + #
1832 + # Figure out how the Fortran 90 compiler constructs module file names
1833 + #
1834 + # AC_F90_MODULE_NAMES
1835 +
1836 +
1837 +
1838 +
1839  
1840  
1841  
# Line 1862 | Line 1885 | ac_configure="$SHELL $ac_aux_dir/configure" # This sho
1885  
1886  
1887  
1888 + #
1889 + #
1890 + #
1891  
1892  
1893  
1894  
1895  
1896  
1897 +
1898 +
1899   # set program name
1900   PROGNAME="oopse"
1901  
# Line 1947 | Line 1975 | ac_ext=c
1975  
1976  
1977  
1978 +
1979 +
1980   ac_ext=c
1981   ac_cpp='$CPP $CPPFLAGS'
1982   ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
# Line 3525 | Line 3555 | F90FLAGS="$F90FLAGS $ac_verb"
3555   ac_save_F90FLAGS=$F90FLAGS
3556   F90FLAGS="$F90FLAGS $ac_verb"
3557  
3558 < (eval echo $as_me:3528: \"$ac_link\") >&5
3558 > (eval echo $as_me:3558: \"$ac_link\") >&5
3559   ac_f90_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
3560   echo "$ac_f90_v_output" >&5
3561   F90FLAGS=$ac_save_F90FLAGS
# Line 3602 | Line 3632 | F90FLAGS="$F90FLAGS $ac_cv_prog_f90_v"
3632   ac_save_F90FLAGS=$F90FLAGS
3633   F90FLAGS="$F90FLAGS $ac_cv_prog_f90_v"
3634  
3635 < (eval echo $as_me:3605: \"$ac_link\") >&5
3635 > (eval echo $as_me:3635: \"$ac_link\") >&5
3636   ac_f90_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
3637   echo "$ac_f90_v_output" >&5
3638   F90FLAGS=$ac_save_F90FLAGS
# Line 4197 | Line 4227 | fi
4227  
4228     rm -f conftest* conf/conftest* conf/CONFTEST* CONFTEST* conf/mpimod*
4229     if test $madedir = 1 ; then rmdir conf ; fi
4230 + fi
4231 +
4232 +
4233 + echo "$as_me:$LINENO: checking for Fortran 90 module file names" >&5
4234 + echo $ECHO_N "checking for Fortran 90 module file names... $ECHO_C" >&6
4235 + if test "${ac_cv_f90_module_names+set}" = set; then
4236 +  echo $ECHO_N "(cached) $ECHO_C" >&6
4237 + else
4238 +  ac_ext=f90
4239 + ac_compile='$F90 -c $F90FLAGS conftest.$ac_ext >&5'
4240 + ac_link='$F90 -o conftest$ac_exeext $F90FLAGS $LD90FLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4241 + ac_compiler_gnu=$ac_cv_f90_compiler_gnu
4242 +
4243 + # carry out the test in a new directory, so that we don't miss anything
4244 + mkdir conftest
4245 + cd conftest
4246 + cat >conftest.$ac_ext <<_ACEOF
4247 + MODULE Bar
4248 + END MODULE Bar
4249 + _ACEOF
4250 + rm -f conftest.$ac_objext
4251 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4252 +  (eval $ac_compile) 2>conftest.er1
4253 +  ac_status=$?
4254 +  grep -v '^ *+' conftest.er1 >conftest.err
4255 +  rm -f conftest.er1
4256 +  cat conftest.err >&5
4257 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4258 +  (exit $ac_status); } &&
4259 +         { ac_try='test -z "$ac_f90_werror_flag"
4260 +                         || test ! -s conftest.err'
4261 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4262 +  (eval $ac_try) 2>&5
4263 +  ac_status=$?
4264 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4265 +  (exit $ac_status); }; } &&
4266 +         { ac_try='test -s conftest.$ac_objext'
4267 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4268 +  (eval $ac_try) 2>&5
4269 +  ac_status=$?
4270 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
4271 +  (exit $ac_status); }; }; then
4272 +  ac_cv_f90_module_names=
4273 + ac_file_list=*
4274 + for ac_file in $ac_file_list; do
4275 +   case $ac_file in
4276 +      # don't care for original source and object files
4277 +      conftest.$ac_ext | conftest.$ac_objext | conftest.err )
4278 +          :
4279 +          ;;
4280 +      # look for new files derived from the file name
4281 +      *conftest*)
4282 +          ac_pat=`echo $ac_file | sed s/conftest/%FILE%/`
4283 +            ac_exists=false
4284 +  for ac_i in $ac_cv_f90_module_names; do
4285 +    if test x"$ac_pat" = x"$ac_i"; then
4286 +      ac_exists=true
4287 +      break
4288 +    fi
4289 +  done
4290 +
4291 +  if test x"$ac_exists" = xtrue; then
4292 +  :
4293 + else
4294 +  ac_cv_f90_module_names="$ac_cv_f90_module_names $ac_pat"
4295 + fi
4296 +
4297 +          ;;
4298 +      # look for new files derived from the module name,
4299 +      # with different case translation schemes
4300 +      *Bar*)
4301 +          ac_pat=`echo $ac_file | sed s/Bar/%Module%/`
4302 +            ac_exists=false
4303 +  for ac_i in $ac_cv_f90_module_names; do
4304 +    if test x"$ac_pat" = x"$ac_i"; then
4305 +      ac_exists=true
4306 +      break
4307 +    fi
4308 +  done
4309 +
4310 +  if test x"$ac_exists" = xtrue; then
4311 +  :
4312 + else
4313 +  ac_cv_f90_module_names="$ac_cv_f90_module_names $ac_pat"
4314 + fi
4315 +
4316 +          ;;
4317 +      *bar*)
4318 +          ac_pat=`echo $ac_file | sed s/bar/%module%/`
4319 +            ac_exists=false
4320 +  for ac_i in $ac_cv_f90_module_names; do
4321 +    if test x"$ac_pat" = x"$ac_i"; then
4322 +      ac_exists=true
4323 +      break
4324 +    fi
4325 +  done
4326 +
4327 +  if test x"$ac_exists" = xtrue; then
4328 +  :
4329 + else
4330 +  ac_cv_f90_module_names="$ac_cv_f90_module_names $ac_pat"
4331   fi
4332  
4333 +          ;;
4334 +      *BAR*)
4335 +          ac_pat=`echo $ac_file | sed s/BAR/%MODULE%/`
4336 +            ac_exists=false
4337 +  for ac_i in $ac_cv_f90_module_names; do
4338 +    if test x"$ac_pat" = x"$ac_i"; then
4339 +      ac_exists=true
4340 +      break
4341 +    fi
4342 +  done
4343  
4344 +  if test x"$ac_exists" = xtrue; then
4345 +  :
4346 + else
4347 +  ac_cv_f90_module_names="$ac_cv_f90_module_names $ac_pat"
4348 + fi
4349 +
4350 +          ;;
4351 +       # Other files - we have no idea how they are generated
4352 +       *)
4353 +          { echo "$as_me:$LINENO: WARNING: Bogus file found: $ac_file" >&5
4354 + echo "$as_me: WARNING: Bogus file found: $ac_file" >&2;}
4355 +          ;;
4356 +   esac
4357 + done
4358 + if test "x$ac_cv_f90_module_names" = "x"; then
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 +
4363 + else
4364 +  echo "$as_me: failed program was:" >&5
4365 + sed 's/^/| /' conftest.$ac_ext >&5
4366 +
4367 + ac_cv_f90_module_names=
4368 + { echo "$as_me:$LINENO: WARNING: Couldn't determine module file names" >&5
4369 + echo "$as_me: WARNING: Couldn't determine module file names" >&2;}
4370 + fi
4371 + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
4372 + cd ..
4373 + # cleanup
4374 + rm -rf conftest
4375 + ac_ext=f90
4376 + ac_compile='$F90 -c $F90FLAGS conftest.$ac_ext >&5'
4377 + ac_link='$F90 -o conftest$ac_exeext $F90FLAGS $LD90FLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4378 + ac_compiler_gnu=$ac_cv_f90_compiler_gnu
4379 +
4380 + fi
4381 + echo "$as_me:$LINENO: result: $ac_cv_f90_module_names" >&5
4382 + echo "${ECHO_T}$ac_cv_f90_module_names" >&6 # AC_CACHE_CHECK
4383 +
4384 + # We now generate a shell script that will help us to figure out the correct
4385 + # module file names, using the value of ac_cv_f90_module_names
4386 +
4387 + echo "Generating shell script modnam"
4388 +
4389 + cat > scripts/modnam << EOF
4390 + #! /bin/sh
4391 + # This script is auto-generated by configure
4392 + #
4393 + usage="\\
4394 + Usage: \$0 [FILES]
4395 +
4396 + [FILES] are Fortran 90 source files.
4397 + The output is a list of module file names that the Fortran 90 compiler
4398 + generates when compiling [FILES]."
4399 +
4400 + list=
4401 + empty=
4402 +
4403 + if test \$# -eq 0; then
4404 +   echo "\$usage"; exit 0
4405 + fi
4406 +
4407 + while test \$# != 0; do
4408 +
4409 +  file=\$1
4410 +  shift
4411 +
4412 + # strip suffix
4413 +  base=\`echo \$file | sed 's/[.][^.]*$//'\`
4414 +
4415 +  test ! -f \$file && continue
4416 +
4417 + # Look for module definitions and transform them to upper / lower case
4418 +  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/'\`
4419 +  upper=\`echo \$mods | tr a-z A-Z\`
4420 +  lower=\`echo \$mods | tr A-Z a-z\`
4421 +
4422 + # Here, the patterns for generating module file names were inserted by configure
4423 +  for trans in $ac_cv_f90_module_names; do
4424 +
4425 +    pat=\`echo \$trans | sed 's/.*\(%.*%\).*/\1/'\`
4426 +    var=empty
4427 +    case \$pat in
4428 +       %MODULE%)
4429 +          var=upper ;;
4430 +       %Module%)
4431 +          var=mods ;;
4432 +       %module%)
4433 +          var=lower ;;
4434 +       %FILE%)
4435 +          test -n "\$mods" && var=base ;;
4436 +    esac
4437 +    new=\`eval '(for i in \$'\$var '; do echo \$trans | sed s/\$pat/\$i/; done)'\`
4438 +    list="\$list \$new"
4439 +  done
4440 + done
4441 +
4442 + echo \$list
4443 + # end of configure-generated script
4444 + EOF
4445 + chmod 755 scripts/modnam
4446 +
4447 + pat=`echo $ac_cv_f90_module_names | sed 's/.*\(%.*%\).*/\1/'`
4448 + F90_MODULE_NAMES=empty
4449 + case $pat in
4450 +       %MODULE%)
4451 +          F90_MODULE_NAMES=UPPER ;;
4452 +       %Module%)
4453 +          F90_MODULE_NAMES=Mixed ;;
4454 +       %module%)
4455 +          F90_MODULE_NAMES=lower ;;
4456 +       *)
4457 +          F90_MODULE_NAMES=unknown ;;
4458 + esac
4459 +
4460   ac_ext=c
4461   ac_cpp='$CPP $CPPFLAGS'
4462   ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
# Line 4699 | Line 4956 | done
4956   fi
4957  
4958   done
4959 +
4960 +
4961 + #
4962 + # Handle user hints
4963 + #
4964 + echo "$as_me:$LINENO: checking if zlib is wanted" >&5
4965 + echo $ECHO_N "checking if zlib is wanted... $ECHO_C" >&6
4966 +
4967 + # Check whether --with-zlib or --without-zlib was given.
4968 + if test "${with_zlib+set}" = set; then
4969 +  withval="$with_zlib"
4970 +  if test "$withval" != no ; then
4971 +  echo "$as_me:$LINENO: result: yes" >&5
4972 + echo "${ECHO_T}yes" >&6
4973 +  if test -d "$withval"
4974 +  then
4975 +    ZLIB_HOME="$withval"
4976 +  else
4977 +    { echo "$as_me:$LINENO: WARNING: Sorry, $withval does not exist, checking usual places" >&5
4978 + echo "$as_me: WARNING: Sorry, $withval does not exist, checking usual places" >&2;}
4979 +  fi
4980 + else
4981 +  echo "$as_me:$LINENO: result: no" >&5
4982 + echo "${ECHO_T}no" >&6
4983 + fi
4984 + fi;
4985 +
4986 + ZLIB_HOME=/usr/local
4987 + if test ! -f "${ZLIB_HOME}/include/zlib.h"
4988 + then
4989 +        ZLIB_HOME=/usr
4990 + fi
4991 +
4992 + #
4993 + # Locate zlib, if wanted
4994 + #
4995 + if test -n "${ZLIB_HOME}"
4996 + then
4997 +        ZLIB_OLD_LDFLAGS=$LDFLAGS
4998 +        ZLIB_OLD_CPPFLAGS=$LDFLAGS
4999 +        LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
5000 +        CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
5001 +
5002 +
5003 +        ac_ext=c
5004 + ac_cpp='$CPP $CPPFLAGS'
5005 + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
5006 + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
5007 + ac_compiler_gnu=$ac_cv_c_compiler_gnu
5008 +
5009 +        echo "$as_me:$LINENO: checking for inflateEnd in -lz" >&5
5010 + echo $ECHO_N "checking for inflateEnd in -lz... $ECHO_C" >&6
5011 + if test "${ac_cv_lib_z_inflateEnd+set}" = set; then
5012 +  echo $ECHO_N "(cached) $ECHO_C" >&6
5013 + else
5014 +  ac_check_lib_save_LIBS=$LIBS
5015 + LIBS="-lz  $LIBS"
5016 + cat >conftest.$ac_ext <<_ACEOF
5017 + /* confdefs.h.  */
5018 + _ACEOF
5019 + cat confdefs.h >>conftest.$ac_ext
5020 + cat >>conftest.$ac_ext <<_ACEOF
5021 + /* end confdefs.h.  */
5022 +
5023 + /* Override any gcc2 internal prototype to avoid an error.  */
5024 + #ifdef __cplusplus
5025 + extern "C"
5026 + #endif
5027 + /* We use char because int might match the return type of a gcc2
5028 +   builtin and then its argument prototype would still apply.  */
5029 + char inflateEnd ();
5030 + int
5031 + main ()
5032 + {
5033 + inflateEnd ();
5034 +  ;
5035 +  return 0;
5036 + }
5037 + _ACEOF
5038 + rm -f conftest.$ac_objext conftest$ac_exeext
5039 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5040 +  (eval $ac_link) 2>conftest.er1
5041 +  ac_status=$?
5042 +  grep -v '^ *+' conftest.er1 >conftest.err
5043 +  rm -f conftest.er1
5044 +  cat conftest.err >&5
5045 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5046 +  (exit $ac_status); } &&
5047 +         { ac_try='test -z "$ac_c_werror_flag"
5048 +                         || test ! -s conftest.err'
5049 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5050 +  (eval $ac_try) 2>&5
5051 +  ac_status=$?
5052 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5053 +  (exit $ac_status); }; } &&
5054 +         { ac_try='test -s conftest$ac_exeext'
5055 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5056 +  (eval $ac_try) 2>&5
5057 +  ac_status=$?
5058 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5059 +  (exit $ac_status); }; }; then
5060 +  ac_cv_lib_z_inflateEnd=yes
5061 + else
5062 +  echo "$as_me: failed program was:" >&5
5063 + sed 's/^/| /' conftest.$ac_ext >&5
5064 +
5065 + ac_cv_lib_z_inflateEnd=no
5066 + fi
5067 + rm -f conftest.err conftest.$ac_objext \
5068 +      conftest$ac_exeext conftest.$ac_ext
5069 + LIBS=$ac_check_lib_save_LIBS
5070 + fi
5071 + echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflateEnd" >&5
5072 + echo "${ECHO_T}$ac_cv_lib_z_inflateEnd" >&6
5073 + if test $ac_cv_lib_z_inflateEnd = yes; then
5074 +  zlib_cv_libz=yes
5075 + else
5076 +  zlib_cv_libz=no
5077 + fi
5078  
5079 +        if test "${ac_cv_header_zlib_h+set}" = set; then
5080 +  echo "$as_me:$LINENO: checking for zlib.h" >&5
5081 + echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
5082 + if test "${ac_cv_header_zlib_h+set}" = set; then
5083 +  echo $ECHO_N "(cached) $ECHO_C" >&6
5084 + fi
5085 + echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
5086 + echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
5087 + else
5088 +  # Is the header compilable?
5089 + echo "$as_me:$LINENO: checking zlib.h usability" >&5
5090 + echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6
5091 + cat >conftest.$ac_ext <<_ACEOF
5092 + /* confdefs.h.  */
5093 + _ACEOF
5094 + cat confdefs.h >>conftest.$ac_ext
5095 + cat >>conftest.$ac_ext <<_ACEOF
5096 + /* end confdefs.h.  */
5097 + $ac_includes_default
5098 + #include <zlib.h>
5099 + _ACEOF
5100 + rm -f conftest.$ac_objext
5101 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5102 +  (eval $ac_compile) 2>conftest.er1
5103 +  ac_status=$?
5104 +  grep -v '^ *+' conftest.er1 >conftest.err
5105 +  rm -f conftest.er1
5106 +  cat conftest.err >&5
5107 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5108 +  (exit $ac_status); } &&
5109 +         { ac_try='test -z "$ac_c_werror_flag"
5110 +                         || test ! -s conftest.err'
5111 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5112 +  (eval $ac_try) 2>&5
5113 +  ac_status=$?
5114 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5115 +  (exit $ac_status); }; } &&
5116 +         { ac_try='test -s conftest.$ac_objext'
5117 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5118 +  (eval $ac_try) 2>&5
5119 +  ac_status=$?
5120 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5121 +  (exit $ac_status); }; }; then
5122 +  ac_header_compiler=yes
5123 + else
5124 +  echo "$as_me: failed program was:" >&5
5125 + sed 's/^/| /' conftest.$ac_ext >&5
5126  
5127 + ac_header_compiler=no
5128 + fi
5129 + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
5130 + echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
5131 + echo "${ECHO_T}$ac_header_compiler" >&6
5132 +
5133 + # Is the header present?
5134 + echo "$as_me:$LINENO: checking zlib.h presence" >&5
5135 + echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6
5136 + cat >conftest.$ac_ext <<_ACEOF
5137 + /* confdefs.h.  */
5138 + _ACEOF
5139 + cat confdefs.h >>conftest.$ac_ext
5140 + cat >>conftest.$ac_ext <<_ACEOF
5141 + /* end confdefs.h.  */
5142 + #include <zlib.h>
5143 + _ACEOF
5144 + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
5145 +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
5146 +  ac_status=$?
5147 +  grep -v '^ *+' conftest.er1 >conftest.err
5148 +  rm -f conftest.er1
5149 +  cat conftest.err >&5
5150 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5151 +  (exit $ac_status); } >/dev/null; then
5152 +  if test -s conftest.err; then
5153 +    ac_cpp_err=$ac_c_preproc_warn_flag
5154 +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
5155 +  else
5156 +    ac_cpp_err=
5157 +  fi
5158 + else
5159 +  ac_cpp_err=yes
5160 + fi
5161 + if test -z "$ac_cpp_err"; then
5162 +  ac_header_preproc=yes
5163 + else
5164 +  echo "$as_me: failed program was:" >&5
5165 + sed 's/^/| /' conftest.$ac_ext >&5
5166 +
5167 +  ac_header_preproc=no
5168 + fi
5169 + rm -f conftest.err conftest.$ac_ext
5170 + echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
5171 + echo "${ECHO_T}$ac_header_preproc" >&6
5172 +
5173 + # So?  What about this header?
5174 + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
5175 +  yes:no: )
5176 +    { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
5177 + echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
5178 +    { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
5179 + echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
5180 +    ac_header_preproc=yes
5181 +    ;;
5182 +  no:yes:* )
5183 +    { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
5184 + echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
5185 +    { echo "$as_me:$LINENO: WARNING: zlib.h:     check for missing prerequisite headers?" >&5
5186 + echo "$as_me: WARNING: zlib.h:     check for missing prerequisite headers?" >&2;}
5187 +    { echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5
5188 + echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
5189 +    { echo "$as_me:$LINENO: WARNING: zlib.h:     section \"Present But Cannot Be Compiled\"" >&5
5190 + echo "$as_me: WARNING: zlib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
5191 +    { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
5192 + echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
5193 +    { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
5194 + echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
5195 +    (
5196 +      cat <<\_ASBOX
5197 + ## ------------------------------ ##
5198 + ## Report this to gezelter@nd.edu ##
5199 + ## ------------------------------ ##
5200 + _ASBOX
5201 +    ) |
5202 +      sed "s/^/$as_me: WARNING:     /" >&2
5203 +    ;;
5204 + esac
5205 + echo "$as_me:$LINENO: checking for zlib.h" >&5
5206 + echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
5207 + if test "${ac_cv_header_zlib_h+set}" = set; then
5208 +  echo $ECHO_N "(cached) $ECHO_C" >&6
5209 + else
5210 +  ac_cv_header_zlib_h=$ac_header_preproc
5211 + fi
5212 + echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
5213 + echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
5214 +
5215 + fi
5216 + if test $ac_cv_header_zlib_h = yes; then
5217 +  zlib_cv_zlib_h=yes
5218 + else
5219 +  zlib_cv_zlib_h=no
5220 + fi
5221 +
5222 +
5223 +        ac_ext=c
5224 + ac_cpp='$CPP $CPPFLAGS'
5225 + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
5226 + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
5227 + ac_compiler_gnu=$ac_cv_c_compiler_gnu
5228 +
5229 +        if test "$zlib_cv_libz" = "yes" -a "$zlib_cv_zlib_h" = "yes"
5230 +        then
5231 +                #
5232 +                # If both library and header were found, use them
5233 +                #
5234 +
5235 + echo "$as_me:$LINENO: checking for inflateEnd in -lz" >&5
5236 + echo $ECHO_N "checking for inflateEnd in -lz... $ECHO_C" >&6
5237 + if test "${ac_cv_lib_z_inflateEnd+set}" = set; then
5238 +  echo $ECHO_N "(cached) $ECHO_C" >&6
5239 + else
5240 +  ac_check_lib_save_LIBS=$LIBS
5241 + LIBS="-lz  $LIBS"
5242 + cat >conftest.$ac_ext <<_ACEOF
5243 + /* confdefs.h.  */
5244 + _ACEOF
5245 + cat confdefs.h >>conftest.$ac_ext
5246 + cat >>conftest.$ac_ext <<_ACEOF
5247 + /* end confdefs.h.  */
5248 +
5249 + /* Override any gcc2 internal prototype to avoid an error.  */
5250 + #ifdef __cplusplus
5251 + extern "C"
5252 + #endif
5253 + /* We use char because int might match the return type of a gcc2
5254 +   builtin and then its argument prototype would still apply.  */
5255 + char inflateEnd ();
5256 + int
5257 + main ()
5258 + {
5259 + inflateEnd ();
5260 +  ;
5261 +  return 0;
5262 + }
5263 + _ACEOF
5264 + rm -f conftest.$ac_objext conftest$ac_exeext
5265 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5266 +  (eval $ac_link) 2>conftest.er1
5267 +  ac_status=$?
5268 +  grep -v '^ *+' conftest.er1 >conftest.err
5269 +  rm -f conftest.er1
5270 +  cat conftest.err >&5
5271 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5272 +  (exit $ac_status); } &&
5273 +         { ac_try='test -z "$ac_c_werror_flag"
5274 +                         || test ! -s conftest.err'
5275 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5276 +  (eval $ac_try) 2>&5
5277 +  ac_status=$?
5278 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5279 +  (exit $ac_status); }; } &&
5280 +         { ac_try='test -s conftest$ac_exeext'
5281 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5282 +  (eval $ac_try) 2>&5
5283 +  ac_status=$?
5284 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5285 +  (exit $ac_status); }; }; then
5286 +  ac_cv_lib_z_inflateEnd=yes
5287 + else
5288 +  echo "$as_me: failed program was:" >&5
5289 + sed 's/^/| /' conftest.$ac_ext >&5
5290 +
5291 + ac_cv_lib_z_inflateEnd=no
5292 + fi
5293 + rm -f conftest.err conftest.$ac_objext \
5294 +      conftest$ac_exeext conftest.$ac_ext
5295 + LIBS=$ac_check_lib_save_LIBS
5296 + fi
5297 + echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflateEnd" >&5
5298 + echo "${ECHO_T}$ac_cv_lib_z_inflateEnd" >&6
5299 + if test $ac_cv_lib_z_inflateEnd = yes; then
5300 +  cat >>confdefs.h <<_ACEOF
5301 + #define HAVE_LIBZ 1
5302 + _ACEOF
5303 +
5304 +  LIBS="-lz $LIBS"
5305 +
5306 + fi
5307 +
5308 +                echo "$as_me:$LINENO: checking zlib in ${ZLIB_HOME}" >&5
5309 + echo $ECHO_N "checking zlib in ${ZLIB_HOME}... $ECHO_C" >&6
5310 +                echo "$as_me:$LINENO: result: ok" >&5
5311 + echo "${ECHO_T}ok" >&6
5312 +        else
5313 +                #
5314 +                # If either header or library was not found, revert and bomb
5315 +                #
5316 +                echo "$as_me:$LINENO: checking zlib in ${ZLIB_HOME}" >&5
5317 + echo $ECHO_N "checking zlib in ${ZLIB_HOME}... $ECHO_C" >&6
5318 +                LDFLAGS="$ZLIB_OLD_LDFLAGS"
5319 +                CPPFLAGS="$ZLIB_OLD_CPPFLAGS"
5320 +                echo "$as_me:$LINENO: result: failed" >&5
5321 + echo "${ECHO_T}failed" >&6
5322 +                { { echo "$as_me:$LINENO: error: either specify a valid zlib installation with --with-zlib=DIR or disable zlib usage with --without-zlib" >&5
5323 + echo "$as_me: error: either specify a valid zlib installation with --with-zlib=DIR or disable zlib usage with --without-zlib" >&2;}
5324 +   { (exit 1); exit 1; }; }
5325 +        fi
5326 + fi
5327 +
5328 +
5329 +
5330 +
5331 +
5332 +
5333 +
5334 +
5335 +
5336 +
5337 +
5338 + 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
5339 + do
5340 + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
5341 + if eval "test \"\${$as_ac_Header+set}\" = set"; then
5342 +  echo "$as_me:$LINENO: checking for $ac_header" >&5
5343 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
5344 + if eval "test \"\${$as_ac_Header+set}\" = set"; then
5345 +  echo $ECHO_N "(cached) $ECHO_C" >&6
5346 + fi
5347 + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
5348 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
5349 + else
5350 +  # Is the header compilable?
5351 + echo "$as_me:$LINENO: checking $ac_header usability" >&5
5352 + echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
5353 + cat >conftest.$ac_ext <<_ACEOF
5354 + /* confdefs.h.  */
5355 + _ACEOF
5356 + cat confdefs.h >>conftest.$ac_ext
5357 + cat >>conftest.$ac_ext <<_ACEOF
5358 + /* end confdefs.h.  */
5359 + $ac_includes_default
5360 + #include <$ac_header>
5361 + _ACEOF
5362 + rm -f conftest.$ac_objext
5363 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5364 +  (eval $ac_compile) 2>conftest.er1
5365 +  ac_status=$?
5366 +  grep -v '^ *+' conftest.er1 >conftest.err
5367 +  rm -f conftest.er1
5368 +  cat conftest.err >&5
5369 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5370 +  (exit $ac_status); } &&
5371 +         { ac_try='test -z "$ac_c_werror_flag"
5372 +                         || test ! -s conftest.err'
5373 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5374 +  (eval $ac_try) 2>&5
5375 +  ac_status=$?
5376 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5377 +  (exit $ac_status); }; } &&
5378 +         { ac_try='test -s conftest.$ac_objext'
5379 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5380 +  (eval $ac_try) 2>&5
5381 +  ac_status=$?
5382 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5383 +  (exit $ac_status); }; }; then
5384 +  ac_header_compiler=yes
5385 + else
5386 +  echo "$as_me: failed program was:" >&5
5387 + sed 's/^/| /' conftest.$ac_ext >&5
5388 +
5389 + ac_header_compiler=no
5390 + fi
5391 + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
5392 + echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
5393 + echo "${ECHO_T}$ac_header_compiler" >&6
5394 +
5395 + # Is the header present?
5396 + echo "$as_me:$LINENO: checking $ac_header presence" >&5
5397 + echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
5398 + cat >conftest.$ac_ext <<_ACEOF
5399 + /* confdefs.h.  */
5400 + _ACEOF
5401 + cat confdefs.h >>conftest.$ac_ext
5402 + cat >>conftest.$ac_ext <<_ACEOF
5403 + /* end confdefs.h.  */
5404 + #include <$ac_header>
5405 + _ACEOF
5406 + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
5407 +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
5408 +  ac_status=$?
5409 +  grep -v '^ *+' conftest.er1 >conftest.err
5410 +  rm -f conftest.er1
5411 +  cat conftest.err >&5
5412 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5413 +  (exit $ac_status); } >/dev/null; then
5414 +  if test -s conftest.err; then
5415 +    ac_cpp_err=$ac_c_preproc_warn_flag
5416 +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
5417 +  else
5418 +    ac_cpp_err=
5419 +  fi
5420 + else
5421 +  ac_cpp_err=yes
5422 + fi
5423 + if test -z "$ac_cpp_err"; then
5424 +  ac_header_preproc=yes
5425 + else
5426 +  echo "$as_me: failed program was:" >&5
5427 + sed 's/^/| /' conftest.$ac_ext >&5
5428 +
5429 +  ac_header_preproc=no
5430 + fi
5431 + rm -f conftest.err conftest.$ac_ext
5432 + echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
5433 + echo "${ECHO_T}$ac_header_preproc" >&6
5434 +
5435 + # So?  What about this header?
5436 + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
5437 +  yes:no: )
5438 +    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
5439 + echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
5440 +    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
5441 + echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
5442 +    ac_header_preproc=yes
5443 +    ;;
5444 +  no:yes:* )
5445 +    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
5446 + echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
5447 +    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
5448 + echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
5449 +    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
5450 + echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
5451 +    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
5452 + echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
5453 +    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
5454 + echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
5455 +    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
5456 + echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
5457 +    (
5458 +      cat <<\_ASBOX
5459 + ## ------------------------------ ##
5460 + ## Report this to gezelter@nd.edu ##
5461 + ## ------------------------------ ##
5462 + _ASBOX
5463 +    ) |
5464 +      sed "s/^/$as_me: WARNING:     /" >&2
5465 +    ;;
5466 + esac
5467 + echo "$as_me:$LINENO: checking for $ac_header" >&5
5468 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
5469 + if eval "test \"\${$as_ac_Header+set}\" = set"; then
5470 +  echo $ECHO_N "(cached) $ECHO_C" >&6
5471 + else
5472 +  eval "$as_ac_Header=\$ac_header_preproc"
5473 + fi
5474 + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
5475 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
5476 +
5477 + fi
5478 + if test `eval echo '${'$as_ac_Header'}'` = yes; then
5479 +  cat >>confdefs.h <<_ACEOF
5480 + #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
5481 + _ACEOF
5482 +
5483 + fi
5484 +
5485 + done
5486 +
5487 +
5488 +
5489 +
5490 +
5491 +
5492 + for ac_func in pstat_getstatic sysmp getsysinfo sysctl table
5493 + do
5494 + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
5495 + echo "$as_me:$LINENO: checking for $ac_func" >&5
5496 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
5497 + if eval "test \"\${$as_ac_var+set}\" = set"; then
5498 +  echo $ECHO_N "(cached) $ECHO_C" >&6
5499 + else
5500 +  cat >conftest.$ac_ext <<_ACEOF
5501 + /* confdefs.h.  */
5502 + _ACEOF
5503 + cat confdefs.h >>conftest.$ac_ext
5504 + cat >>conftest.$ac_ext <<_ACEOF
5505 + /* end confdefs.h.  */
5506 + /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
5507 +   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
5508 + #define $ac_func innocuous_$ac_func
5509 +
5510 + /* System header to define __stub macros and hopefully few prototypes,
5511 +    which can conflict with char $ac_func (); below.
5512 +    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
5513 +    <limits.h> exists even on freestanding compilers.  */
5514 +
5515 + #ifdef __STDC__
5516 + # include <limits.h>
5517 + #else
5518 + # include <assert.h>
5519 + #endif
5520 +
5521 + #undef $ac_func
5522 +
5523 + /* Override any gcc2 internal prototype to avoid an error.  */
5524 + #ifdef __cplusplus
5525 + extern "C"
5526 + {
5527 + #endif
5528 + /* We use char because int might match the return type of a gcc2
5529 +   builtin and then its argument prototype would still apply.  */
5530 + char $ac_func ();
5531 + /* The GNU C library defines this for functions which it implements
5532 +    to always fail with ENOSYS.  Some functions are actually named
5533 +    something starting with __ and the normal name is an alias.  */
5534 + #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
5535 + choke me
5536 + #else
5537 + char (*f) () = $ac_func;
5538 + #endif
5539 + #ifdef __cplusplus
5540 + }
5541 + #endif
5542 +
5543 + int
5544 + main ()
5545 + {
5546 + return f != $ac_func;
5547 +  ;
5548 +  return 0;
5549 + }
5550 + _ACEOF
5551 + rm -f conftest.$ac_objext conftest$ac_exeext
5552 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5553 +  (eval $ac_link) 2>conftest.er1
5554 +  ac_status=$?
5555 +  grep -v '^ *+' conftest.er1 >conftest.err
5556 +  rm -f conftest.er1
5557 +  cat conftest.err >&5
5558 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5559 +  (exit $ac_status); } &&
5560 +         { ac_try='test -z "$ac_c_werror_flag"
5561 +                         || test ! -s conftest.err'
5562 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5563 +  (eval $ac_try) 2>&5
5564 +  ac_status=$?
5565 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5566 +  (exit $ac_status); }; } &&
5567 +         { ac_try='test -s conftest$ac_exeext'
5568 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5569 +  (eval $ac_try) 2>&5
5570 +  ac_status=$?
5571 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5572 +  (exit $ac_status); }; }; then
5573 +  eval "$as_ac_var=yes"
5574 + else
5575 +  echo "$as_me: failed program was:" >&5
5576 + sed 's/^/| /' conftest.$ac_ext >&5
5577 +
5578 + eval "$as_ac_var=no"
5579 + fi
5580 + rm -f conftest.err conftest.$ac_objext \
5581 +      conftest$ac_exeext conftest.$ac_ext
5582 + fi
5583 + echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
5584 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
5585 + if test `eval echo '${'$as_ac_var'}'` = yes; then
5586 +  cat >>confdefs.h <<_ACEOF
5587 + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
5588 + _ACEOF
5589 +
5590 + fi
5591 + done
5592 +
5593 + # special check for _system_configuration because AIX <4.3.2 do not
5594 + # contain the `physmem' member.
5595 + echo "$as_me:$LINENO: checking for external symbol _system_configuration" >&5
5596 + echo $ECHO_N "checking for external symbol _system_configuration... $ECHO_C" >&6
5597 + cat >conftest.$ac_ext <<_ACEOF
5598 + /* confdefs.h.  */
5599 + _ACEOF
5600 + cat confdefs.h >>conftest.$ac_ext
5601 + cat >>conftest.$ac_ext <<_ACEOF
5602 + /* end confdefs.h.  */
5603 + #include <sys/systemcfg.h>
5604 + int
5605 + main ()
5606 + {
5607 + double x = _system_configuration.physmem;
5608 +  ;
5609 +  return 0;
5610 + }
5611 + _ACEOF
5612 + rm -f conftest.$ac_objext
5613 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5614 +  (eval $ac_compile) 2>conftest.er1
5615 +  ac_status=$?
5616 +  grep -v '^ *+' conftest.er1 >conftest.err
5617 +  rm -f conftest.er1
5618 +  cat conftest.err >&5
5619 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5620 +  (exit $ac_status); } &&
5621 +         { ac_try='test -z "$ac_c_werror_flag"
5622 +                         || test ! -s conftest.err'
5623 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5624 +  (eval $ac_try) 2>&5
5625 +  ac_status=$?
5626 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5627 +  (exit $ac_status); }; } &&
5628 +         { ac_try='test -s conftest.$ac_objext'
5629 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5630 +  (eval $ac_try) 2>&5
5631 +  ac_status=$?
5632 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5633 +  (exit $ac_status); }; }; then
5634 +  echo "$as_me:$LINENO: result: yes" >&5
5635 + echo "${ECHO_T}yes" >&6
5636 +
5637 + cat >>confdefs.h <<\_ACEOF
5638 + #define HAVE__SYSTEM_CONFIGURATION 1
5639 + _ACEOF
5640 +
5641 + else
5642 +  echo "$as_me: failed program was:" >&5
5643 + sed 's/^/| /' conftest.$ac_ext >&5
5644 +
5645 + echo "$as_me:$LINENO: result: no" >&5
5646 + echo "${ECHO_T}no" >&6
5647 + fi
5648 + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
5649 +
5650    # clean out junk possibly left behind by a previous configuration
5651 <  rm -f utils/getopt.h
5651 >  rm -f src/getopt.h
5652    # Check for getopt_long support
5653  
5654   for ac_header in getopt.h
# Line 5042 | Line 5988 | esac
5988    *) LIBOBJS="$LIBOBJS getopt1.$ac_objext" ;;
5989   esac
5990  
5991 <                ac_config_links="$ac_config_links utils/getopt.h:utils/gnugetopt.h"
5991 >                ac_config_links="$ac_config_links src/getopt.h:src/utils/gnugetopt.h"
5992  
5993   fi
5994  
# Line 5136 | Line 6082 | if test "$ac_test_CFLAGS" != "set"; then
6082          fi;;
6083     *darwin*)
6084          if test "$CC" = xlc -o "$CC" = cc; then
6085 <                CFLAGS="-qthreaded -O5 -qtune=auto -qarch=auto -qunroll=auto -qaltivec"
6085 >                CFLAGS="-qthreaded -O -qtune=auto -qarch=auto -qunroll=auto -qaltivec"
6086          fi;;
6087    esac
6088  
# Line 5587 | Line 6533 | if test "$ac_test_CXXFLAGS" != "set"; then
6533                  echo "*******************************************************"
6534          fi;;
6535     *darwin*)
6536 <        if test "$CXX" = xlc++; then
6537 <                CXXFLAGS="-qthreaded -O5 -qtune=auto -qarch=auto -qunroll=auto -qaltivec"
6536 >        if test "$CXX" = xlc++ -o "$CXX" = xlC ; then
6537 >                CXXFLAGS="-qthreaded -O -qtune=auto -qarch=auto -qunroll=auto -qaltivec"
6538          fi;;
6539    esac
6540  
# Line 6000 | Line 6946 | if test x"$F90FLAGS" = x ; then
6946          fi;;
6947     *darwin*)
6948          if test "$F90" = f90 -o "$F90" = xlf90 -o "$F90" = xlf95; then
6949 <                F90FLAGS="-qthreaded -O5 -qtune=auto -qarch=auto -qunroll=auto"
6949 >                F90FLAGS="-qthreaded -O -qtune=auto -qarch=auto -qunroll=auto"
6950          fi;;
6951    esac
6952  
# Line 6593 | Line 7539 | fi
7539   fi
7540  
7541   fi
7542 < # Extract the first word of "ar", so it can be a program name with args.
7543 < set dummy ar; ac_word=$2
7542 >
7543 >   # Extract the first word of "perl", so it can be a program name with args.
7544 > set dummy perl; ac_word=$2
7545   echo "$as_me:$LINENO: checking for $ac_word" >&5
7546   echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
7547 < if test "${ac_cv_prog_AR+set}" = set; then
7547 > if test "${ac_cv_path_PERLINTERP+set}" = set; then
7548    echo $ECHO_N "(cached) $ECHO_C" >&6
7549   else
7550 <  if test -n "$AR"; then
7551 <  ac_cv_prog_AR="$AR" # Let the user override the test.
7552 < else
7553 < as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7550 >  case $PERLINTERP in
7551 >  [\\/]* | ?:[\\/]*)
7552 >  ac_cv_path_PERLINTERP="$PERLINTERP" # Let the user override the test with a path.
7553 >  ;;
7554 >  *)
7555 >  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7556   for as_dir in $PATH
7557   do
7558    IFS=$as_save_IFS
7559    test -z "$as_dir" && as_dir=.
7560    for ac_exec_ext in '' $ac_executable_extensions; do
7561    if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7562 <    ac_cv_prog_AR="ar"
7562 >    ac_cv_path_PERLINTERP="$as_dir/$ac_word$ac_exec_ext"
7563      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7564      break 2
7565    fi
7566   done
7567   done
7568  
7569 <  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="NONE"
7570 < fi
7569 >  test -z "$ac_cv_path_PERLINTERP" && ac_cv_path_PERLINTERP="perl"
7570 >  ;;
7571 > esac
7572   fi
7573 < AR=$ac_cv_prog_AR
7574 < if test -n "$AR"; then
7575 <  echo "$as_me:$LINENO: result: $AR" >&5
7576 < echo "${ECHO_T}$AR" >&6
7573 > PERLINTERP=$ac_cv_path_PERLINTERP
7574 >
7575 > if test -n "$PERLINTERP"; then
7576 >  echo "$as_me:$LINENO: result: $PERLINTERP" >&5
7577 > echo "${ECHO_T}$PERLINTERP" >&6
7578   else
7579    echo "$as_me:$LINENO: result: no" >&5
7580   echo "${ECHO_T}no" >&6
7581   fi
7582  
7583 < if test "$AR" = "NONE"; then
7584 <  { { echo "$as_me:$LINENO: error: --> Can't find \`ar'!" >&5
6634 < echo "$as_me: error: --> Can't find \`ar'!" >&2;}
6635 <   { (exit 1); exit 1; }; }
6636 <  cat >confcache <<\_ACEOF
6637 < # This file is a shell script that caches the results of configure
6638 < # tests run on this system so they can be shared between configure
6639 < # scripts and configure runs, see configure's option --config-cache.
6640 < # It is not useful on other systems.  If it contains results you don't
6641 < # want to keep, you may remove or edit it.
6642 < #
6643 < # config.status only pays attention to the cache file if you give it
6644 < # the --recheck option to rerun configure.
6645 < #
6646 < # `ac_cv_env_foo' variables (set or unset) will be overridden when
6647 < # loading this file, other *unset* `ac_cv_foo' will be assigned the
6648 < # following values.
7583 >   ac_cv_path_perlinterp="$PERLINTERP"
7584 >   _sHpB='#!'
7585  
6650 _ACEOF
7586  
7587 + # Check whether --with-perl-shebang or --without-perl-shebang was given.
7588 + if test "${with_perl_shebang+set}" = set; then
7589 +  withval="$with_perl_shebang"
7590 +  opt_perl_shebang="$withval"
7591 + else
7592 +                opt_perl_shebang="not_set"
7593 + fi;
7594 +   echo "$as_me:$LINENO: checking whether explicit instead of detected sharpbang is to be used" >&5
7595 + echo $ECHO_N "checking whether explicit instead of detected sharpbang is to be used... $ECHO_C" >&6
7596 + if test "${ax_cv_opt_perl_shebang+set}" = set; then
7597 +  echo $ECHO_N "(cached) $ECHO_C" >&6
7598 + else
7599 +   case "$opt_perl_shebang" in
7600 +                      not_set  ) ax_cv_opt_perl_shebang=''
7601 +                               ;;
7602 +                         *     )
7603 +        ax_cv_opt_perl_shebang=`echo "$opt_perl_shebang" | sed -e's|^#!\s*\(.*\)$|\1|'`
7604 +                    esac
7605 +
7606 + fi
7607 + echo "$as_me:$LINENO: result: $ax_cv_opt_perl_shebang" >&5
7608 + echo "${ECHO_T}$ax_cv_opt_perl_shebang" >&6
7609 +   if test "A$ax_cv_opt_perl_shebang" != "A"
7610 +     then
7611 +       ac_cv_sys_kernshrpbang_perl="$ax_cv_opt_perl_shebang"
7612 +       PERL_SHEBANG="$ac_cv_sys_kernshrpbang_perl"
7613 +              { echo "$as_me:$LINENO: OK - PERL_SHEBANG is $_sHpB$PERL_SHEBANG." >&5
7614 + echo "$as_me: OK - PERL_SHEBANG is $_sHpB$PERL_SHEBANG." >&6;}
7615 +
7616 + # Automatic detection of sharpbang formula starts here
7617 +     else
7618 +   _somian_shbangperl=`$PERLINTERP -V:startperl`
7619 +   negclass="[^']"; # must leave this comment:  m4 will remove the outer brackets for us, heheh
7620 +   echo "$as_me:$LINENO: checking for kernel sharpbang invocation to start perl" >&5
7621 + echo $ECHO_N "checking for kernel sharpbang invocation to start perl... $ECHO_C" >&6
7622 + if test "${ac_cv_sys_kernshrpbang_perl+set}" = set; then
7623 +  echo $ECHO_N "(cached) $ECHO_C" >&6
7624 + else
7625 +  _somian_kspb_perl=`echo "$_somian_shbangperl" | sed -ne"s|.*='\($negclass*\)';$|\1|p"`
7626 +        if test "x$_somian_kspb_perl" == x
7627 +          then _somian_ksbp_warn_empty='durnit'
7628 +          else
7629 +          case "A$_somian_kspb_perl" in
7630 +                 A#!*perl* )
7631 +           ac_cv_sys_kernshrpbang_perl=`echo "$_somian_kspb_perl" | sed -e's|#!\(.*\)$|\1|'`
7632 +                        ;;
7633 +                     A*    )  _somian_ksbp_warn_defau='trouble'
7634 +                              ac_cv_sys_kernshrpbang_perl="$PERLINTERP"
7635 +          esac
7636 +        fi
7637 +
7638 + fi
7639 + echo "$as_me:$LINENO: result: $ac_cv_sys_kernshrpbang_perl" >&5
7640 + echo "${ECHO_T}$ac_cv_sys_kernshrpbang_perl" >&6
7641 + # The above prints Checking ... result message to user.
7642 +   PERL_SHEBANG="$ac_cv_sys_kernshrpbang_perl"
7643 +
7644 +    if test A${_somian_ksbp_warn_empty+set} == Aset
7645 +      then   { echo "$as_me:$LINENO: WARNING: In last check, doing $PERLINTERP -V:startperl yielded empty result! That should not happen." >&5
7646 + echo "$as_me: WARNING: In last check, doing $PERLINTERP -V:startperl yielded empty result! That should not happen." >&2;}
7647 +    fi
7648 + # Inform user after printing result value
7649 +    if test A${_somian_ksbp_warn_defau+set} == Aset
7650 +      then { echo "$as_me:$LINENO: Maybe Not good -" >&5
7651 + echo "$as_me: Maybe Not good -" >&6;}
7652 +           { echo "$as_me:$LINENO: WARNING: In last check perl's Config query did not work so we bunted: $_sHpB$PERLINTERP" >&5
7653 + echo "$as_me: WARNING: In last check perl's Config query did not work so we bunted: $_sHpB$PERLINTERP" >&2;}
7654 +      else { echo "$as_me:$LINENO: OK Good result - " >&5
7655 + echo "$as_me: OK Good result - " >&6;}
7656 +           { echo "$as_me:$LINENO: In last check we got a proper-looking answer from perl's Config: $_somian_shbangperl" >&5
7657 + echo "$as_me: In last check we got a proper-looking answer from perl's Config: $_somian_shbangperl" >&6;}
7658 +    fi
7659 +  fi
7660 +
7661 + # Extract the first word of "ar", so it can be a program name with args.
7662 + set dummy ar; ac_word=$2
7663 + echo "$as_me:$LINENO: checking for $ac_word" >&5
7664 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
7665 + if test "${ac_cv_prog_AR+set}" = set; then
7666 +  echo $ECHO_N "(cached) $ECHO_C" >&6
7667 + else
7668 +  if test -n "$AR"; then
7669 +  ac_cv_prog_AR="$AR" # Let the user override the test.
7670 + else
7671 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7672 + for as_dir in $PATH
7673 + do
7674 +  IFS=$as_save_IFS
7675 +  test -z "$as_dir" && as_dir=.
7676 +  for ac_exec_ext in '' $ac_executable_extensions; do
7677 +  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7678 +    ac_cv_prog_AR="ar"
7679 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7680 +    break 2
7681 +  fi
7682 + done
7683 + done
7684 +
7685 +  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="NONE"
7686 + fi
7687 + fi
7688 + AR=$ac_cv_prog_AR
7689 + if test -n "$AR"; then
7690 +  echo "$as_me:$LINENO: result: $AR" >&5
7691 + echo "${ECHO_T}$AR" >&6
7692 + else
7693 +  echo "$as_me:$LINENO: result: no" >&5
7694 + echo "${ECHO_T}no" >&6
7695 + fi
7696 +
7697 + if test "$AR" = "NONE"; then
7698 +  { { echo "$as_me:$LINENO: error: --> Can't find \`ar'!" >&5
7699 + echo "$as_me: error: --> Can't find \`ar'!" >&2;}
7700 +   { (exit 1); exit 1; }; }
7701 +  cat >confcache <<\_ACEOF
7702 + # This file is a shell script that caches the results of configure
7703 + # tests run on this system so they can be shared between configure
7704 + # scripts and configure runs, see configure's option --config-cache.
7705 + # It is not useful on other systems.  If it contains results you don't
7706 + # want to keep, you may remove or edit it.
7707 + #
7708 + # config.status only pays attention to the cache file if you give it
7709 + # the --recheck option to rerun configure.
7710 + #
7711 + # `ac_cv_env_foo' variables (set or unset) will be overridden when
7712 + # loading this file, other *unset* `ac_cv_foo' will be assigned the
7713 + # following values.
7714 +
7715 + _ACEOF
7716 +
7717   # The following way of writing the cache mishandles newlines in values,
7718   # but we know of no workaround that is simple, portable, and efficient.
7719   # So, don't put newlines in cache variables' values.
# Line 6690 | Line 7755 | fi
7755    exit 1
7756   fi
7757  
7758 + # Extract the first word of "ps", so it can be a program name with args.
7759 + set dummy ps; ac_word=$2
7760 + echo "$as_me:$LINENO: checking for $ac_word" >&5
7761 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
7762 + if test "${ac_cv_path_PS+set}" = set; then
7763 +  echo $ECHO_N "(cached) $ECHO_C" >&6
7764 + else
7765 +  case $PS in
7766 +  [\\/]* | ?:[\\/]*)
7767 +  ac_cv_path_PS="$PS" # Let the user override the test with a path.
7768 +  ;;
7769 +  *)
7770 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7771 + for as_dir in $PATH
7772 + do
7773 +  IFS=$as_save_IFS
7774 +  test -z "$as_dir" && as_dir=.
7775 +  for ac_exec_ext in '' $ac_executable_extensions; do
7776 +  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7777 +    ac_cv_path_PS="$as_dir/$ac_word$ac_exec_ext"
7778 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7779 +    break 2
7780 +  fi
7781 + done
7782 + done
7783  
7784 +  ;;
7785 + esac
7786 + fi
7787 + PS=$ac_cv_path_PS
7788  
7789 + if test -n "$PS"; then
7790 +  echo "$as_me:$LINENO: result: $PS" >&5
7791 + echo "${ECHO_T}$PS" >&6
7792 + else
7793 +  echo "$as_me:$LINENO: result: no" >&5
7794 + echo "${ECHO_T}no" >&6
7795 + fi
7796 +
7797 + echo "$as_me:$LINENO: checking for POSIX or BSD ps syntax" >&5
7798 + echo $ECHO_N "checking for POSIX or BSD ps syntax... $ECHO_C" >&6
7799 + if test "${ac_cv_prog_ps_syntax+set}" = set; then
7800 +  echo $ECHO_N "(cached) $ECHO_C" >&6
7801 + else
7802 +
7803 +        if $PS ax -o rss > /dev/null 2>&1; then
7804 +                ac_cv_prog_ps_ax=yes
7805 +        else
7806 +                ac_cv_prog_ps_ax=no
7807 +        fi
7808 +        if $PS -ef -o rss > /dev/null 2>&1; then
7809 +                ac_cv_prog_ps_ef=yes
7810 +        else
7811 +                ac_cv_prog_ps_ef=no
7812 +        fi
7813 +        if test "$ac_cv_prog_ps_ax" = yes; then
7814 +                ac_cv_prog_ps_syntax=BSD
7815 +        else
7816 +                if test "$ac_cv_prog_ps_ef" = yes; then
7817 +                        ac_cv_prog_ps_syntax=POSIX
7818 +                else
7819 +                        { { echo "$as_me:$LINENO: error: Could not determine ps syntax" >&5
7820 + echo "$as_me: error: Could not determine ps syntax" >&2;}
7821 +   { (exit 1); exit 1; }; }
7822 +                fi
7823 +        fi
7824 +
7825 + fi
7826 + echo "$as_me:$LINENO: result: $ac_cv_prog_ps_syntax" >&5
7827 + echo "${ECHO_T}$ac_cv_prog_ps_syntax" >&6
7828 +
7829 +
7830 + cat >>confdefs.h <<_ACEOF
7831 + #define PSCOMMAND $PS
7832 + _ACEOF
7833 +
7834 +
7835 + if test "$ac_cv_prog_ps_syntax" = BSD; then
7836 +  cat >>confdefs.h <<\_ACEOF
7837 + #define PSTYPE_IS_BSD 1
7838 + _ACEOF
7839 +
7840 + else
7841 +   if test "$ac_cv_prog_ps_syntax" = POSIX; then
7842 +       cat >>confdefs.h <<\_ACEOF
7843 + #define PSTYPE_IS_POSIX 1
7844 + _ACEOF
7845 +
7846 +   else
7847 +       { { echo "$as_me:$LINENO: error: Unknown ps syntax type!" >&5
7848 + echo "$as_me: error: Unknown ps syntax type!" >&2;}
7849 +   { (exit 1); exit 1; }; }
7850 +   fi
7851 + fi
7852 +
7853 +
7854   # Check whether --with-mpi or --without-mpi was given.
7855   if test "${with_mpi+set}" = set; then
7856    withval="$with_mpi"
# Line 6720 | Line 7879 | echo '#include <mpi.h>' > conftest.cc
7879   echo "$as_me:$LINENO: checking for mpi.h" >&5
7880   echo $ECHO_N "checking for mpi.h... $ECHO_C" >&6
7881   have_mpi_h=0
7882 + rm -f conftest*
7883   echo '#include <mpi.h>' > conftest.cc
7884 < if test -z "`${CXX} -I${MPI_INC_DIR} -c conftest.cc 2>&1`"; then
7884 > if ${CXX} -I${MPI_INC_DIR} -c conftest.cc 2>&1 ; then
7885          echo "$as_me:$LINENO: result: yes" >&5
7886   echo "${ECHO_T}yes" >&6
7887          have_mpi_h=1
7888   else
7889 +        if test -s conftest.out ; then
7890 +                cat conftest.out >> config.log
7891 +        fi
7892          echo "$as_me:$LINENO: result: no! Check MPI include paths" >&5
7893   echo "${ECHO_T}no! Check MPI include paths" >&6
7894          USE_MPI="no"
# Line 6991 | Line 8154 | fi
8154   fi
8155  
8156   fi
8157 + $as_unset ac_cv_lib_mpich_MPI_Init
8158 + if test x = x"$MPI_LIB"; then
8159 +        echo "$as_me:$LINENO: checking for MPI_Init in -lmpich" >&5
8160 + echo $ECHO_N "checking for MPI_Init in -lmpich... $ECHO_C" >&6
8161 + if test "${ac_cv_lib_mpich_MPI_Init+set}" = set; then
8162 +  echo $ECHO_N "(cached) $ECHO_C" >&6
8163 + else
8164 +  ac_check_lib_save_LIBS=$LIBS
8165 + LIBS="-lmpich "-lpmpich" $LIBS"
8166 + cat >conftest.$ac_ext <<_ACEOF
8167 + /* confdefs.h.  */
8168 + _ACEOF
8169 + cat confdefs.h >>conftest.$ac_ext
8170 + cat >>conftest.$ac_ext <<_ACEOF
8171 + /* end confdefs.h.  */
8172  
8173 + /* Override any gcc2 internal prototype to avoid an error.  */
8174 + #ifdef __cplusplus
8175 + extern "C"
8176 + #endif
8177 + /* We use char because int might match the return type of a gcc2
8178 +   builtin and then its argument prototype would still apply.  */
8179 + char MPI_Init ();
8180 + int
8181 + main ()
8182 + {
8183 + MPI_Init ();
8184 +  ;
8185 +  return 0;
8186 + }
8187 + _ACEOF
8188 + rm -f conftest.$ac_objext conftest$ac_exeext
8189 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8190 +  (eval $ac_link) 2>conftest.er1
8191 +  ac_status=$?
8192 +  grep -v '^ *+' conftest.er1 >conftest.err
8193 +  rm -f conftest.er1
8194 +  cat conftest.err >&5
8195 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
8196 +  (exit $ac_status); } &&
8197 +         { ac_try='test -z "$ac_c_werror_flag"
8198 +                         || test ! -s conftest.err'
8199 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8200 +  (eval $ac_try) 2>&5
8201 +  ac_status=$?
8202 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
8203 +  (exit $ac_status); }; } &&
8204 +         { ac_try='test -s conftest$ac_exeext'
8205 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8206 +  (eval $ac_try) 2>&5
8207 +  ac_status=$?
8208 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
8209 +  (exit $ac_status); }; }; then
8210 +  ac_cv_lib_mpich_MPI_Init=yes
8211 + else
8212 +  echo "$as_me: failed program was:" >&5
8213 + sed 's/^/| /' conftest.$ac_ext >&5
8214 +
8215 + ac_cv_lib_mpich_MPI_Init=no
8216 + fi
8217 + rm -f conftest.err conftest.$ac_objext \
8218 +      conftest$ac_exeext conftest.$ac_ext
8219 + LIBS=$ac_check_lib_save_LIBS
8220 + fi
8221 + echo "$as_me:$LINENO: result: $ac_cv_lib_mpich_MPI_Init" >&5
8222 + echo "${ECHO_T}$ac_cv_lib_mpich_MPI_Init" >&6
8223 + if test $ac_cv_lib_mpich_MPI_Init = yes; then
8224 +  MPI_LIB="-lmpich -lpmpich"
8225 + fi
8226 +
8227 + fi
8228 +
8229   $as_unset ac_cv_lib_mpi_MPI_Init
8230   if test x = x"$MPI_LIB"; then
8231   echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5
# Line 7091 | Line 8325 | fi
8325  
8326  
8327  
8328 < # Check whether --with-sprng or --without-sprng was given.
8329 < if test "${with_sprng+set}" = set; then
8330 <  withval="$with_sprng"
8331 <  with_sprng=$withval
8332 < else
8333 <  with_sprng="/usr/local"
8328 >
8329 > USE_CGAL=no
8330 > cgal_makefile=auto
8331 >
8332 > # Check whether --with-cgal-makefile or --without-cgal-makefile was given.
8333 > if test "${with_cgal_makefile+set}" = set; then
8334 >  withval="$with_cgal_makefile"
8335 >  cgal_makefile="$withval"
8336   fi;
8337  
8338 < 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"
7109 < fi
7110 < if test "$USE_SPRNG" = "yes"; then
8338 > if test "x$cgal_makefile" != xno; then
8339  
8340 +  if test "x$cgal_makefile" = xauto -a "x$CGAL_MAKEFILE" != x; then
8341 +    cgal_makefile="$CGAL_MAKEFILE"
8342 +  fi
8343  
8344 < # Set variables...
8345 < SPRNG_LIB_DIR="$SPRNG/lib"
7115 < SPRNG_INC_DIR="$SPRNG/include"
8344 >  echo "$as_me:$LINENO: checking for cgal_makefile: $cgal_makefile" >&5
8345 > echo $ECHO_N "checking for cgal_makefile: $cgal_makefile... $ECHO_C" >&6
8346  
8347 +  if test -f "$cgal_makefile"; then
8348  
8349 +    cat >config.tmp.Makefile <<EOF
8350 + include $cgal_makefile
8351 + default:
8352 +        @echo CGAL_OS_COMPILER=\"\${CGAL_OS_COMPILER}\" >config.tmp.cgalvariables
8353 +        @echo CGAL_INCLDIR=\"\${CGAL_INCL_DIR}\" >>config.tmp.cgalvariables
8354 +        @echo CGAL_INCLCONFDIR=\"\${CGAL_INCL_CONF_DIR}\" >>config.tmp.cgalvariables
8355 +        @echo CGAL_LIBDIR=\"\${CGAL_LIB_DIR}/\${CGAL_OS_COMPILER}\" >>config.tmp.cgalvariables
8356 +        @echo CGAL_RLIBDIR=\"\${CGAL_LIB_DIR}/\${CGAL_OS_COMPILER}\" >>config.tmp.cgalvariables
8357 +        @echo CGAL_CXXFLAGS=\"\${CGAL_CXXFLAGS}\" >>config.tmp.cgalvariables
8358 +        @echo GMP_INCLDIR=\"\${GMP_INCL_DIR}\" >>config.tmp.cgalvariables
8359 +        @echo GMP_LIBDIR=\"\${GMP_LIB_DIR}\" >>config.tmp.cgalvariables
8360 +        @echo GMP_RLIBDIR=\"\${GMP_LIB_DIR}\" >>config.tmp.cgalvariables
8361 +        @echo LEDA_INCLDIR=\"\${LEDA_INCL_DIR}\" >>config.tmp.cgalvariables
8362 +        @echo LEDA_LIBDIR=\"\${LEDA_LIB_DIR}\" >>config.tmp.cgalvariables
8363 +        @echo LEDA_RLIBDIR=\"\${LEDA_LIB_DIR}\" >>config.tmp.cgalvariables
8364 + EOF
8365  
8366 < echo "$as_me:$LINENO: checking for sprng.h" >&5
8367 < 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"
7131 < fi
7132 < rm -f conftest*
7133 < if test "$have_sprng_h" = 1; then
8366 >    make -s -f config.tmp.Makefile
8367 >    . config.tmp.cgalvariables
8368  
8369 < cat >>confdefs.h <<\_ACEOF
7136 < #define HAVE_SPRNG_H 1
7137 < _ACEOF
8369 >    rm -f config.tmp.Makefile config.tmp.cgalvariables
8370  
8371 < fi
8371 >    if test "x$CGAL_INCLDIR" = "x"; then
8372 >      CGAL_INCLDIR=""
8373 >    fi
8374  
8375 < ac_ext=c
8376 < ac_cpp='$CPP $CPPFLAGS'
8377 < 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
8375 >    if test "x$CGAL_LIBDIR" = "x"; then
8376 >      CGAL_LIBDIR=""
8377 >    fi
8378  
8379 < ac_save_LDFLAGS=$LDFLAGS
8380 < LDFLAGS="${LDFLAGS} -L${SPRNG_LIB_DIR} "
8379 >    if test "x$CGAL_RLIBDIR" = "x"; then
8380 >      CGAL_RLIBDIR=""
8381 >    fi
8382  
8383 < echo "$as_me:$LINENO: checking for init_rng in -lsprng" >&5
8384 < echo $ECHO_N "checking for init_rng in -lsprng... $ECHO_C" >&6
8385 < if test "${ac_cv_lib_sprng_init_rng+set}" = set; then
8383 >    if test "x$LEDA_INCLDIR" = "x"; then
8384 >      LEDA_INCLDIR=""
8385 >    fi
8386 >
8387 >    if test "x$LEDA_LIBDIR" = "x"; then
8388 >      LEDA_LIBDIR=""
8389 >    fi
8390 >
8391 >    if test "x$LEDA_RLIBDIR" = "x"; then
8392 >      LEDA_RLIBDIR=""
8393 >    fi
8394 >
8395 >    if test "x$GMP_INCLDIR" = "x"; then
8396 >      GMP_INCLDIR=""
8397 >    fi
8398 >
8399 >    if test "x$GMP_LIBDIR" = "x"; then
8400 >      GMP_LIBDIR=""
8401 >    fi
8402 >
8403 >    if test "x$GMP_RLIBDIR" = "x"; then
8404 >      GMP_RLIBDIR=""
8405 >    fi
8406 >
8407 >    echo "$as_me:$LINENO: result: CGAL_OS_COMPILER=   $CGAL_OS_COMPILER" >&5
8408 > echo "${ECHO_T}CGAL_OS_COMPILER=   $CGAL_OS_COMPILER" >&6
8409 >    echo "$as_me:$LINENO: result: CGAL_INCLDIR=       $CGAL_INCLDIR" >&5
8410 > echo "${ECHO_T}CGAL_INCLDIR=       $CGAL_INCLDIR" >&6
8411 >    echo "$as_me:$LINENO: result: CGAL_INCLCONFDIR=   $CGAL_INCLCONFDIR" >&5
8412 > echo "${ECHO_T}CGAL_INCLCONFDIR=   $CGAL_INCLCONFDIR" >&6
8413 >    echo "$as_me:$LINENO: result: CGAL_LIBDIR=        $CGAL_LIBDIR" >&5
8414 > echo "${ECHO_T}CGAL_LIBDIR=        $CGAL_LIBDIR" >&6
8415 >    echo "$as_me:$LINENO: result: CGAL_CXXFLAGS=      $CGAL_CXXFLAGS" >&5
8416 > echo "${ECHO_T}CGAL_CXXFLAGS=      $CGAL_CXXFLAGS" >&6
8417 >    echo "$as_me:$LINENO: result: LEDA_INCLDIR=       $LEDA_INCLDIR" >&5
8418 > echo "${ECHO_T}LEDA_INCLDIR=       $LEDA_INCLDIR" >&6
8419 >    echo "$as_me:$LINENO: result: LEDA_LIBDIR=        $LEDA_LIBDIR" >&5
8420 > echo "${ECHO_T}LEDA_LIBDIR=        $LEDA_LIBDIR" >&6
8421 >    echo "$as_me:$LINENO: result: GMP_INCLDIR=        $GMP_INCLDIR" >&5
8422 > echo "${ECHO_T}GMP_INCLDIR=        $GMP_INCLDIR" >&6
8423 >    echo "$as_me:$LINENO: result: GMP_LIBDIR=         $GMP_LIBDIR" >&5
8424 > echo "${ECHO_T}GMP_LIBDIR=         $GMP_LIBDIR" >&6
8425 >
8426 >    ac_ext=cc
8427 > ac_cpp='$CXXCPP $CPPFLAGS'
8428 > ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
8429 > ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
8430 > ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
8431 >
8432 >    save_CXXFLAGS="$CXXFLAGS"
8433 >    CXXFLAGS="$CXXFLAGS -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR"
8434 >
8435 > ac_ext=cc
8436 > ac_cpp='$CXXCPP $CPPFLAGS'
8437 > ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
8438 > ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
8439 > ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
8440 > echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
8441 > echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
8442 > if test -z "$CXXCPP"; then
8443 >  if test "${ac_cv_prog_CXXCPP+set}" = set; then
8444    echo $ECHO_N "(cached) $ECHO_C" >&6
8445   else
8446 <  ac_check_lib_save_LIBS=$LIBS
8447 < LIBS="-lsprng  $LIBS"
8448 < cat >conftest.$ac_ext <<_ACEOF
8446 >      # Double quotes because CXXCPP needs to be expanded
8447 >    for CXXCPP in "$CXX -E" "/lib/cpp"
8448 >    do
8449 >      ac_preproc_ok=false
8450 > for ac_cxx_preproc_warn_flag in '' yes
8451 > do
8452 >  # Use a header file that comes with gcc, so configuring glibc
8453 >  # with a fresh cross-compiler works.
8454 >  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
8455 >  # <limits.h> exists even on freestanding compilers.
8456 >  # On the NeXT, cc -E runs the code through the compiler's parser,
8457 >  # not just through cpp. "Syntax error" is here to catch this case.
8458 >  cat >conftest.$ac_ext <<_ACEOF
8459   /* confdefs.h.  */
8460   _ACEOF
8461   cat confdefs.h >>conftest.$ac_ext
8462   cat >>conftest.$ac_ext <<_ACEOF
8463   /* end confdefs.h.  */
8464 <
8465 < /* Override any gcc2 internal prototype to avoid an error.  */
8466 < #ifdef __cplusplus
8467 < extern "C"
8464 > #ifdef __STDC__
8465 > # include <limits.h>
8466 > #else
8467 > # include <assert.h>
8468   #endif
8469 < /* We use char because int might match the return type of a gcc2
7169 <   builtin and then its argument prototype would still apply.  */
7170 < char init_rng ();
7171 < int
7172 < main ()
7173 < {
7174 < init_rng ();
7175 <  ;
7176 <  return 0;
7177 < }
8469 >                     Syntax error
8470   _ACEOF
8471 < rm -f conftest.$ac_objext conftest$ac_exeext
8472 < if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
7181 <  (eval $ac_link) 2>conftest.er1
8471 > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
8472 >  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
8473    ac_status=$?
8474    grep -v '^ *+' conftest.er1 >conftest.err
8475    rm -f conftest.er1
8476    cat conftest.err >&5
8477    echo "$as_me:$LINENO: \$? = $ac_status" >&5
8478 <  (exit $ac_status); } &&
8479 <         { ac_try='test -z "$ac_c_werror_flag"
8480 <                         || test ! -s conftest.err'
8481 <  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8482 <  (eval $ac_try) 2>&5
8483 <  ac_status=$?
8484 <  echo "$as_me:$LINENO: \$? = $ac_status" >&5
7194 <  (exit $ac_status); }; } &&
7195 <         { ac_try='test -s conftest$ac_exeext'
7196 <  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7197 <  (eval $ac_try) 2>&5
7198 <  ac_status=$?
7199 <  echo "$as_me:$LINENO: \$? = $ac_status" >&5
7200 <  (exit $ac_status); }; }; then
7201 <  ac_cv_lib_sprng_init_rng=yes
8478 >  (exit $ac_status); } >/dev/null; then
8479 >  if test -s conftest.err; then
8480 >    ac_cpp_err=$ac_cxx_preproc_warn_flag
8481 >    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
8482 >  else
8483 >    ac_cpp_err=
8484 >  fi
8485   else
8486 +  ac_cpp_err=yes
8487 + fi
8488 + if test -z "$ac_cpp_err"; then
8489 +  :
8490 + else
8491    echo "$as_me: failed program was:" >&5
8492   sed 's/^/| /' conftest.$ac_ext >&5
8493  
8494 < ac_cv_lib_sprng_init_rng=no
8494 >  # Broken: fails on valid input.
8495 > continue
8496   fi
8497 < rm -f conftest.err conftest.$ac_objext \
8498 <      conftest$ac_exeext conftest.$ac_ext
8499 < LIBS=$ac_check_lib_save_LIBS
8497 > rm -f conftest.err conftest.$ac_ext
8498 >
8499 >  # OK, works on sane cases.  Now check whether non-existent headers
8500 >  # can be detected and how.
8501 >  cat >conftest.$ac_ext <<_ACEOF
8502 > /* confdefs.h.  */
8503 > _ACEOF
8504 > cat confdefs.h >>conftest.$ac_ext
8505 > cat >>conftest.$ac_ext <<_ACEOF
8506 > /* end confdefs.h.  */
8507 > #include <ac_nonexistent.h>
8508 > _ACEOF
8509 > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
8510 >  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
8511 >  ac_status=$?
8512 >  grep -v '^ *+' conftest.er1 >conftest.err
8513 >  rm -f conftest.er1
8514 >  cat conftest.err >&5
8515 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
8516 >  (exit $ac_status); } >/dev/null; then
8517 >  if test -s conftest.err; then
8518 >    ac_cpp_err=$ac_cxx_preproc_warn_flag
8519 >    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
8520 >  else
8521 >    ac_cpp_err=
8522 >  fi
8523 > else
8524 >  ac_cpp_err=yes
8525   fi
8526 < echo "$as_me:$LINENO: result: $ac_cv_lib_sprng_init_rng" >&5
8527 < echo "${ECHO_T}$ac_cv_lib_sprng_init_rng" >&6
8528 < if test $ac_cv_lib_sprng_init_rng = yes; then
7215 <  SPRNG_LIB="-lsprng"
8526 > if test -z "$ac_cpp_err"; then
8527 >  # Broken: success on invalid input.
8528 > continue
8529   else
8530 +  echo "$as_me: failed program was:" >&5
8531 + sed 's/^/| /' conftest.$ac_ext >&5
8532  
8533 <             { { echo "$as_me:$LINENO: error: Didn't find libsprng; check path for SPRNG package first..." >&5
8534 < echo "$as_me: error: Didn't find libsprng; check path for SPRNG package first..." >&2;}
8535 <   { (exit 1); exit 1; }; }
8536 <             USE_SPRNG="no"
8533 >  # Passes both tests.
8534 > ac_preproc_ok=:
8535 > break
8536 > fi
8537 > rm -f conftest.err conftest.$ac_ext
8538  
8539 + done
8540 + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
8541 + rm -f conftest.err conftest.$ac_ext
8542 + if $ac_preproc_ok; then
8543 +  break
8544   fi
8545  
8546 +    done
8547 +    ac_cv_prog_CXXCPP=$CXXCPP
8548  
8549 < if test "$USE_SPRNG" = "no"; then
8550 <  { { echo "$as_me:$LINENO: error: No working SPRNG library found" >&5
8551 < echo "$as_me: error: No working SPRNG library found" >&2;}
8552 <   { (exit 1); exit 1; }; }
8549 > fi
8550 >  CXXCPP=$ac_cv_prog_CXXCPP
8551 > else
8552 >  ac_cv_prog_CXXCPP=$CXXCPP
8553 > fi
8554 > echo "$as_me:$LINENO: result: $CXXCPP" >&5
8555 > echo "${ECHO_T}$CXXCPP" >&6
8556 > ac_preproc_ok=false
8557 > for ac_cxx_preproc_warn_flag in '' yes
8558 > do
8559 >  # Use a header file that comes with gcc, so configuring glibc
8560 >  # with a fresh cross-compiler works.
8561 >  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
8562 >  # <limits.h> exists even on freestanding compilers.
8563 >  # On the NeXT, cc -E runs the code through the compiler's parser,
8564 >  # not just through cpp. "Syntax error" is here to catch this case.
8565 >  cat >conftest.$ac_ext <<_ACEOF
8566 > /* confdefs.h.  */
8567 > _ACEOF
8568 > cat confdefs.h >>conftest.$ac_ext
8569 > cat >>conftest.$ac_ext <<_ACEOF
8570 > /* end confdefs.h.  */
8571 > #ifdef __STDC__
8572 > # include <limits.h>
8573 > #else
8574 > # include <assert.h>
8575 > #endif
8576 >                     Syntax error
8577 > _ACEOF
8578 > if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
8579 >  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
8580 >  ac_status=$?
8581 >  grep -v '^ *+' conftest.er1 >conftest.err
8582 >  rm -f conftest.er1
8583 >  cat conftest.err >&5
8584 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
8585 >  (exit $ac_status); } >/dev/null; then
8586 >  if test -s conftest.err; then
8587 >    ac_cpp_err=$ac_cxx_preproc_warn_flag
8588 >    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
8589 >  else
8590 >    ac_cpp_err=
8591 >  fi
8592 > else
8593 >  ac_cpp_err=yes
8594   fi
8595 + if test -z "$ac_cpp_err"; then
8596 +  :
8597 + else
8598 +  echo "$as_me: failed program was:" >&5
8599 + sed 's/^/| /' conftest.$ac_ext >&5
8600  
8601 +  # Broken: fails on valid input.
8602 + continue
8603 + fi
8604 + rm -f conftest.err conftest.$ac_ext
8605  
8606 +  # OK, works on sane cases.  Now check whether non-existent headers
8607 +  # can be detected and how.
8608 +  cat >conftest.$ac_ext <<_ACEOF
8609 + /* confdefs.h.  */
8610 + _ACEOF
8611 + cat confdefs.h >>conftest.$ac_ext
8612 + cat >>conftest.$ac_ext <<_ACEOF
8613 + /* end confdefs.h.  */
8614 + #include <ac_nonexistent.h>
8615 + _ACEOF
8616 + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
8617 +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
8618 +  ac_status=$?
8619 +  grep -v '^ *+' conftest.er1 >conftest.err
8620 +  rm -f conftest.er1
8621 +  cat conftest.err >&5
8622 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
8623 +  (exit $ac_status); } >/dev/null; then
8624 +  if test -s conftest.err; then
8625 +    ac_cpp_err=$ac_cxx_preproc_warn_flag
8626 +    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
8627 +  else
8628 +    ac_cpp_err=
8629 +  fi
8630 + else
8631 +  ac_cpp_err=yes
8632   fi
8633 + if test -z "$ac_cpp_err"; then
8634 +  # Broken: success on invalid input.
8635 + continue
8636 + else
8637 +  echo "$as_me: failed program was:" >&5
8638 + sed 's/^/| /' conftest.$ac_ext >&5
8639  
8640 +  # Passes both tests.
8641 + ac_preproc_ok=:
8642 + break
8643 + fi
8644 + rm -f conftest.err conftest.$ac_ext
8645  
8646 <
8647 < echo "$as_me:$LINENO: checking if MKL is wanted" >&5
8648 < echo $ECHO_N "checking if MKL is wanted... $ECHO_C" >&6
8649 <
8650 < # Check whether --with-mkl or --without-mkl was given.
8651 < if test "${with_mkl+set}" = set; then
8652 <  withval="$with_mkl"
8653 <     echo "$as_me:$LINENO: result: yes" >&5
8654 < echo "${ECHO_T}yes" >&6
8655 <    for dir in $withval /usr/local/intel/mkl61 /opt/intel/mkl61; do
7246 <        mkldir="$dir"
7247 <        if test -f "$dir/include/mkl.h"; then
7248 <            found_mkl="yes";
7249 <            break;
7250 <        fi
7251 <    done
7252 <    if test x_$found_mkl != x_yes; then
7253 <        { { echo "$as_me:$LINENO: error: Cannot find MKL includes" >&5
7254 < echo "$as_me: error: Cannot find MKL includes" >&2;}
8646 > done
8647 > # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
8648 > rm -f conftest.err conftest.$ac_ext
8649 > if $ac_preproc_ok; then
8650 >  :
8651 > else
8652 >  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
8653 > See \`config.log' for more details." >&5
8654 > echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
8655 > See \`config.log' for more details." >&2;}
8656     { (exit 1); exit 1; }; }
8657 <    else
7257 <        printf "MKL includes found in $mkldir/include\n";
7258 <    fi
8657 > fi
8658  
8659 + ac_ext=cc
8660 + ac_cpp='$CXXCPP $CPPFLAGS'
8661 + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
8662 + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
8663 + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
8664  
8665  
8666 <  ac_ext=c
8667 < ac_cpp='$CPP $CPPFLAGS'
8668 < ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
8669 < ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7266 < ac_compiler_gnu=$ac_cv_c_compiler_gnu
7267 <
7268 <  ac_save_CPPFLAGS=$CPPFLAGS
7269 <  CPPFLAGS="${CPPFLAGS} -I${mkldir}/include"
7270 <  ac_save_LDFLAGS=$LDFLAGS
7271 <  LDFLAGS="${LDFLAGS} -L${mkldir}/lib/32 -lmkl -lvml -lguide"
7272 <  if test "${ac_cv_header_mkl_h+set}" = set; then
7273 <  echo "$as_me:$LINENO: checking for mkl.h" >&5
7274 < echo $ECHO_N "checking for mkl.h... $ECHO_C" >&6
7275 < if test "${ac_cv_header_mkl_h+set}" = set; then
8666 > if test "${ac_cv_header_CGAL_Cartesian_h+set}" = set; then
8667 >  echo "$as_me:$LINENO: checking for CGAL/Cartesian.h" >&5
8668 > echo $ECHO_N "checking for CGAL/Cartesian.h... $ECHO_C" >&6
8669 > if test "${ac_cv_header_CGAL_Cartesian_h+set}" = set; then
8670    echo $ECHO_N "(cached) $ECHO_C" >&6
8671   fi
8672 < echo "$as_me:$LINENO: result: $ac_cv_header_mkl_h" >&5
8673 < echo "${ECHO_T}$ac_cv_header_mkl_h" >&6
8672 > echo "$as_me:$LINENO: result: $ac_cv_header_CGAL_Cartesian_h" >&5
8673 > echo "${ECHO_T}$ac_cv_header_CGAL_Cartesian_h" >&6
8674   else
8675    # Is the header compilable?
8676 < echo "$as_me:$LINENO: checking mkl.h usability" >&5
8677 < echo $ECHO_N "checking mkl.h usability... $ECHO_C" >&6
8676 > echo "$as_me:$LINENO: checking CGAL/Cartesian.h usability" >&5
8677 > echo $ECHO_N "checking CGAL/Cartesian.h usability... $ECHO_C" >&6
8678   cat >conftest.$ac_ext <<_ACEOF
8679   /* confdefs.h.  */
8680   _ACEOF
# Line 7288 | Line 8682 | $ac_includes_default
8682   cat >>conftest.$ac_ext <<_ACEOF
8683   /* end confdefs.h.  */
8684   $ac_includes_default
8685 < #include <mkl.h>
8685 > #include <CGAL/Cartesian.h>
8686   _ACEOF
8687   rm -f conftest.$ac_objext
8688   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
# Line 7299 | Line 8693 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8693    cat conftest.err >&5
8694    echo "$as_me:$LINENO: \$? = $ac_status" >&5
8695    (exit $ac_status); } &&
8696 <         { ac_try='test -z "$ac_c_werror_flag"
8696 >         { ac_try='test -z "$ac_cxx_werror_flag"
8697                           || test ! -s conftest.err'
8698    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8699    (eval $ac_try) 2>&5
# Line 7324 | Line 8718 | echo "$as_me:$LINENO: checking mkl.h presence" >&5
8718   echo "${ECHO_T}$ac_header_compiler" >&6
8719  
8720   # Is the header present?
8721 < echo "$as_me:$LINENO: checking mkl.h presence" >&5
8722 < echo $ECHO_N "checking mkl.h presence... $ECHO_C" >&6
8721 > echo "$as_me:$LINENO: checking CGAL/Cartesian.h presence" >&5
8722 > echo $ECHO_N "checking CGAL/Cartesian.h presence... $ECHO_C" >&6
8723   cat >conftest.$ac_ext <<_ACEOF
8724   /* confdefs.h.  */
8725   _ACEOF
8726   cat confdefs.h >>conftest.$ac_ext
8727   cat >>conftest.$ac_ext <<_ACEOF
8728   /* end confdefs.h.  */
8729 < #include <mkl.h>
8729 > #include <CGAL/Cartesian.h>
8730   _ACEOF
8731   if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
8732    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
# Line 7343 | Line 8737 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$a
8737    echo "$as_me:$LINENO: \$? = $ac_status" >&5
8738    (exit $ac_status); } >/dev/null; then
8739    if test -s conftest.err; then
8740 <    ac_cpp_err=$ac_c_preproc_warn_flag
8741 <    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
8740 >    ac_cpp_err=$ac_cxx_preproc_warn_flag
8741 >    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
8742    else
8743      ac_cpp_err=
8744    fi
# Line 7364 | Line 8758 | case $ac_header_compiler:$ac_header_preproc:$ac_c_prep
8758   echo "${ECHO_T}$ac_header_preproc" >&6
8759  
8760   # So?  What about this header?
8761 < case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
8761 > case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
8762    yes:no: )
8763 <    { echo "$as_me:$LINENO: WARNING: mkl.h: accepted by the compiler, rejected by the preprocessor!" >&5
8764 < echo "$as_me: WARNING: mkl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
8765 <    { echo "$as_me:$LINENO: WARNING: mkl.h: proceeding with the compiler's result" >&5
8766 < echo "$as_me: WARNING: mkl.h: proceeding with the compiler's result" >&2;}
8763 >    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: accepted by the compiler, rejected by the preprocessor!" >&5
8764 > echo "$as_me: WARNING: CGAL/Cartesian.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
8765 >    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: proceeding with the compiler's result" >&5
8766 > echo "$as_me: WARNING: CGAL/Cartesian.h: proceeding with the compiler's result" >&2;}
8767      ac_header_preproc=yes
8768      ;;
8769    no:yes:* )
8770 <    { echo "$as_me:$LINENO: WARNING: mkl.h: present but cannot be compiled" >&5
8771 < echo "$as_me: WARNING: mkl.h: present but cannot be compiled" >&2;}
8772 <    { echo "$as_me:$LINENO: WARNING: mkl.h:     check for missing prerequisite headers?" >&5
8773 < echo "$as_me: WARNING: mkl.h:     check for missing prerequisite headers?" >&2;}
8774 <    { echo "$as_me:$LINENO: WARNING: mkl.h: see the Autoconf documentation" >&5
8775 < echo "$as_me: WARNING: mkl.h: see the Autoconf documentation" >&2;}
8776 <    { echo "$as_me:$LINENO: WARNING: mkl.h:     section \"Present But Cannot Be Compiled\"" >&5
8777 < echo "$as_me: WARNING: mkl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
8778 <    { echo "$as_me:$LINENO: WARNING: mkl.h: proceeding with the preprocessor's result" >&5
8779 < echo "$as_me: WARNING: mkl.h: proceeding with the preprocessor's result" >&2;}
8780 <    { echo "$as_me:$LINENO: WARNING: mkl.h: in the future, the compiler will take precedence" >&5
8781 < echo "$as_me: WARNING: mkl.h: in the future, the compiler will take precedence" >&2;}
8770 >    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: present but cannot be compiled" >&5
8771 > echo "$as_me: WARNING: CGAL/Cartesian.h: present but cannot be compiled" >&2;}
8772 >    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h:     check for missing prerequisite headers?" >&5
8773 > echo "$as_me: WARNING: CGAL/Cartesian.h:     check for missing prerequisite headers?" >&2;}
8774 >    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: see the Autoconf documentation" >&5
8775 > echo "$as_me: WARNING: CGAL/Cartesian.h: see the Autoconf documentation" >&2;}
8776 >    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h:     section \"Present But Cannot Be Compiled\"" >&5
8777 > echo "$as_me: WARNING: CGAL/Cartesian.h:     section \"Present But Cannot Be Compiled\"" >&2;}
8778 >    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: proceeding with the preprocessor's result" >&5
8779 > echo "$as_me: WARNING: CGAL/Cartesian.h: proceeding with the preprocessor's result" >&2;}
8780 >    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: in the future, the compiler will take precedence" >&5
8781 > echo "$as_me: WARNING: CGAL/Cartesian.h: in the future, the compiler will take precedence" >&2;}
8782      (
8783        cat <<\_ASBOX
8784   ## ------------------------------ ##
# Line 7395 | Line 8789 | echo "$as_me:$LINENO: checking for mkl.h" >&5
8789        sed "s/^/$as_me: WARNING:     /" >&2
8790      ;;
8791   esac
8792 < echo "$as_me:$LINENO: checking for mkl.h" >&5
8793 < echo $ECHO_N "checking for mkl.h... $ECHO_C" >&6
8794 < if test "${ac_cv_header_mkl_h+set}" = set; then
8792 > echo "$as_me:$LINENO: checking for CGAL/Cartesian.h" >&5
8793 > echo $ECHO_N "checking for CGAL/Cartesian.h... $ECHO_C" >&6
8794 > if test "${ac_cv_header_CGAL_Cartesian_h+set}" = set; then
8795    echo $ECHO_N "(cached) $ECHO_C" >&6
8796   else
8797 <  ac_cv_header_mkl_h=$ac_header_preproc
8797 >  ac_cv_header_CGAL_Cartesian_h=$ac_header_preproc
8798   fi
8799 < echo "$as_me:$LINENO: result: $ac_cv_header_mkl_h" >&5
8800 < echo "${ECHO_T}$ac_cv_header_mkl_h" >&6
8799 > echo "$as_me:$LINENO: result: $ac_cv_header_CGAL_Cartesian_h" >&5
8800 > echo "${ECHO_T}$ac_cv_header_CGAL_Cartesian_h" >&6
8801  
8802   fi
8803 < if test $ac_cv_header_mkl_h = yes; then
8804 <
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
8803 > if test $ac_cv_header_CGAL_Cartesian_h = yes; then
8804 >  cgal=yes
8805   else
8806 <  ac_check_lib_save_LIBS=$LIBS
8807 < LIBS="-lmkl  $LIBS"
8806 >  cgal=no
8807 > fi
8808 >
8809 >
8810 >    CXXFLAGS="$save_CXXFLAGS"
8811 >
8812 >    if test "x$cgal" = xyes; then
8813 >      echo "$as_me:$LINENO: checking for CGAL version" >&5
8814 > echo $ECHO_N "checking for CGAL version... $ECHO_C" >&6
8815 >      LOCATION=${CGAL_INCLDIR}
8816 >      LOCATION=${LOCATION:-/usr/include}
8817 >      if test -f $LOCATION/CGAL/version.h; then
8818 >        CGAL_VERSION=`grep '#define.*\<CGAL_VERSION\>.*' $LOCATION/CGAL/version.h | sed 's/[^0-9\.]*//g'`
8819 >      else
8820 >        CGAL_VERSION=`grep '#define.*\<CGAL_VERSION\>.*' $LOCATION/CGAL/config.h | sed 's/[^0-9\.]*//g'`
8821 >      fi
8822 >      if echo $CGAL_VERSION | grep -q "^[3456789]"; then
8823 >        echo "$as_me:$LINENO: result: ($CGAL_VERSION) yes" >&5
8824 > echo "${ECHO_T}($CGAL_VERSION) yes" >&6
8825 >      else
8826 >        echo "$as_me:$LINENO: result: ($CGAL_VERSION) no" >&5
8827 > echo "${ECHO_T}($CGAL_VERSION) no" >&6
8828 >        cgal=no
8829 >      fi
8830 >    fi
8831 >
8832 >    if test "x$cgal" = xyes; then
8833 >      CGAL_LIBS="-lCGAL"
8834 >      echo "$as_me:$LINENO: checking whether CGAL uses LEDA" >&5
8835 > echo $ECHO_N "checking whether CGAL uses LEDA... $ECHO_C" >&6
8836 >      if echo $CGAL_CXXFLAGS | grep -q -- -DCGAL_USE_LEDA; then
8837 >        CGAL_USES_LEDA=yes
8838 >        echo "$as_me:$LINENO: result: yes" >&5
8839 > echo "${ECHO_T}yes" >&6
8840 >        CGAL_DEFINES="-DCGAL_USE_LEDA -DLEDA_PREFIX"
8841 >      else
8842 >        echo "$as_me:$LINENO: result: no" >&5
8843 > echo "${ECHO_T}no" >&6
8844 >        CGAL_USES_LEDA=no
8845 >      fi
8846 >
8847 >      echo "$as_me:$LINENO: checking whether CGAL uses GMP" >&5
8848 > echo $ECHO_N "checking whether CGAL uses GMP... $ECHO_C" >&6
8849 >      if echo $CGAL_CXXFLAGS | grep -q -- -DCGAL_USE_GMP; then
8850 >        CGAL_USES_GMP=yes
8851 >        echo "$as_me:$LINENO: result: yes" >&5
8852 > echo "${ECHO_T}yes" >&6
8853 >        CGAL_DEFINES="-DCGAL_USE_GMP $CGAL_DEFINES"
8854 >      else
8855 >        echo "$as_me:$LINENO: result: no" >&5
8856 > echo "${ECHO_T}no" >&6
8857 >        CGAL_USES_GMP=no
8858 >      fi
8859 >
8860 >      CGAL_LIBS="$CGAL_LIBS -lm"
8861 >
8862 >      CGAL_CXXFLAGS="-ftemplate-depth-50"
8863 >
8864 >      echo "$as_me:$LINENO: result: CGAL_USES_LEDA=     $CGAL_USES_LEDA" >&5
8865 > echo "${ECHO_T}CGAL_USES_LEDA=     $CGAL_USES_LEDA" >&6
8866 >      echo "$as_me:$LINENO: result: CGAL_USES_GMP =     $CGAL_USES_GMP" >&5
8867 > echo "${ECHO_T}CGAL_USES_GMP =     $CGAL_USES_GMP" >&6
8868 >      echo "$as_me:$LINENO: result: CGAL_INCLDIR  =     $CGAL_INCLDIR" >&5
8869 > echo "${ECHO_T}CGAL_INCLDIR  =     $CGAL_INCLDIR" >&6
8870 >      echo "$as_me:$LINENO: result: CGAL_LIBDIR   =     $CGAL_LIBDIR" >&5
8871 > echo "${ECHO_T}CGAL_LIBDIR   =     $CGAL_LIBDIR" >&6
8872 >      echo "$as_me:$LINENO: result: CGAL_DEFINES  =     $CGAL_DEFINES" >&5
8873 > echo "${ECHO_T}CGAL_DEFINES  =     $CGAL_DEFINES" >&6
8874 >      echo "$as_me:$LINENO: result: CGAL_CXXFLAGS =     $CGAL_CXXFLAGS" >&5
8875 > echo "${ECHO_T}CGAL_CXXFLAGS =     $CGAL_CXXFLAGS" >&6
8876 >      echo "$as_me:$LINENO: result: CGAL_LIBS     =     $CGAL_LIBS" >&5
8877 > echo "${ECHO_T}CGAL_LIBS     =     $CGAL_LIBS" >&6
8878 >    fi
8879 >
8880 >    if test "x$cgal" = xyes; then
8881 >      save_LIBS="$LIBS"
8882 >      LIBS="$LIBS -L$CGAL_LIBDIR"
8883 >      if test "x$CGAL_USES_LEDA" = xyes; then
8884 >        LIBS="-lL $LIBS -L$LEDA_LIBDIR"
8885 >      fi
8886 >      # if test "x$CGAL_USES_GMP" = xyes; then
8887 >      #   LIBS="-lgmp $LIBS $GMP_LIBDIR"
8888 >      # fi
8889 >      echo "$as_me:$LINENO: checking for ::CGAL::Cartesian<int>::Point_2 in -lCGAL" >&5
8890 > echo $ECHO_N "checking for ::CGAL::Cartesian<int>::Point_2 in -lCGAL... $ECHO_C" >&6
8891 > save_CXXFLAGS_CHECK_CXX_LIB="$CXXFLAGS"
8892 > CXXFLAGS="$CXXFLAGS -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR"
8893 > save_LIBS_CHECK_CXX_LIB="$LIBS"
8894 > LIBS="-lCGAL  $LIBS"
8895   cat >conftest.$ac_ext <<_ACEOF
8896   /* confdefs.h.  */
8897   _ACEOF
8898   cat confdefs.h >>conftest.$ac_ext
8899   cat >>conftest.$ac_ext <<_ACEOF
8900   /* end confdefs.h.  */
8901 <
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 ();
8901 > #include <CGAL/Cartesian.h>
8902   int
8903   main ()
8904   {
8905 < vslNewStream ();
8905 > ::CGAL::Cartesian<int>::Point_2 P
8906    ;
8907    return 0;
8908   }
# Line 7446 | Line 8916 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8916    cat conftest.err >&5
8917    echo "$as_me:$LINENO: \$? = $ac_status" >&5
8918    (exit $ac_status); } &&
8919 <         { ac_try='test -z "$ac_c_werror_flag"
8919 >         { ac_try='test -z "$ac_cxx_werror_flag"
8920                           || test ! -s conftest.err'
8921    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8922    (eval $ac_try) 2>&5
# Line 7459 | Line 8929 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8929    ac_status=$?
8930    echo "$as_me:$LINENO: \$? = $ac_status" >&5
8931    (exit $ac_status); }; }; then
8932 <  ac_cv_lib_mkl_vslNewStream=yes
8932 >  echo "$as_me:$LINENO: result: yes" >&5
8933 > echo "${ECHO_T}yes" >&6
8934 > cgal=yes
8935   else
8936    echo "$as_me: failed program was:" >&5
8937   sed 's/^/| /' conftest.$ac_ext >&5
8938  
8939 < ac_cv_lib_mkl_vslNewStream=no
8939 > echo "$as_me:$LINENO: result: no" >&5
8940 > echo "${ECHO_T}no" >&6
8941 > cgal=no
8942   fi
8943   rm -f conftest.err conftest.$ac_objext \
8944        conftest$ac_exeext conftest.$ac_ext
8945 < LIBS=$ac_check_lib_save_LIBS
8945 > CXXFLAGS="$save_CXXFLAGS_CHECK_CXX_LIB"
8946 > LIBS="$save_LIBS_CHECK_CXX_LIB"
8947 >      LIBS="$save_LIBS"
8948 >    fi
8949 >
8950 >  fi
8951 >  ac_ext=c
8952 > ac_cpp='$CPP $CPPFLAGS'
8953 > ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
8954 > ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
8955 > ac_compiler_gnu=$ac_cv_c_compiler_gnu
8956 >
8957 >
8958   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
8959  
8960 + if test "x$cgal" = xyes; then
8961 +  USE_CGAL=yes
8962  
8963 + cat >>confdefs.h <<\_ACEOF
8964 + #define HAVE_CGAL 1
8965 + _ACEOF
8966 +
8967 +
8968 + cat >>confdefs.h <<_ACEOF
8969 + #define CGAL_VERSION $CGAL_VERSION
8970 + _ACEOF
8971 +
8972 +  if ! echo $CGAL_VERSION | grep -q "^3.0"; then
8973 +    { echo "$as_me:$LINENO: WARNING: *****************************************************" >&5
8974 + echo "$as_me: WARNING: *****************************************************" >&2;}
8975 +    { echo "$as_me:$LINENO: WARNING: *** Warning: Your CGAL version is newer than the  ***" >&5
8976 + echo "$as_me: WARNING: *** Warning: Your CGAL version is newer than the  ***" >&2;}
8977 +    { echo "$as_me:$LINENO: WARNING: *** supported versions. It may still work though. ***" >&5
8978 + echo "$as_me: WARNING: *** supported versions. It may still work though. ***" >&2;}
8979 +    { echo "$as_me:$LINENO: WARNING: *****************************************************" >&5
8980 + echo "$as_me: WARNING: *****************************************************" >&2;}
8981 +  fi
8982   else
8983 <  MKL_INC="-I${mkldir}/include"
8983 >   if test "x$cgal_makefile" != xno; then
8984 >    echo "$as_me:$LINENO: result: No CGAL support. These are not the droids you want." >&5
8985 > echo "${ECHO_T}No CGAL support. These are not the droids you want." >&6
8986 >  fi
8987 >  CGAL_INCLDIR=
8988 >  CGAL_LIBDIR=
8989 >  CGAL_RLIBDIR=
8990 >  CGAL_DEFINES=
8991 >  CGAL_CXXFLAGS=
8992 >  CGAL_LIBS=
8993   fi
8994  
8995  
8996 <  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
8996 > CGAL_INC_DIR="${CGAL_INCLDIR} ${CGAL_INCLCONFDIR}"
8997  
8998 + CGAL_LIB_DIR=${CGAL_LIBDIR}
8999  
9000 <  if test x_$HAVE_MKL != x_yes; then
9001 <        { { echo "$as_me:$LINENO: error: Can't build with MKL" >&5
9002 < echo "$as_me: error: Can't build with MKL" >&2;}
9000 > CGAL_RLIB_DIR=${CGAL_RLIBDIR}
9001 >
9002 >
9003 >
9004 >
9005 >
9006 >
9007 >
9008 > # Check whether --enable-doxygen or --disable-doxygen was given.
9009 > if test "${enable_doxygen+set}" = set; then
9010 >  enableval="$enable_doxygen"
9011 >
9012 > fi;
9013 > # Check whether --enable-dot or --disable-dot was given.
9014 > if test "${enable_dot+set}" = set; then
9015 >  enableval="$enable_dot"
9016 >
9017 > fi;
9018 > # Check whether --enable-html-docs or --disable-html-docs was given.
9019 > if test "${enable_html_docs+set}" = set; then
9020 >  enableval="$enable_html_docs"
9021 >
9022 > else
9023 >   enable_html_docs=yes
9024 > fi;
9025 > # Check whether --enable-latex-docs or --disable-latex-docs was given.
9026 > if test "${enable_latex_docs+set}" = set; then
9027 >  enableval="$enable_latex_docs"
9028 >
9029 > else
9030 >   enable_latex_docs=no
9031 > fi;
9032 > if test "x$enable_doxygen" = xno; then
9033 >        enable_doc=no
9034 > else
9035 >        # Extract the first word of "doxygen", so it can be a program name with args.
9036 > set dummy doxygen; ac_word=$2
9037 > echo "$as_me:$LINENO: checking for $ac_word" >&5
9038 > echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
9039 > if test "${ac_cv_path_DOXYGEN+set}" = set; then
9040 >  echo $ECHO_N "(cached) $ECHO_C" >&6
9041 > else
9042 >  case $DOXYGEN in
9043 >  [\\/]* | ?:[\\/]*)
9044 >  ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path.
9045 >  ;;
9046 >  *)
9047 >  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9048 > for as_dir in $PATH
9049 > do
9050 >  IFS=$as_save_IFS
9051 >  test -z "$as_dir" && as_dir=.
9052 >  for ac_exec_ext in '' $ac_executable_extensions; do
9053 >  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
9054 >    ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"
9055 >    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9056 >    break 2
9057 >  fi
9058 > done
9059 > done
9060 >
9061 >  ;;
9062 > esac
9063 > fi
9064 > DOXYGEN=$ac_cv_path_DOXYGEN
9065 >
9066 > if test -n "$DOXYGEN"; then
9067 >  echo "$as_me:$LINENO: result: $DOXYGEN" >&5
9068 > echo "${ECHO_T}$DOXYGEN" >&6
9069 > else
9070 >  echo "$as_me:$LINENO: result: no" >&5
9071 > echo "${ECHO_T}no" >&6
9072 > fi
9073 >
9074 >        if test "x$DOXYGEN" = x; then
9075 >                if test "x$enable_doxygen" = xyes; then
9076 >                        { { echo "$as_me:$LINENO: error: could not find doxygen" >&5
9077 > echo "$as_me: error: could not find doxygen" >&2;}
9078     { (exit 1); exit 1; }; }
9079 +                fi
9080 +                enable_doc=no
9081 +        else
9082 +                enable_doc=yes
9083 +                # Extract the first word of "dot", so it can be a program name with args.
9084 + set dummy dot; ac_word=$2
9085 + echo "$as_me:$LINENO: checking for $ac_word" >&5
9086 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
9087 + if test "${ac_cv_path_DOT+set}" = set; then
9088 +  echo $ECHO_N "(cached) $ECHO_C" >&6
9089 + else
9090 +  case $DOT in
9091 +  [\\/]* | ?:[\\/]*)
9092 +  ac_cv_path_DOT="$DOT" # Let the user override the test with a path.
9093 +  ;;
9094 +  *)
9095 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9096 + for as_dir in $PATH
9097 + do
9098 +  IFS=$as_save_IFS
9099 +  test -z "$as_dir" && as_dir=.
9100 +  for ac_exec_ext in '' $ac_executable_extensions; do
9101 +  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
9102 +    ac_cv_path_DOT="$as_dir/$ac_word$ac_exec_ext"
9103 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
9104 +    break 2
9105    fi
9106 + done
9107 + done
9108  
9109 +  ;;
9110 + esac
9111 + fi
9112 + DOT=$ac_cv_path_DOT
9113  
9114 + if test -n "$DOT"; then
9115 +  echo "$as_me:$LINENO: result: $DOT" >&5
9116 + echo "${ECHO_T}$DOT" >&6
9117 + else
9118 +  echo "$as_me:$LINENO: result: no" >&5
9119 + echo "${ECHO_T}no" >&6
9120 + fi
9121  
9122 +        fi
9123 + fi
9124  
9125 + if test "x$enable_doc" = xyes; then
9126 +  DOC=1
9127 + else
9128 +  DOC=0
9129 + fi
9130  
9131 +
9132 + if test x$DOT = x; then
9133 +        if test "x$enable_dot" = xyes; then
9134 +                { { echo "$as_me:$LINENO: error: could not find dot" >&5
9135 + echo "$as_me: error: could not find dot" >&2;}
9136 +   { (exit 1); exit 1; }; }
9137 +        fi
9138 +        enable_dot=no
9139   else
9140 +        enable_dot=yes
9141 + fi
9142  
7508    echo "$as_me:$LINENO: result: no" >&5
7509 echo "${ECHO_T}no" >&6
9143  
7511 fi;
9144  
9145  
9146  
# Line 7570 | Line 9202 | esac
9202  
9203  
9204  
9205 +
9206            ac_config_headers="$ac_config_headers src/config.h"
9207  
9208 <          ac_config_files="$ac_config_files make/Make.conf"
9208 >                                        ac_config_files="$ac_config_files make/Makefile src/utils/Makefile src/applications/nanoRodBuilder/Makefile scripts/filepp"
9209  
9210  
9211   cat >confcache <<\_ACEOF
# Line 8103 | Line 9736 | do
9736   do
9737    case "$ac_config_target" in
9738    # Handling of arguments.
9739 <  "make/Make.conf" ) CONFIG_FILES="$CONFIG_FILES make/Make.conf" ;;
9740 <  "utils/getopt.h" ) CONFIG_LINKS="$CONFIG_LINKS utils/getopt.h:utils/gnugetopt.h" ;;
9739 >  "make/Makefile" ) CONFIG_FILES="$CONFIG_FILES make/Makefile" ;;
9740 >  "src/utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/utils/Makefile" ;;
9741 >  "src/applications/nanoRodBuilder/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/applications/nanoRodBuilder/Makefile" ;;
9742 >  "scripts/filepp" ) CONFIG_FILES="$CONFIG_FILES scripts/filepp" ;;
9743 >  "src/getopt.h" ) CONFIG_LINKS="$CONFIG_LINKS src/getopt.h:src/utils/gnugetopt.h" ;;
9744    "src/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
9745    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
9746   echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
# Line 8225 | Line 9861 | s,@CPP@,$CPP,;t t
9861   s,@F90_WORK_FILES_ARG@,$F90_WORK_FILES_ARG,;t t
9862   s,@MODDIRFLAG@,$MODDIRFLAG,;t t
9863   s,@F90MODINCSPEC@,$F90MODINCSPEC,;t t
9864 + s,@F90_MODULE_NAMES@,$F90_MODULE_NAMES,;t t
9865   s,@CPP@,$CPP,;t t
9866   s,@EGREP@,$EGREP,;t t
9867   s,@LIBOBJS@,$LIBOBJS,;t t
# Line 8239 | Line 9876 | s,@AR@,$AR,;t t
9876   s,@LEX@,$LEX,;t t
9877   s,@LEXLIB@,$LEXLIB,;t t
9878   s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
9879 + s,@PERLINTERP@,$PERLINTERP,;t t
9880 + s,@PERL_SHEBANG@,$PERL_SHEBANG,;t t
9881   s,@AR@,$AR,;t t
9882 + s,@PS@,$PS,;t t
9883   s,@MPI_LIB_DIR@,$MPI_LIB_DIR,;t t
9884   s,@MPI_INC_DIR@,$MPI_INC_DIR,;t t
9885   s,@MPI_F90_INC@,$MPI_F90_INC,;t t
9886   s,@MPI_LIB@,$MPI_LIB,;t t
9887   s,@MPI_F90_LIB@,$MPI_F90_LIB,;t t
9888   s,@USE_MPI@,$USE_MPI,;t t
9889 < s,@SPRNG_LIB_DIR@,$SPRNG_LIB_DIR,;t t
9890 < s,@SPRNG_INC_DIR@,$SPRNG_INC_DIR,;t t
9891 < s,@SPRNG_LIB@,$SPRNG_LIB,;t t
9892 < s,@USE_SPRNG@,$USE_SPRNG,;t t
9893 < s,@MKL_LIBDIR@,$MKL_LIBDIR,;t t
9894 < s,@MKL_LIB@,$MKL_LIB,;t t
9895 < s,@MKL_INC@,$MKL_INC,;t t
9896 < s,@HAVE_MKL@,$HAVE_MKL,;t t
9889 > s,@CXXCPP@,$CXXCPP,;t t
9890 > s,@USE_CGAL@,$USE_CGAL,;t t
9891 > s,@CGAL_INC_DIR@,$CGAL_INC_DIR,;t t
9892 > s,@CGAL_LIB_DIR@,$CGAL_LIB_DIR,;t t
9893 > s,@CGAL_RLIB_DIR@,$CGAL_RLIB_DIR,;t t
9894 > s,@CGAL_DEFINES@,$CGAL_DEFINES,;t t
9895 > s,@CGAL_CXXFLAGS@,$CGAL_CXXFLAGS,;t t
9896 > s,@CGAL_LIBS@,$CGAL_LIBS,;t t
9897 > s,@DOXYGEN@,$DOXYGEN,;t t
9898 > s,@DOT@,$DOT,;t t
9899 > s,@DOC@,$DOC,;t t
9900 > s,@enable_dot@,$enable_dot,;t t
9901 > s,@enable_html_docs@,$enable_html_docs,;t t
9902 > s,@enable_latex_docs@,$enable_latex_docs,;t t
9903   s,@BATEXT@,$BATEXT,;t t
9904   s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
9905   s,@OOPSE@,$OOPSE,;t t
# Line 8497 | Line 10143 | done
10143      rm -f $tmp/out
10144    fi
10145  
10146 +  # Run the commands associated with the file.
10147 +  case $ac_file in
10148 +    make/Makefile ) chmod 0755 scripts/* ;;
10149 +    src/utils/Makefile ) chmod 0755 scripts/* ;;
10150 +    src/applications/nanoRodBuilder/Makefile ) chmod 0755 scripts/* ;;
10151 +    scripts/filepp ) chmod 0755 scripts/* ;;
10152 +  esac
10153   done
10154   _ACEOF
10155   cat >>$CONFIG_STATUS <<\_ACEOF

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines