diff -Nru xmds-1.6.5/aclocal.m4 xmds-1.6.6/aclocal.m4 --- xmds-1.6.5/aclocal.m4 2008-02-25 21:32:53.000000000 -0600 +++ xmds-1.6.6/aclocal.m4 2008-07-03 21:47:28.000000000 -0500 @@ -1,7 +1,7 @@ -# aclocal.m4t generated automatically by aclocal 1.6.3 -*- Autoconf -*- +# generated automatically by aclocal 1.10 -*- Autoconf -*- -# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,653 +11,52 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -dnl By default, many hosts won't let programs access large files; -dnl one must use special compiler options to get large-file access to work. -dnl For more details about this brain damage please see: -dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html - -dnl Written by Paul Eggert . - -dnl $Id: acinclude.m4 1511 2007-08-20 12:50:56Z paultcochrane $ - -dnl Internal subroutine of AC_SYS_EXTRA_LARGEFILE. -dnl AC_SYS_EXTRA_LARGEFILE_FLAGS(FLAGSNAME) -AC_DEFUN([AC_SYS_EXTRA_LARGEFILE_FLAGS], - [AC_CACHE_CHECK([for $1 value to request large file support], - ac_cv_sys_largefile_$1, - [ac_cv_sys_largefile_$1=`($GETCONF LFS_$1) 2>/dev/null` || { - ac_cv_sys_largefile_$1=no - ifelse($1, CFLAGS, - [case "$host_os" in - # IRIX 6.2 and later require cc -n32. -changequote(, )dnl - irix6.[2-9]* | irix6.1[0-9]* | irix[7-9].* | irix[1-9][0-9]*) -changequote([, ])dnl - if test "$GCC" != yes; then - ac_cv_sys_largefile_CFLAGS=-n32 - fi - ac_save_CC="$CC" - CC="$CC $ac_cv_sys_largefile_CFLAGS" - AC_TRY_LINK(, , , ac_cv_sys_largefile_CFLAGS=no) - CC="$ac_save_CC" - esac]) - }])]) - -dnl Internal subroutine of AC_SYS_EXTRA_LARGEFILE. -dnl AC_SYS_EXTRA_LARGEFILE_SPACE_APPEND(VAR, VAL) -AC_DEFUN([AC_SYS_EXTRA_LARGEFILE_SPACE_APPEND], - [case $2 in - no) ;; - ?*) - case "[$]$1" in - '') $1=$2 ;; - *) $1=[$]$1' '$2 ;; - esac ;; - esac]) - -dnl Internal subroutine of AC_SYS_EXTRA_LARGEFILE. -dnl AC_SYS_EXTRA_LARGEFILE_MACRO_VALUE(C-MACRO, CACHE-VAR, COMMENT, CODE-TO-SET-DEFAULT) -AC_DEFUN([AC_SYS_EXTRA_LARGEFILE_MACRO_VALUE], - [AC_CACHE_CHECK([for $1], $2, - [$2=no -changequote(, )dnl - $4 - for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do - case "$ac_flag" in - -D$1) - $2=1 ;; - -D$1=*) - $2=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;; - esac - done -changequote([, ])dnl - ]) - if test "[$]$2" != no; then - AC_DEFINE_UNQUOTED([$1], [$]$2, [$3]) - fi]) - -AC_DEFUN([AC_SYS_EXTRA_LARGEFILE], - [AC_REQUIRE([AC_CANONICAL_HOST]) - AC_ARG_ENABLE(largefile, - [ --disable-largefile omit support for large files]) - if test "$enable_largefile" != no; then - AC_CHECK_TOOL(GETCONF, getconf) - AC_SYS_EXTRA_LARGEFILE_FLAGS(CFLAGS) - AC_SYS_EXTRA_LARGEFILE_FLAGS(LDFLAGS) - AC_SYS_EXTRA_LARGEFILE_FLAGS(LIBS) - - for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do - case "$ac_flag" in - no) ;; - -D_FILE_OFFSET_BITS=*) ;; - -D_LARGEFILE_SOURCE | -D_LARGEFILE_SOURCE=*) ;; - -D_LARGE_FILES | -D_LARGE_FILES=*) ;; - -D?* | -I?*) - AC_SYS_EXTRA_LARGEFILE_SPACE_APPEND(CPPFLAGS, "$ac_flag") ;; - *) - AC_SYS_EXTRA_LARGEFILE_SPACE_APPEND(CFLAGS, "$ac_flag") ;; - esac - done - AC_SYS_EXTRA_LARGEFILE_SPACE_APPEND(LDFLAGS, "$ac_cv_sys_largefile_LDFLAGS") - AC_SYS_EXTRA_LARGEFILE_SPACE_APPEND(LIBS, "$ac_cv_sys_largefile_LIBS") - AC_SYS_EXTRA_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, - ac_cv_sys_file_offset_bits, - [[Number of bits in a file offset, on hosts where this is settable.]]) - [case "$host_os" in - # HP-UX 10.20 and later - hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*) - ac_cv_sys_file_offset_bits=64 ;; - esac] - AC_SYS_EXTRA_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, - ac_cv_sys_largefile_source, - [Define to make fseeko etc. visible, on some hosts.], - [case "$host_os" in - # HP-UX 10.20 and later - hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*) - ac_cv_sys_largefile_source=1 ;; - esac]) - AC_SYS_EXTRA_LARGEFILE_MACRO_VALUE(_LARGE_FILES, - ac_cv_sys_large_files, - [Define for large files, on AIX-style hosts.], - [case "$host_os" in - # AIX 4.2 and later - aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*) - ac_cv_sys_large_files=1 ;; - esac]) - fi - ]) -dnl @synopsis AC_C_FIND_ENDIAN -dnl -dnl Determine endian-ness of target processor. -dnl @version 1.1 Mar 03 2002 -dnl @author Erik de Castro Lopo -dnl -dnl Majority written from scratch to replace the standard autoconf macro -dnl AC_C_BIGENDIAN. Only part remaining from the original it the invocation -dnl of the AC_TRY_RUN macro. -dnl -dnl Permission to use, copy, modify, distribute, and sell this file for any -dnl purpose is hereby granted without fee, provided that the above copyright -dnl and this permission notice appear in all copies. No representations are -dnl made about the suitability of this software for any purpose. It is -dnl provided "as is" without express or implied warranty. - -dnl Find endian-ness in the following way: -dnl 1) Look in . -dnl 2) If 1) fails, look in and . -dnl 3) If 1) and 2) fails and not cross compiling run a test program. -dnl 4) If 1) and 2) fails and cross compiling then guess based on target. - -AC_DEFUN([AC_C_FIND_ENDIAN], -[AC_CACHE_CHECK(determining processor byte ordering, - ac_cv_c_byte_order, - -# Initialize to unknown -ac_cv_c_byte_order=unknown - -if test x$ac_cv_header_endian_h = xyes ; then - - # First try which should set BYTE_ORDER. - - [AC_TRY_LINK([ - #include - #if BYTE_ORDER != LITTLE_ENDIAN - not big endian - #endif - ], return 0 ;, - ac_cv_c_byte_order=little - )] - - [AC_TRY_LINK([ - #include - #if BYTE_ORDER != BIG_ENDIAN - not big endian - #endif - ], return 0 ;, - ac_cv_c_byte_order=big - )] - - fi - -if test $ac_cv_c_byte_order = unknown ; then - - [AC_TRY_LINK([ - #include - #include - #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN - bogus endian macros - #endif - ], return 0 ;, - - [AC_TRY_LINK([ - #include - #include - #if BYTE_ORDER != LITTLE_ENDIAN - not big endian - #endif - ], return 0 ;, - ac_cv_c_byte_order=little - )] - - [AC_TRY_LINK([ - #include - #include - #if BYTE_ORDER != LITTLE_ENDIAN - not big endian - #endif - ], return 0 ;, - ac_cv_c_byte_order=little - )] - - )] - - fi - -if test $ac_cv_c_byte_order = unknown ; then - if test $cross_compiling = yes ; then - # This is the last resort. Try to guess the target processor endian-ness - # by looking at the target CPU type. - [ - case "$target_cpu" in - alpha* | i?86* | mipsel* | ia64*) - ac_cv_c_big_endian=0 - ac_cv_c_little_endian=1 - ;; - - m68* | mips* | powerpc* | hppa* | sparc*) - ac_cv_c_big_endian=1 - ac_cv_c_little_endian=0 - ;; - - esac - ] - else - AC_TRY_RUN( - [[ - int main (void) - { /* Are we little or big endian? From Harbison&Steele. */ - union - { long l ; - char c [sizeof (long)] ; - } u ; - u.l = 1 ; - return (u.c [sizeof (long) - 1] == 1); - } - ]], , ac_cv_c_byte_order=big, - ac_cv_c_byte_order=unknown - ) - - AC_TRY_RUN( - [[int main (void) - { /* Are we little or big endian? From Harbison&Steele. */ - union - { long l ; - char c [sizeof (long)] ; - } u ; - u.l = 1 ; - return (u.c [0] == 1); - }]], , ac_cv_c_byte_order=little, - ac_cv_c_byte_order=unknown - ) - fi - fi - -) -] - -if test $ac_cv_c_byte_order = big ; then - ac_cv_c_big_endian=1 - ac_cv_c_little_endian=0 -elif test $ac_cv_c_byte_order = little ; then - ac_cv_c_big_endian=0 - ac_cv_c_little_endian=1 -else - ac_cv_c_big_endian=0 - ac_cv_c_little_endian=0 - - AC_MSG_WARN([[*****************************************************************]]) - AC_MSG_WARN([[*** Not able to determine endian-ness of target processor. ]]) - AC_MSG_WARN([[*** The constants CPU_IS_BIG_ENDIAN and CPU_IS_LITTLE_ENDIAN in ]]) - AC_MSG_WARN([[*** src/config.h may need to be hand editied. ]]) - AC_MSG_WARN([[*****************************************************************]]) - fi - -)# AC_C_FIND_ENDIAN - -dnl @synopsis AC_C99_FUNC_LRINT -dnl -dnl Check whether C99's lrint function is available. -dnl @version 1.3 Feb 12 2002 -dnl @author Erik de Castro Lopo -dnl -dnl Permission to use, copy, modify, distribute, and sell this file for any -dnl purpose is hereby granted without fee, provided that the above copyright -dnl and this permission notice appear in all copies. No representations are -dnl made about the suitability of this software for any purpose. It is -dnl provided "as is" without express or implied warranty. -dnl -AC_DEFUN([AC_C99_FUNC_LRINT], -[AC_CACHE_CHECK(for lrint, - ac_cv_c99_lrint, -[ -lrint_save_CFLAGS=$CFLAGS -CFLAGS="-O2 -lm" -AC_TRY_LINK([ -#define _ISOC9X_SOURCE 1 -#define _ISOC99_SOURCE 1 -#define __USE_ISOC99 1 -#define __USE_ISOC9X 1 - -#include -], if (!lrint(3.14159)) lrint(2.7183);, ac_cv_c99_lrint=yes, ac_cv_c99_lrint=no) - -CFLAGS=$lrint_save_CFLAGS - -]) - -if test "$ac_cv_c99_lrint" = yes; then - AC_DEFINE(HAVE_LRINT, 1, - [Define if you have C99's lrint function.]) -fi -])# AC_C99_FUNC_LRINT -dnl @synopsis AC_C99_FUNC_LRINTF -dnl -dnl Check whether C99's lrintf function is available. -dnl @version 1.3 Feb 12 2002 -dnl @author Erik de Castro Lopo -dnl -dnl Permission to use, copy, modify, distribute, and sell this file for any -dnl purpose is hereby granted without fee, provided that the above copyright -dnl and this permission notice appear in all copies. No representations are -dnl made about the suitability of this software for any purpose. It is -dnl provided "as is" without express or implied warranty. -dnl -AC_DEFUN([AC_C99_FUNC_LRINTF], -[AC_CACHE_CHECK(for lrintf, - ac_cv_c99_lrintf, -[ -lrintf_save_CFLAGS=$CFLAGS -CFLAGS="-O2 -lm" -AC_TRY_LINK([ -#define _ISOC9X_SOURCE 1 -#define _ISOC99_SOURCE 1 -#define __USE_ISOC99 1 -#define __USE_ISOC9X 1 - -#include -], if (!lrintf(3.14159)) lrintf(2.7183);, ac_cv_c99_lrintf=yes, ac_cv_c99_lrintf=no) - -CFLAGS=$lrintf_save_CFLAGS - -]) - -if test "$ac_cv_c99_lrintf" = yes; then - AC_DEFINE(HAVE_LRINTF, 1, - [Define if you have C99's lrintf function.]) -fi -])# AC_C99_FUNC_LRINTF - -# Do all the work for Automake. -*- Autoconf -*- - -# This macro actually does too much some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 8 - -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - - -AC_PREREQ([2.52]) - -# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow -# the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl - -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -fi - -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl - AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl - AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_MISSING_PROG(AMTAR, tar) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl - -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_][CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_][CC], - defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_][CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_][CXX], - defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl -]) -]) - -# Copyright 2002 Free Software Foundation, Inc. +m4_if(m4_PACKAGE_VERSION, [2.61],, +[m4_fatal([this file was generated for autoconf 2.61. +You have another version of autoconf. If you want to use that, +you should regenerate the build system entirely.], [63])]) -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"]) +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.10' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.10], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- -# Call AM_AUTOMAKE_VERSION so it can be traced. +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.6.3])]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright 2001, 2002 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +[AM_AUTOMAKE_VERSION([1.10])dnl +_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 2 - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# AM_AUX_DIR_EXPAND -*- Autoconf -*- +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # -# Check to make sure that the build environment is sane. -# - -# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 3 - -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT(yes)]) - -# -*- Autoconf -*- - - -# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 3 - -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) - - -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) - -# AM_AUX_DIR_EXPAND - -# Copyright 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to @@ -697,105 +96,62 @@ # absolute PATH. The drawback is that using absolute paths prevent a # configured tree to be moved without reconfiguration. -# Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50]) - -AC_DEFUN([AM_AUX_DIR_EXPAND], [ +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` ]) -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. - -# Copyright 2001 Free Software Foundation, Inc. +# AM_CONDITIONAL -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# serial 8 -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"$am_aux_dir/install-sh"} -AC_SUBST(install_sh)]) +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) -# AM_PROG_INSTALL_STRIP +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Copyright 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) - -# serial 4 -*- Autoconf -*- - -# Copyright 1999, 2000, 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - - -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... +# serial 9 +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... # _AM_DEPENDENCIES(NAME) @@ -817,6 +173,7 @@ ifelse([$1], CC, [depcc="$CC" am_compiler_list=], [$1], CXX, [depcc="$CXX" am_compiler_list=], [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], UPC, [depcc="$UPC" am_compiler_list=], [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], [depcc="$$1" am_compiler_list=]) @@ -833,18 +190,34 @@ # using a relative directory. cp "$am_depcomp" conftest.dir cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub am_cv_$1_dependencies_compiler_type=none if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` fi for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # # We need to recreate these files for each test, as the compiler may # overwrite some of them when testing with obscure command lines. # This happens at least with the AIX C compiler. - echo '#include "conftest.h"' > conftest.c - echo 'int i;' > conftest.h - echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf case $depmode in nosideeffect) @@ -862,13 +235,26 @@ # mode. It turns out that the SunPro C++ compiler does not properly # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=conftest.c object=conftest.o \ - depfile=conftest.Po tmpdepfile=conftest.TPo \ - $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && - grep conftest.h conftest.Po > /dev/null 2>&1 && + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - am_cv_$1_dependencies_compiler_type=$depmode - break + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi fi done @@ -879,6 +265,9 @@ fi ]) AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ]) @@ -887,16 +276,8 @@ # Choose a directory name for dependency files. # This macro is AC_REQUIREd in _AM_DEPENDENCIES AC_DEFUN([AM_SET_DEPDIR], -[rm -f .deps 2>/dev/null -mkdir .deps 2>/dev/null -if test -d .deps; then - DEPDIR=.deps -else - # MS-DOS does not allow filenames that begin with a dot. - DEPDIR=_deps -fi -rmdir .deps 2>/dev/null -AC_SUBST([DEPDIR]) +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl ]) @@ -904,36 +285,27 @@ # ------------ AC_DEFUN([AM_DEP_TRACK], [AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking Speeds up one-time builds - --enable-dependency-tracking Do not reject slow dependency extractors]) +[ --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl ]) -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# Generate code to set up dependency tracking. -*- Autoconf -*- -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -#serial 2 +#serial 3 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ @@ -946,33 +318,28 @@ # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue fi - grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. - DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n -e '/^U = / s///p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n -e ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue @@ -998,33 +365,197 @@ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*- +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# serial 8 -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. +AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) + +# Do all the work for Automake. -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 12 + +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.60])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) + +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_PROG_INSTALL_SH +AM_PROG_INSTALL_STRIP +AC_REQUIRE([AM_PROG_MKDIR_P])dnl +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl +]) +]) + + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $1 | $1:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} +AC_SUBST(install_sh)]) + +# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # serial 2 +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) + +# Check to see how 'make' treats includes. -*- Autoconf -*- + +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 3 + # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make} cat > confinc << 'END' -doit: +am__doit: @echo done +.PHONY: am__doit END # If we don't find an include directive, just comment out the code. AC_MSG_CHECKING([for style of include used by $am_make]) @@ -1038,7 +569,7 @@ # In particular we don't look at `^make:' because GNU make might # be invoked under some other name (usually "gmake"), in which # case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then am__include=include am__quote= _am_result=GNU @@ -1052,131 +583,293 @@ _am_result=BSD fi fi -AC_SUBST(am__include) -AC_SUBST(am__quote) -AC_MSG_RESULT($_am_result) +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) rm -f confinc confmf ]) -# AM_CONDITIONAL -*- Autoconf -*- +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright 1997, 2000, 2001 Free Software Foundation, Inc. +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# serial 5 -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) -# serial 5 -AC_PREREQ(2.52) +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# If it does, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +else + am_missing_run= + AC_MSG_WARN([`missing' script is too old or missing]) +fi +]) -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE]) -AC_SUBST([$1_FALSE]) -if $2; then - $1_TRUE= - $1_FALSE='#' +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_MKDIR_P +# --------------- +# Check for `mkdir -p'. +AC_DEFUN([AM_PROG_MKDIR_P], +[AC_PREREQ([2.60])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +dnl while keeping a definition of mkdir_p for backward compatibility. +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +dnl Makefile.ins that do not define MKDIR_P, so we do our own +dnl adjustment using top_builddir (which is defined more often than +dnl MKDIR_P). +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +case $mkdir_p in + [[\\/$]]* | ?:[[\\/]]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac +]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 3 + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 4 + +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Just in case +sleep 1 +echo timestamp > conftest.file +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t $srcdir/configure conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +alias in your environment]) + fi + + test "$[2]" = conftest.file + ) +then + # Ok. + : else - $1_TRUE='#' - $1_FALSE= + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([conditional \"$1\" was never defined. -Usually this means the macro was only invoked conditionally.]) -fi])]) +AC_MSG_RESULT(yes)]) -# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor `install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# Copyright (C) 2006 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) -AC_PREREQ([2.52]) +# Check how to create a tarball. -*- Autoconf -*- -# serial 6 +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. We must strip everything past the first ":", -# and everything past the last "/". +# serial 2 -# _AM_DIRNAME(PATH) -# ----------------- -# Like AS_DIRNAME, only do it during macro expansion -AC_DEFUN([_AM_DIRNAME], - [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1, - m4_if(regexp([$1], [^//\([^/]\|$\)]), -1, - m4_if(regexp([$1], [^/.*]), -1, - [.], - patsubst([$1], [^\(/\).*], [\1])), - patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])), - patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl -])# _AM_DIRNAME - - -# The stamp files are numbered to have different names. -# We could number them on a directory basis, but that's additional -# complications, let's have a unique counter. -m4_define([_AM_STAMP_Count], [0]) +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi +done +rm -rf conftest.dir -# _AM_STAMP(HEADER) -# ----------------- -# The name of the stamp file for HEADER. -AC_DEFUN([_AM_STAMP], -[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl -AS_ESCAPE(_AM_DIRNAME(patsubst([$1], - [:.*])))/stamp-h[]_AM_STAMP_Count]) - - -# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS) -# ------------------------------------------------------------ -# We used to try to get a real timestamp in stamp-h. But the fear is that -# that will cause unnecessary cvs conflicts. -AC_DEFUN([_AM_CONFIG_HEADER], -[# Add the stamp file to the list of files AC keeps track of, -# along with our hook. -AC_CONFIG_HEADERS([$1], - [# update the timestamp -echo 'timestamp for $1' >"_AM_STAMP([$1])" -$2], - [$3]) -])# _AM_CONFIG_HEADER - - -# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS) -# -------------------------------------------------------------- -AC_DEFUN([AM_CONFIG_HEADER], -[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])]) -])# AM_CONFIG_HEADER +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR +m4_include([acinclude.m4]) diff -Nru xmds-1.6.5/ChangeLog xmds-1.6.6/ChangeLog --- xmds-1.6.5/ChangeLog 2008-02-25 21:32:21.000000000 -0600 +++ xmds-1.6.6/ChangeLog 2008-07-03 20:40:09.000000000 -0500 @@ -1,357 +1,9508 @@ -2008-02-26 xmds-1.6.5 +2008-07-02 08:46 grahamdennis - * Various bug fixes - new no known bug status - * Superior treatment of extreme cases in adaptive algorithms - * Simulation can halt if the solution goes non-finite. - Put this in the appropriate integration element: - yes - * Cross-propagation is now 4th order for RK4 algorithms - * Patches to fix compiler warnings (and potential issues, and the removal - of superfluous files courtesy of Rafael Laboissiere. - * ChangeLog format altered to give a better summary of changes - * Reconfigured the location of where some files are installed, - specifically loadxsil.m, ancillary files like README and the example - files are all installed under the equivalent of /usr/share/doc/xmds. - * Automatic plotting of simulation output is now possible with the -p - (a.k.a. --plot) command line argument to xsil2graphics. This is only - possible with Matlab/Octave at present. - * One can now specify the desired XSIL output filename at the command - line when one calls the simulation program. Just use the - -o (--outfilename) argument and supply the desired filename. - -2008-01-10 xmds-1.6.4 - -A new release for a new year. - - * Arrays: - -... phi(100) - -... for (long j=1;j<101;j++) { -dphi_dt(j) = L[phi](j) + V*phi(j); -} -... - - * Bug fixes! - * Internal code cleanups - * New example scripts - * Rudimentary visualisation capability with R (http://www.r-project.org) - - -2007-06-27 xmds-1.6.3 - -This is another bugfix release of xmds-1.6. It is unlikely that anyone else has -ever encountered these bugs, and now they never will. We are back to "no known -bugs". - -2007-06-15 xmds-1.6.2 - -This is a critical bugfix update of xmds-1.6. Recommended for all users. - -2007-05-10 xmds-1.6.1 - -This is a bugfix and minor tweak release of xmds, to correspond with the new -documentation release. - -2007-03-22 xmds-1.6 - -Welcome to a brave new world of XMDS. A brave new algorithm list, anyway. Say -hello to Michael Hush and the new algorithms he coded. We now have adaptive -9(8)th order deterministic integration, where the adaptive step is stochastic -safe. In our testing this means 4th order adaptive strong convergence for -stochastic equations. The new algorithms are: RK9IP, RK9EX, ARK89IP and -ARK89EX. The syntax and workings are identical to the RK4 and ARK45 algorithms, -except that for stochastic problems the adaptive algorithm changes -automatically to a stochastic-safe version. Also, less bugs. We are back to -zero known bugs, as usual for release. - -2006-09-19 xmds-1.5.3 - -Despite the small version number bump, this is a large release. A huge welcome -to Graham Dennis on the development team - Graham has been responsible for most -of the good work here. - -Changes: - - * FFTW version 3! This version is faster, and vectorises on many - architectures. This can be installed concurrently with FFTW version - 2.1.5, which is still required for MPI implementations. - * Vector initialisation from XSIL moment groups! Also, this initialisation - has a "loose" mode, where partial data can be input. This allows easy - shifting of grids between simulations. - * Better IO behaviour on supercomputers with queues. - * OpenMP support! For OpenMP compatible compilers, threaded parallel - processing is as easy as a tag away. Use FFTW version 3, and compile - it using OpenMP rather than pthreads for best results. - * Breakpoints! You can choose to have the fields sent to file at any - time in the sequence, including in the middle of a run. This can be - used to check long calculations in the middle, as an efficient method - of reloading the output to start again, or just as a memory-efficient - output method for large MPI simulations. - * Almost a year's worth of bug fixes. We are back at "No Known Bugs" - status, just as we are for each release. - * New documentation! Please read all the details in the parallel - "xmds-doc" release. - - -2005-10-27 xmds-1.5.2 - -Several bug fixes and minor tweaks. The major feature of this release is the -ability to use adaptive scheduling when using parallel processors on stochastic -problems. The new scheduler is much more efficient in heterogeneous -environments, such as clusters of unequal machines, or homogeneous clusters -with variable load. Simply add the tag Scheduling in -the element. To use the old, symmetric method, simply add the tag -Scheduling. - -2005-07-05 xmds-1.5.1 - -Welcome to the new version! Sorry it's been longer than normal, but we wanted -to make the new features as well tested as possible. The major news of this -release is the introduction of two valuable new algorithms: ARK45IP and ARK45EX - -These new algorithms are adaptive timestep algorithms, and a description of -them will be coming in a future version of the documentation. Using them is as -easy as choosing their name in the integrate algorithm, and for most purposes -they are slightly slower (but adaptive) versions of RK4IP and RK4EX -respectively. - -The only differences are that the number of timesteps will be unknown at the -start of the simulation, and the relative error per timestep is set by a new -element called "tolerance". The element is only used to choose the -initial timestep. All the samples will be produced at regular points in the -interval, as usual. - -There are two new examples (sech_soliton.xmds and sech_soliton_tdepk.xmds) that -explain slightly more, including the two new optional elements: - -For a given component psi of the main vector, the algorithm discards gridpoints -where |psi|< cutoff*peakvalue_of_psi in the calculation of the relative error. -This defaults to 1e-3. 1e-3 - -Only for ARK45IP: -To optimize runtime the algorithm stores 5 copies of all k-operator fields. -This can be disabled by choosing "smallmemory=yes" for problems with memory -limitations. Defaults to no. no - -Final note on these algorithms: ARK45IP cannot be used for time-dependent -k-operators. Use ARK45EX for those problems. - -Also in this version, many little bugs have been fixed. In particular, binary -output is now working without trouble. We have made the output files record the -data format, so MATLAB will no longer make bad guesses as to the size of -unsigned long integers for binary files that have been moved to and from 64 bit -machines between generation and analysis. - -Known issues: -1. No known bugs in the generated code. - -2. Recent changes to the compile option order may be able to break MPI -enabled computations on some systems. Compiling by hand will be an -effective temporary fix, but please contact us immediately if you have -any problems. - -2004-11-03 xmds-1.4.1 - -Some significant new functionality has been added. This new version allows -certain kinds of non-local terms to be included, and extra functionality for -those who wish to tweak things with pasted code. - -You can now: - -1. Put elements as well as elements in -blocks. elements let you define moments that are integrated -through any number of transverse dimensions. elements allow to -place arbitrary chunks of c-code in the integrate step. They are very useful -for calculating functions that do not have to be recalculated for every point -in the transverse dimension s. -2. You can put both of them in elements as well. -3. You can put as many as you like, of any dimension, in any order. -4. Non-local terms are MPI aware. - -The notation should be obvious from the "highdim.xmds" example, and is -explained in more detail in the updated documentation. The only non-obvious -thing to know is that the code is placed where the element is placed, -so that element is now mandatory. The moments are defined with '+=' rather -than '=', as this leads to more efficient code. - -Also, the binary output option is now at the "no known bugs" stage. Using - instead of the old tag will do the output -using binary data. This should be transparent to all current activities, as -xsil2graphics works normally with either. Note that Scilab does not support -binary input. - -There have also been several bug fixes and changes too trivial to bother you -with. See the ChangeLog or code for details - -2004-07-18 xmds-1.3.5 - -This is release 5 of xmds 1.3. This is essentially a bugfix release of xmds. -Many bugs found over the last little while have been fixed, including a -misformed xml tag when producing binary output, and the number of samples can -safely be zero without causing potential conflicts with Fourier transforms. -Many other tidying tasks have been done and the configuration has been improved -a bit. As many system() calls have been removed from xmds as possible to make -it more platform independent. Also fixed issues found by using the -ansi and --pedantic flags to gcc. - -2004-06-16 xmds-1.3.4 - - * fixed bug with parsing of tag that got introduced with the - last release of xmds. - * updated the man pages. - * the man pages get installed with 'make install', getting put into the - user's ~/bin directory, under the man/ directory. When installed as - root, this goes into the system man/ directory. - * the loadxsil.m utility script gets installed with 'make install' and - gets installed into the user's ~/bin dirctory or the system bin/ - directory depending upon whether or not the installation is done by - a user or by root. - * general tidy-up of some of the code and help information - * xmds and xsil2graphics now implement the GNU getopt functions for - option parsing at the command line. Use xmds --help to see what the - new options are, and how to access them. - * more examples have been added to the examples/ directory. These are: - the Fisher reaction diffusion equation used in population genetics, - the ring modulator circuit equations which are a stiff set of coupled - ODEs, and the High Irradiance RESponse equations which is also a set - of stiff coupled ODEs, but which model the response of - photomorphogenesis on the basis of phytochrome, by means of a chemical - reaction involving eight reactants. - - -2004-05-30 xmds-1.3.3 - - * added new noise sources, specifically a faster gaussian noise routine, - a poissonian noise routine, and a uniform noise routine. These noise - routines are specified in the tag via the type attribute. - e.g 2 - * fixed a problem with loadxsil.m's parsing of .xsil files. This was - broken when the and tags were deprecated. - The problem has now been rectified, and the script seems to work properly. - * two new examples have been added. A van der Pol oscillator (electrical - circuits) and the Lane-Emden equation from astrophysics. - - -2004-05-11 xmds-1.3.2 - - * made xmds output more professional looking, and similar in many ways - to gnuplot, matlab, etc kind of packages when they startup. - * further documentation of the api. - * added the ability for xmds to output a template xmds script. If called - with the -t flag and no subsequent argument, xmds will print the - template to standard output. If called with the -t flag and an argument - (i.e. xmds -t test_file.xmds) then xmds will write the template code - directly to the specified file. - * added more examples (diffusion.xmds, advection.xmds, lorenz.xmds, - lotka_volterra.xmds, pendulum.xmds, vibstring.xmds) - * tidied the example scripts, and added such features as and - tags. - * xmds now produces a warning if the and/or tags - aren't given as part of the xmds script. Adding these tags is good xmds - coding style. - * added the copyright statement to more files and updated copyright year. - - -2003-12-22 xmds-1.3.1 - -This is release 1 of version 1.3 of xmds. It fixes a bug with xsil2graphics and adds two new features: - - * the use of preferences to customise the building of simulations - * binary input of data files for initialising vectors from file - - -Other changes: - - * added preferences to xmds, via xmds.prefs file in the user's .xmds - directory or in the directory local to the simulation script. - * added the option to input binary data to the simulation, if it is - desired to start the simulation from a data file rather than from code. - The new syntax is to add the format="binary" attribute to the - tag of the element. - * fixed a bug in xsil2graphics where data file names weren't referenced - properly. - * xmds now works in the Cygwin environment. A readme concerning this has - been added to the distribution. It is called README.Windows and borrows - heavily from the installation documentation for Octave. - - -2003-12-06 xmds-1.2.2 - -This is a bugfix release of xmds-1.2. Problems were found with hostname and home directory detection when using mpi - this has been fixed. The tag had an error in its implementation, this too has been fixed. - -Changes: - - * fixed bug where use_wisdom flag wasn't being passed through properly - * fixed bug where mpi using wisdom was segfaulting. The problem being - the creation of various temporary files for testing purposes not being - named correctly. Now uses more of a C++ solution than an C solution, - and is now more robust. - -2003-11-24 xmds-1.2 - -This is a full release of xmds-1.2. Minor bugs have been fixed. - - * fixed problem with ordering of k-space variables when output. - * fixed moment group number reporting at terminal when running simulations. - -2003-11-06 xmds-1.2-pre1 - -This is the first pre-release version of xmds-1.2 - - * configuration now happens through an autoconf configure script. - * added latex source of documentation to distribution - * now parses correctly on LinuxPPC. - - * added a flag so that data files will be binary instead of - just in ascii in .xsil file. It is a flag taking either yes or no, it - defaults to no. - - * added a boolean flag to take advantage of the wisdom - feature of fftw. - * added a boolean flag to specify if the binary output data - should be double precision or not. The default option is yes. - * added a boolean flag to specify if the main loop should be - timed in the simulation and the user time taken to be reported. - * there is now a loadxsil.m matlab script which can load your variables - directly into the matlab namespace and saves you having to use - xsil2graphics to access output variables. Syntax is: (at the matlab - command prompt) >> loadxsil('xsil_file_name.xsil') - * the xmds api (application-programmer interface) has been documented - (although, not completely) using Doxygen. - * added the ability to use command line arguments to simulations. This - should help those people who want to run a simulation many times - changing some variables at each run, e.g. searching a phase space. - This is accomplished by the (and sub-tags) tagset. - -2003-05-30 xmds-1.1 - -This is a major new release of XMDS. New: - support for parallel processing for -deterministic problems. - a element may be put in -elements - faster - access to the cycles variable in looped sequences This -release also contains dozens of bug fixes and contains no (currently) known -bugs. - -2003-05-05 xmds-1.1-beta2 - -This is a bugfixed version of the 1.1 beta release. It is recommended for ALL -users, including those using the stable line. - -2003-03-27 xmds-1.1-beta - -This release is a beta release for the new version of xmds. It contains many -bug fixes and a few new features. The most important new feature is that it can -now support parallel computation using MPI for deterministic integration. The -number of transverse dimensions must be two or greater to use this feature. -Simply include the yes element in the top of the simulation, -and the rest should proceed transparently. An open source, free version of the -MPI libraries can be obtained from http://www.lam-mpi.org/ When repeating -sequence elements using cycles, users now have access to the cycle number in -the integrate and filter elements: unsigned long cycle; Please report any -difficulties you have with this fiel release - it has no known issues or bugs, -but it is relatively sparsely tested. + * trunk/xmds-devel/source/xmds_complex.h, + trunk/xpdeint/xpdeint/includes/xpdeint_complex.h: xmds & xpdeint: + CRITICAL BUG FIX to complex arithmetic. + + The unary negation operator was incorrectly overloaded to modify + the complex variable that was being negated. + Note that this bug only applies to the 'complex' class and not to + the 'fftw_complex' class. + + In more detail: Whenever code is written that requires the + negative of a complex variable (of type complex, + this bug is not present for the fftw_complex type), instead of + simply returning the negative of that variable, + the variable itself was modified to be the negative as well. + Consider the following code: + + complex a = 7.0 + 3*i; // a = 7 + 3i, everything is fine + complex b = -a; + // b = -7 - 3i as expected, but additionally + // a = -7 - 3i + + Note that this bug will not be triggered by a subtraction + operation. b = a-c will have been correct. + Additionally, if the complex number is part of a larger + expression, this bug will only matter if the + complex variable is first. i.e. z = -0.5*a would have been fine, + but z = -a*0.5 would not. Note that + the variable 'i' was not affected by this because it is defined + as 'const', so expressions like + z = -i*a were safe. Likewise any other 'const' complex constants + would have also been safe. + + From what I can gather from the repository logs, this bug has + been present in xmds (and xpdeint) since the original + commit, i.e. February 3, 2003. This bug could have affected any + simulation since then, though you would need + to be unlucky to hit it. Most simulations would be fine as the + evolution equations are typically written in the form: + dphi_dt = L[phi] + stuff; + The L[phi] term will prevent the unary negation operation from + being called. Unfortunately, some simulations will have hit + this. The only example script that hit this was the xmds + van_der_pol.xmds script where its evolution equations are: + dx_dt = xdot; + dxdot_dt = -x - epsilon*(x*x - 1)*xdot; + + The '-x' term in the second line triggered the bug, but the + calculation of the x*x term is safe as although x is a complex + variable, its imaginary part is zero, and the memory that 'x' is + stored in is immediately overwritten after this line with + the value of 'dx_dt * _step', and so although this simulation did + hit the bug, due to a coincidence it did not affect the results. + + This update should be considered critical and anyone following + the development versions should update both xmds and xpdeint. + + Joe: Can we do an xmds-1 release? + +2008-04-22 03:49 andyferris + + * trunk/xmds-devel/source/xmds_moment_group.cc, + trunk/xmds-devel/source/xmds_output.cc: xmds: Output fixes. + * Now when using binary and the -o option the .dat files are + stored with the prefix given by -o and not the one in the .xmds + file. + * Removed a few compiler warnings by removing excess arguments + passed to printf. + +2008-04-16 23:59 andyferris + + * trunk/xmds-devel/source/xsil2graphics.cc: xsil2graphics: Allow + multiple input file names. + e.g. "xsil2graphics *.xsil" now works. + +2008-04-11 05:40 paultcochrane + + * trunk/xmds-devel/admin/cygwin/xmds.README: Updated the version + information for building and installing xmds for cygwin + +2008-04-11 05:24 paultcochrane + + * trunk/xmds-devel/admin/cygwin/xmds-1.6.5-1.sh: Updated the cygwin + configure options to enable fftw3 + +2008-04-11 04:32 paultcochrane + + * trunk/xmds-devel/admin/cygwin/xmds-1.6.5-1.sh: Added the generic + xmds build script for building on cygwin. This hasn't yet + been adjusted for xmds-specfics yet. + +2008-04-11 04:29 paultcochrane + + * trunk/xmds-devel/admin/cygwin/setup.hint: Added the setup.hint + file for use with cygwin's setup.exe + +2008-04-11 04:28 paultcochrane + + * trunk/xmds-devel/admin/cygwin/xmds.README: Added the cygwin + readme file for the cygwin xmds package. + +2008-04-11 04:19 paultcochrane + + * trunk/xmds-devel/admin/cygwin: Added a cygwin subdirectory for + cygwin-port related files + +2008-04-09 10:55 paultcochrane + + * ., trunk/xmds-devel/admin/xmds-1.6.5-r1.ebuild: Added the Gentoo + ebuild used to build xmds on that distro + +2008-04-09 10:44 paultcochrane + + * ., trunk/xmds-devel/admin/xmds-1.6.5-Makefile_DATA.patch, + trunk/xmds-devel/configure.in, + trunk/xmds-devel/xmds-1.6.5-Makefile_DATA.patch: Added patch to + the wrong directory, duh. + +2008-04-09 10:42 paultcochrane + + * ., trunk/xmds-devel/configure.in: + +2008-04-09 10:41 paultcochrane + + * ., trunk/xmds-devel/configure.in: - replaced hard tabs with + spaces + - added a coda for emacs and vim so that formatting is + automatically + consistent in these editors + - indented the code a bit more consistently + +2008-04-09 10:34 paultcochrane + + * trunk/xmds-devel/xmds-1.6.5-Makefile_DATA.patch: Added the actual + patch to Makefile.am which I used to build the Fedora 8 RPM + +2008-04-09 09:05 paultcochrane + + * trunk/xmds-devel/admin/Makefile_in_update.patch, + trunk/xmds-devel/admin/aclocal_update.patch, + trunk/xmds-devel/admin/configure_update.patch: Added the patches + which enabled me to get xmds to build on openSuSE's + build service + +2008-04-09 00:51 paultcochrane + + * trunk/xmds-devel/admin/xmds_suse.spec: Added a spec file which + enables xmds to build SuSE Linux RPMs. This was + developed with the help of the openSuSE build service: + http://build.opensuse.org + +2008-04-09 00:42 paultcochrane + + * trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.cc, + trunk/xmds-devel/source/xmds_simulation.h, + trunk/xmds-devel/source/xsil2graphics.cc: Applied patch courtesy + of Rafael Laboissiere from Debian which fixes a + build error when using gcc 4.3 (yay the Debian automated build + service!) + +2008-04-08 05:55 paultcochrane + + * trunk/xmds-devel/admin/xmds.spec: Reverted incorrect + BuildRequires option accidentally commited in the + last commit + +2008-04-08 05:42 paultcochrane + + * trunk/xmds-devel/admin/xmds.spec: Corrected the spec file's + release number information + +2008-04-07 09:54 paultcochrane + + * trunk/xmds-devel/source/xsil_field.cc: Added a title to plots + generated with the xsil2graphics '-p' option. + This effectively closes the long overdue ticket (feature request + tracker + item) #1600312. + +2008-04-07 09:19 paultcochrane + + * trunk/xmds-devel/admin/Makefile_DATA.patch: Added (for future + reference) the patch, used to get the 1.6.5 xmds version + able to build the rpm properly, to the repository + +2008-04-07 09:09 paultcochrane + + * trunk/xmds-devel/admin/xmds.spec: Updates to get the rpm spec + file buildign again. A patch had to be added + to modify the root Makefile.am in order to fix a problem where we + were + using automake 1.10 version features, however rpmbuild requires + version + automake version 1.6. + Updated the file list, and made it more generic (replaced "xmds" + with + %{name}-%{version} which is more flexible. + Updated the changelog and header appropriately + +2008-03-28 02:23 grahamdennis + + * trunk/xmds-devel/source/xmds_integrate_ex.cc: xmds (not + xpdeint!): Using OpenMP with an EX algorithm was broken. Oops. + + This bug is not present in xpdeint. + +2008-03-27 03:15 grahamdennis + + * trunk/xmds-devel/source/xmds_simulation.cc: xmds (not xpdeint!): + Fixed bug Paul introduced in r1760 where the output filename + would be determined by the simulation name, not by the filename + specified in the + tag. + +2008-03-18 16:07 paultcochrane + + * trunk/xmds-devel/admin/xmdsReleaseProcedure.pod: Added a note of + where one can pick up a copy of xsltproc for those who + don't have Gnome installed by default + +2008-03-18 16:03 paultcochrane + + * trunk/xmds-devel: Added ChangeLog to svn:ignore list + +2008-03-18 15:54 paultcochrane + + * trunk/xmds-devel/ChangeLog: Removed the ChangeLog file from the + repository: it's now automatically + generated. See admin/xmdsReleaseProcedure.pod for details of how + to generate + this file. + +2008-03-18 15:53 paultcochrane + + * trunk/xmds-devel/admin/xmdsReleaseProcedure.pod: Updated the + release procedure text to reflect that ChangeLog is now + automatically generated. Also tidied up the text a little. + +2008-03-18 15:50 paultcochrane + + * trunk/xmds-devel/admin/xmdsReleaseProcedure.pod: Having thought + about the ChangeLog usage somewhat more (and having noticed + that we actually have a NEWS file in the distro), we should + really use + ChangeLog as we had been using it, and that's essentially as a + list of + svn log entries hence effectively reverting Joe's FullChangeLog + change of + quite a while ago. + +2008-03-18 15:48 paultcochrane + + * trunk/xmds-devel/NEWS: Added recent news items to the news file + (duh, paul...) + +2008-03-18 15:41 paultcochrane + + * trunk/xmds-devel/README, trunk/xmds-devel/configure.in, + trunk/xmds-devel/source/Doxyfile: Updated the version information + to 1.6.6 (we've already released 1.6.5) + +2008-03-18 15:29 paultcochrane + + * trunk/xmds-devel/examples, trunk/xmds-devel/source: Updated the + svn:ignore property to ignore .exe (for cygwin) and Makefiles + +2008-03-18 15:25 paultcochrane + + * trunk/xmds-devel/examples/Makefile.am: Updated the clean target + within the examples/ subdirectory + +2008-03-18 15:24 paultcochrane + + * trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmds_arg.cc, + trunk/xmds-devel/source/xmds_arg_element.cc, + trunk/xmds-devel/source/xmds_argv.cc, + trunk/xmds-devel/source/xmds_breakpoint.cc, + trunk/xmds-devel/source/xmds_element.cc, + trunk/xmds-devel/source/xmds_field.cc, + trunk/xmds-devel/source/xmds_filter.cc, + trunk/xmds-devel/source/xmds_globals.cc, + trunk/xmds-devel/source/xmds_integrate.cc, + trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ark45ex.cc, + trunk/xmds-devel/source/xmds_integrate_ark45ip.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.cc, + trunk/xmds-devel/source/xmds_integrate_ark89ex.cc, + trunk/xmds-devel/source/xmds_integrate_ark89ip.cc, + trunk/xmds-devel/source/xmds_integrate_ex.cc, + trunk/xmds-devel/source/xmds_integrate_ip.cc, + trunk/xmds-devel/source/xmds_integrate_rk4.cc, + trunk/xmds-devel/source/xmds_integrate_rk4ex.cc, + trunk/xmds-devel/source/xmds_integrate_rk4ip.cc, + trunk/xmds-devel/source/xmds_integrate_rk9.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ex.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ip.cc, + trunk/xmds-devel/source/xmds_integrate_si.cc, + trunk/xmds-devel/source/xmds_integrate_siex.cc, + trunk/xmds-devel/source/xmds_integrate_siip.cc, + trunk/xmds-devel/source/xmds_moment_group.cc, + trunk/xmds-devel/source/xmds_output.cc, + trunk/xmds-devel/source/xmds_segment.cc, + trunk/xmds-devel/source/xmds_sequence.cc, + trunk/xmds-devel/source/xmds_simulation.cc, + trunk/xmds-devel/source/xmds_utils.cc, + trunk/xmds-devel/source/xmds_vector.cc, + trunk/xmds-devel/source/xmds_vector_element.cc, + trunk/xmds-devel/source/xml_basics.cc, + trunk/xmds-devel/source/xml_parser.cc, + trunk/xmds-devel/source/xsil2graphics.cc, + trunk/xmds-devel/source/xsil_field.cc: Updated the copyright date + information + +2008-03-18 13:32 paultcochrane + + * trunk/xmds-devel/configure.in: When building with --with-user, + the examples were set to be installed in + /usr/local/share/doc which of course a user can't do. This + updates the + location of the installed example files to $HOME/doc/xmds, which + hopefully + is a much better location, and will avoid users getting nasty + errors when + installing xmds locally. + +2008-03-04 06:36 grahamdennis + + * trunk/xmds-devel/source/xmds_complex.h, + trunk/xpdeint/source/FieldElement.tmpl, + trunk/xpdeint/source/ScriptElement.tmpl: Add in operator + overloads for the complex type multiplied by longs... + ... and don't multiply them by longs when integrating over + integer-valued dimensions (in xpdeint). + +2008-02-26 10:08 paultcochrane + + * trunk/xmds-devel/admin/release_notification.txt: Added the + release notification text used to inform the various newsgroups + about the current release. + +2008-02-26 03:35 joehope + + * trunk/xmds-devel/MANIFEST: Update for new version. + +2008-02-26 03:31 joehope + + * trunk/xmds-devel/ChangeLog, trunk/xmds-devel/README: Updating for + new version release. + +2008-02-06 21:48 paultcochrane + + * trunk/xmds-devel/ChangeLog: Removed some old ChangeLog entries + which got added in for some reason. + Added a summary of recent changes to repository. Would others be + able to + summarise their changes here as well? Please? + +2008-02-06 21:43 paultcochrane + + * trunk/xmds-devel/source/xmds_output.cc, + trunk/xmds-devel/source/xmds_sequence.cc, + trunk/xmds-devel/source/xmds_simulation.cc: One can now specify + the output data filename at the command line with the + -o/--outfilename simulation command line argument. This provides + the + feature requested by Christopher Coleman-Smith on the xmds-user + mailing + list. + +2008-02-06 21:37 paultcochrane + + * trunk/xmds-devel/source/xsil2graphics.cc, + trunk/xmds-devel/source/xsil_field.cc, + trunk/xmds-devel/source/xsil_field.h: Implemented automatically + generating matlab/octave plot commands when + running xsil2graphics. When the user uses the -p (--plot) command + line + argument to xsil2graphics (and when the number of independent + variables is + either 1 or 2) then basic plotting output is generated. + This commit also corrects some typos in the help output of + xsil2graphics, + updates some error messages, and adds some comments and todo + items. + +2008-02-06 21:30 paultcochrane + + * trunk/xmds-devel/examples/Makefile.am: Extending the clean target + to clean up more files. + +2008-02-06 07:03 grahamdennis + + * trunk/xmds-devel/source/xmds_breakpoint.cc: xmds: Revert Paul's + r1607 commit. + + In Paul's commit, he changed the order of a couple of operations. + This caused + the first coordinate value not to be written, and instead the + second was the + first written, and the end point was written when it shouldn't + be. The upshot + of this is that you could not use the XSIL file for initialising + another + simulation. At least I know my sanity-checking code for XSIL + loading works. + + While I'm at it, make sure that the revision number for XMDS is + put in + breakpoint XSIL files as well as XSIL files created from moment + groups. + +2008-01-31 06:00 michaelhush + + * trunk/xmds-devel/ChangeLog, trunk/xmds-devel/examples/fibre.xmds, + trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.cc: Fixed error + estimation in adaptive algorithms so zero valued functions no + longer cause nan errors and thus time steps + +2008-01-30 07:19 gmcmanus + + * trunk/xmds-devel/BUGS, trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmds_breakpoint.cc, + trunk/xmds-devel/source/xmds_output.cc: fix bug: properly escape + strings when outputting xmds file + + - we need to escape backslashes \ and quotation marks ", + which we do with escapeStringC on sim{Header,Footer,Body}Text + (these are only used for source generation, so they are the right + variables to escape). + We no longer escape quotation marks in simulationText. + + - we also need to avoid percentage signs, so generate code like: + printf("%s", "..."); + instead of + printf("..."); + + - similar bugs probably exist, so create a BUGS file and note it. + +2008-01-30 07:18 gmcmanus + + * trunk/xmds-devel/source/main.cc: new function in main: + escapeStringC + + - given a string, escape backslashes and quotation marks in the + string + with a backslash. + This allows the string to be read properly in C source. + + - To do: for strict correctness, perhaps more characters should + be escaped + (e.g. non-printable characters)? + +2008-01-30 06:53 grahamdennis + + * trunk/xmds-devel/source/xmds_integrate_rk4.cc: Increase the order + of the cross-propagation integration from 2nd order to 4th by + calculating midpoints more correctly. + +2008-01-29 23:21 paultcochrane + + * trunk/xmds-devel/source/Doxyfile: The api docs don't get dumped + into the documentation directory of xmds.org + anymore. So put them locally. + +2008-01-29 22:06 paultcochrane + + * trunk/xmds-devel/source/xmds_output.cc: Removed a lot of + auto-generate code which produced only commented out code. + +2008-01-29 04:42 gmcmanus + + * trunk/xmds-devel/examples/infinite.xmds: New example: ODE with + singularity in derivative + + - to test min_time_step feature + +2008-01-29 04:42 gmcmanus + + * trunk/xmds-devel/source/xmds_integrate.cc, + trunk/xmds-devel/source/xmds_integrate.h, + trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.cc: min_time_step: + halt adaptive integration pass if time step becomes too small + + - by default, have a min_time_step of 1e-13 + - the checking can be disabled if min_time_step = 0 + + - Implemented by adding the writeStepCheckingCode method to + xmdsIntegrate. + This is not ideal, but reduces code duplication; + see comments in the source. + - we only check the size of the step when the error is + intolerable, + so there is no cost when the integration is running successfully. + + - writeHaltCode can now print more verbose warning messages; + however, the caller needs to be careful about escaped characters. + It's easiest to avoid them altogether rather than double-quoting + them. + A function to quote raw strings with C escape codes would be + useful. + + - also, use doxygen style comments in xmds_integrate.h + +2008-01-29 04:42 gmcmanus + + * trunk/xmds-devel/source/xmds_integrate.cc, + trunk/xmds-devel/source/xmds_integrate.h: xmdsIntegrate: separate + function to write halting code + + This is in preparation of the minimum step-size check, + and leads to less code duplication in the generation code. + It does lead to more code duplication in the generated code, + but in non-critical areas (it is code to halt the integration). + +2008-01-29 04:41 gmcmanus + + * trunk/xmds-devel/source/xmds_integrate.cc: more accurate comment + for non-finite number check + + In most simulations, the components of the main vector + are coupled together. So even if there is no Fourier transform, + the components are quickly mixed together. + + Also, we check for any non-finite numbers (not just NaNs). + +2008-01-29 04:40 gmcmanus + + * trunk/xmds-devel/examples/nan.xmds: remove left over comment in + nan example + +2008-01-26 23:07 paultcochrane + + * trunk/xmds-devel/Makefile.am: Improvement of the make examples + target so that we can finally build + the examples properly on OpenSolaris. + +2008-01-26 22:55 paultcochrane + + * trunk/xmds-devel/Makefile.am: Updated the base Makefile.am to + build the examples directory with the same + interface as previously. make examples and make examples-clean + works as + expected. + +2008-01-26 22:52 paultcochrane + + * trunk/xmds-devel/configure.in: Added examples/Makefile to list of + Makefiles to be automatically built + +2008-01-26 22:52 paultcochrane + + * trunk/xmds-devel/examples/Makefile.am: Added an automake Makefile + template to build the examples scripts. + +2008-01-26 22:51 paultcochrane + + * trunk/xmds-devel/examples: Updated the svn:ignore property on the + examples/ subdirectory + +2008-01-26 22:50 paultcochrane + + * trunk/xmds-devel/examples/Makefile: Removed examples Makefile as + this is now created by a Makefile.am (autoconf + tools) + +2008-01-25 02:47 gmcmanus + + * trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.cc: fix bug: check + to halt before resetting the segment in adaptive integration + + - otherwise, the segment may always be reset to before a NaN, + which would then never be detected and the integration would + enter an infinite loop. + +2008-01-25 02:06 joehope + + * trunk/xmds-devel/Makefile.am: Fix for namespace issue with + certain compilers. + +2008-01-25 01:04 gmcmanus + + * trunk/xmds-devel/source/xmds_integrate_siip.cc: fix syntax error + in generated code for SIIP + + - C requires a statement after every label, + so we insert an empty statemeny after the _SEGMENT*_END label + - This bug was revealed by always printing the labels. + Previously it was a bug when using both SIIP and runtime_limit. + +2008-01-25 00:25 gmcmanus + + * trunk/xmds-devel/source/xmds_integrate.cc: only print default + value message if verbose + + - fix indentation too + +2008-01-25 00:22 gmcmanus + + * trunk/xmds-devel/Makefile.am: added nan.xmds to examples in + Makefile.am + + - removed trailing and leading spaces too + +2008-01-24 23:44 gmcmanus + + * trunk/xmds-devel/examples/nan.xmds: example that has a NaN in the + derivative + +2008-01-24 23:43 gmcmanus + + * trunk/xmds-devel/source/xmds_integrate.cc: read halt_non_finite + tag in xmdsIntegrate + + - the task of reading a bool from a tag, + reading the list and printing messages accordingly + should be a separate function + +2008-01-24 23:43 gmcmanus + + * trunk/xmds-devel/source/xmds_integrate.cc, + trunk/xmds-devel/source/xmds_integrate.h: Add the non-finite + number checking and halting code + + - modify writeHaltCheckingCode to check the main vector for + non-finite numbers + + - non-finite numbers are the infinities (e.g. 1/0) + and NaN (e.g. 0/0). + - The Fourier transform will mix together all the elements + of the main vector, so we only need to check one component + - we exit the same as if overtime + - print useful notices when stopping the integration + + - new parameter in xmdsIntegrate: myHaltNonFinite (set to false + for now) + +2008-01-24 23:42 gmcmanus + + * trunk/xmds-devel/source/xmds_integrate.cc, + trunk/xmds-devel/source/xmds_integrate.h, + trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.cc, + trunk/xmds-devel/source/xmds_integrate_rk4.cc, + trunk/xmds-devel/source/xmds_integrate_rk9.cc, + trunk/xmds-devel/source/xmds_integrate_siex.cc, + trunk/xmds-devel/source/xmds_integrate_siip.cc: prepare for check + to halt on non-finite numbers + + - generalize writeRuntimeCheckingCode to writeHaltCheckingCode, + and slightly rewrite it. + - print a notice if the simulation is halted prematurely + - in non-adaptive integration, move halt checks to just before + samples. + - in adaptive integration, move halt checks to end of time-step + loop. + - write SEGMENT*_END label unconditionally + +2008-01-24 23:42 gmcmanus + + * trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.cc: small + refactoring: use && instead of nested ifs + +2008-01-24 23:41 gmcmanus + + * trunk/xmds-devel/source/xmds_integrate.cc: improve verbose + messages + + - more consistency + - fix spelling errors + - fix spacing + +2008-01-24 23:41 gmcmanus + + * trunk/xmds-devel/source/xmds_integrate_rk4.cc, + trunk/xmds-devel/source/xmds_integrate_rk4ex.cc: indentation to + shorten lines + +2008-01-22 06:31 gmcmanus + + * trunk/xmds-devel/source/xmds_integrate_rk4.cc: Comments about + sampling code + + - Code is repeated in other integrate classes. + - Why use multiplication and division instead of mod (%)? + Perhaps former is faster, depending on architecture. + +2008-01-22 06:31 gmcmanus + + * trunk/xmds-devel/source/xmds_integrate.h: Why pass a reference to + a constant int? + + It makes some sense to pass references to constant objects, + so that the entire object doesn't have to be copied onto the + stack. + But ints are (about) the same size as pointers. + +2008-01-22 06:31 gmcmanus + + * trunk/xmds-devel/source/xmds_integrate.h: improved documentation + for xmdsIntegrate methods + + - completed documentation for methods that return bool + - added documentation for writeRuntimeCheckingCode + +2008-01-21 23:13 paultcochrane + + * trunk/xmds-devel/admin/xmds.spec: Realistically this is the spec + for xmds-1.6.5. Changed the comment to reflect this. Also, in the + last commit, I updated the comments for the given xmds.spec + version to document what has been altered. + +2008-01-21 23:11 paultcochrane + + * trunk/xmds-devel/admin/xmds.spec: Updated the name of the pdf + documentation to add into the rpm + Added relevant files which are now installed to list of files to + include in the rpm + +2008-01-21 22:55 paultcochrane + + * trunk/xmds-devel/admin/xmds.spec: We're now packaging for + xmds-1.6.5 so changed the version number to reflect this. + We're not able to install the files into /usr/lib/xmds and + /usr/include/xmds due to the fact that we determine where the + libraries and headers go at configure time, so revert back to + using the standard locations. + +2008-01-21 22:44 paultcochrane + + * trunk/xmds-devel/ChangeLog: Added a note about new configuration + and installation changes. + +2008-01-21 22:26 paultcochrane + + * trunk/xmds-devel/admin/xmds.spec: The patches for Fedora are no + longer necessary as the issues they addressed + have now been applied in the trunk. + +2008-01-21 22:23 paultcochrane + + * trunk/xmds-devel/Makefile.am: The examples now go into an + examples/ subdirectory of the doc/xmds directory + when installed. + +2008-01-21 22:15 paultcochrane + + * trunk/xmds-devel/Makefile.am: Actually, come to think of it, the + examples, NEWS, COPYING and AUTHORS + should also go into the /usr/share/doc/xmds dir. + +2008-01-21 22:12 paultcochrane + + * trunk/xmds-devel/Makefile.am, + trunk/xmds-devel/source/Makefile.am: Changing the location of + where loadxsil.m is installed. It now goes in + /usr/local/share/doc/xmds/ (or equivalent). The README and + README.Windows + now also go into this directory when make install is run. + +2008-01-21 21:43 paultcochrane + + * trunk/xmds-devel/admin/xmds.spec: Now using the correct version + information for finding the xmds source, and + for the release number of the .rpm + +2008-01-21 19:28 paultcochrane + + * trunk/xmds-devel/TODO: Minor textual cleanup to fit with my + old-fashioned tastes ;-) + +2008-01-21 03:52 joehope + + * trunk/xmds-devel/admin/xmdsReleaseProcedure.pod: Added in the + command for auto-ChangeLog generation. Even if it isn't our + officially released set of changes, it's a useful document. + +2008-01-21 03:39 joehope + + * trunk/xmds-devel/TODO: Removing trailing space. + +2008-01-21 03:03 joehope + + * trunk/xmds-devel/TODO: Updated TODO before discussion with + Gabriel. + +2008-01-21 00:14 joehope + + * trunk/xmds-devel/source/xmds_integrate_ip.cc: Fixed bug from + interaction picture replacements. Have to watch people using the + vector version incorrectly, and my cleanup test was buggy. + +2008-01-20 14:35 paultcochrane + + * trunk/xmds-devel/source/xmds_integrate.cc: Reformatted code, and + made indenting more consistent. No functional + improvements but hopefully reads a bit more easily. Also made + some notes on + places where the code could be refactored + +2008-01-19 16:16 paultcochrane + + * trunk/xmds-devel/source/xmds_breakpoint.cc, + trunk/xmds-devel/source/xmds_integrate.cc, + trunk/xmds-devel/source/xmds_integrate_ex.cc, + trunk/xmds-devel/source/xmds_integrate_siip.cc, + trunk/xmds-devel/source/xmds_vector.cc: Adding spacing around + parentheses for readability + +2008-01-19 16:11 paultcochrane + + * trunk/xmds-devel/source/xmds_field.cc, + trunk/xmds-devel/source/xmds_integrate.cc, + trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ex.cc, + trunk/xmds-devel/source/xmds_integrate_siip.cc, + trunk/xmds-devel/source/xmds_utils.cc, + trunk/xmds-devel/source/xmds_utils.h, + trunk/xmds-devel/source/xmds_vector.cc, + trunk/xmds-devel/source/xmds_vector_element.cc, + trunk/xmds-devel/source/xml_basics.cc: Banishing hard tabs. + +2008-01-19 16:03 paultcochrane + + * trunk/xmds-devel/admin/xmdsReleaseProcedure.pod: Updated release + procedure to reflect the change in the way the ChangeLog is + handled. + +2008-01-19 16:02 paultcochrane + + * trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/xmds_breakpoint.cc, + trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ex.cc, + trunk/xmds-devel/source/xmds_utils.cc, + trunk/xmds-devel/source/xmds_vector.cc, + trunk/xmds-devel/source/xsil_field.cc: Removed trailing space. + +2008-01-19 16:01 paultcochrane + + * trunk/xmds-devel/configure.in: Updated xmds version number to the + current development version (xmds-1.6.4 has been released) + +2008-01-19 16:01 paultcochrane + + * trunk/xmds-devel/source/Doxyfile: Updated the xmds version number + to 1.6.5 which is what we're working on now. + +2008-01-19 14:54 paultcochrane + + * trunk/xmds-devel/ChangeLog: Added a list of recent changes to the + change log + +2008-01-19 14:52 paultcochrane + + * trunk/xmds-devel/ChangeLog: Completely altered the ChangeLog. The + file now gives a summary of the changes + for each version of xmds. This is a far better overview of what + has been + happening in xmds than the overly detailed change log we used to + have. If + anyone is interested in the detailed version, they can just go + 'svn log'. + +2008-01-19 14:20 paultcochrane + + * trunk/xmds-devel/source/xmds_vector_element.cc: consting constant + charater arrays as per patch courtesy of Rafael Laboissiere. + +2008-01-19 14:18 paultcochrane + + * trunk/xmds-devel/source/xsil_field.cc: Applying patch for + C-string to C++-string casts comparison courtesy of + Rafael Laboissiere. + +2008-01-19 14:15 paultcochrane + + * trunk/xmds-devel/source: Ignoring TAGS files in svn status output + +2008-01-19 12:40 paultcochrane + + * trunk/xmds-devel/source/xsil_field.cc: *This* time converted tabs + to spaces + +2008-01-19 12:38 paultcochrane + + * trunk/xmds-devel/source/xsil_field.cc: Converted hard tabs to + spaces + +2008-01-18 14:18 paultcochrane + + * trunk/xmds-devel/source/Makefile.am: Applying patch supplied by + Rafael Laboissiere to remove the xmds_config.h + file from the release tarball and to remove the file when running + make distclean + +2008-01-16 00:12 joehope + + * trunk/xmds-devel/Makefile.am: Fix for the missing examples. + +2008-01-15 02:03 joehope + + * trunk/xmds-devel/admin/xmdsReleaseProcedure.pod: More direct way + of moving the files onto the website. Must change privileges as + well, apparently. + +2008-01-10 04:20 joehope + + * trunk/xmds-devel/MANIFEST, trunk/xmds-devel/Makefile.am: More + version 1.6.4 release preparation. + +2008-01-10 04:13 joehope + + * trunk/xmds-devel/ChangeLog, trunk/xmds-devel/README, + trunk/xmds-devel/README.Windows: Preparing for new version + release. + +2008-01-10 02:55 joehope + + * trunk/xmds-devel/examples/highdim.xmds, + trunk/xmds-doc/latex/functionality.tex, + trunk/xmds-doc/latex/languageReference.tex, + trunk/xmds-doc/latex/misc_defs.tex, + trunk/xmds-doc/latex/moreExamples.tex, + trunk/xmds-doc/latex/tutFromScratch.tex, + trunk/xmds-doc/latex/xmds_doc.tex, + trunk/xmds-doc/latex/xsil2graphics.tex: Update of the + documentation for the new version. Some older bits were updated, + though not thoroughly, and the new component array abilities are + mentioned, referenced, and included in the examples. + +2008-01-10 00:11 joehope + + * trunk/xmds-devel/examples/HighdimPlotExample.nb, + trunk/xmds-devel/examples/highdim.xmds, + trunk/xmds-devel/examples/highdim_vector_version.xmds, + trunk/xmds-devel/source/xmds_integrate.cc, + trunk/xmds-devel/source/xmds_integrate.h, + trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ex.cc, + trunk/xmds-devel/source/xmds_integrate_ip.cc, + trunk/xmds-devel/source/xmds_integrate_siip.cc, + trunk/xmds-devel/source/xmds_vector.cc: Added vector + functionality for the fields in XMDS. This only works for the + main fields, as I believe that is the only time it is required. + + highdim_vector_version.xmds has been added as a shorthand to the + syntax. It is an identical program to highdim.xmds, but written + using the new syntax. Essentially, components can be described as + vectors by adding their length in parentheses: phi(200) + + They are then addressed by phi(j), where j may range from 1 to + the maximum value. Values for j are not range checked, so be + careful. + + Propagation and transverse derivatives are described by + dphi_dt(j) and Loperator[phi](j) respectively. + + Disadvantages of using vector syntax: If the k-space operator of + any of the components of a vector are required, all of them are + calculated. This makes, for example, highdim_vector_version.xmds + slower than the old version. + + IMPORTANT: For interaction picture algorithms, if a k-space + operator is applied to any component of a vector, then it is + applied to ALL OF THEM. This means that + highdim_vector_version.xmds only solves the correct equations + when used with an EX algorithm. + + Noises do not currently have a vector option, but it would be + easy to add if anyone was interested. + +2008-01-07 00:02 joehope + + * trunk/xmds-devel/source/xmds_integrate_ex.cc, + trunk/xmds-devel/source/xmds_utils.cc, + trunk/xmds-devel/source/xmds_vector.cc: Processing for vector + components. More to be done, but this is a transparent milestone. + +2008-01-01 06:07 joehope + + * trunk/xmds-devel/configure.in: Replacing Paul's fix. Was I + imagining problems? + +2007-12-31 04:00 joehope + + * trunk/xmds-devel/configure.in, trunk/xmds-devel/source/kissdom.h, + trunk/xmds-devel/source/xmds_field.cc, + trunk/xmds-devel/source/xmds_utils.cc, + trunk/xmds-devel/source/xmds_utils.h, + trunk/xmds-devel/source/xmds_vector.cc, + trunk/xmds-devel/source/xmds_vector.h, + trunk/xmds-devel/source/xmds_vector_element.cc: Preliminary + structures for definition of vector components. These changes + currently have no functional effect at all. Also includes a + backout of Paul's recent configure.in changes. We need to find a + script that works on all systems. + +2007-12-30 17:34 paultcochrane + + * ., trunk/xmds-devel/configure.in: Converted 'test x$var != x' + tests to use 'test -n' instead. This is to try + to fix Joe's current configuration problems. It seems that for + some reason + even though FFTW_LIB_PATH and FFTW3_LIB_PATH aren't set taht the + true paths + of the if statements were still being taken and therefore -L was + being + incorrectly added to the LDFLAGS variable at configuration check + time. + +2007-12-30 17:34 paultcochrane + + * ., trunk/xmds-devel/source/xmds_globals.cc: Minor tidyups to try + to improve code readability + +2007-12-30 17:34 paultcochrane + + * ., trunk/xmds-devel/source/xmds_filter.cc: Tidy up code a bit, + add spacing and try to make autogenerated code a bit + easier to read. + +2007-12-22 15:19 paultcochrane + + * trunk/xmds-devel/configure.in: Removed FFTW_LIB_PATH from + arguments to AC_CHECK_LIB() where extra libraries + are required, rather than extra paths to libraries. The paths to + libraries + should already have been set in LDFLAGS if we have them in some + non-standard + location. + +2007-12-22 14:57 paultcochrane + + * trunk/xmds-devel/configure.in: Only appending to the LDFLAGS when + the FFTW*_LIB_PATH variable is set + +2007-12-22 12:56 joehope + + * trunk/xmds-devel/examples/HighdimPlotExample.nb, + trunk/xmds-devel/source/xsil2graphics.cc, + trunk/xmds-devel/source/xsil_field.cc: The new version of + Mathematica now inputs all files. The structure of that data is + tidied up as well. + +2007-12-21 18:51 paultcochrane + + * trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.cc: Fixed a bug + where a comparison between a C string and a character array + caused + the incorrect path to be taken. + The long version of the story is this: we had instances of + typeName == "complex" + which works in C++, but not when typeName is a const char * (i.e. + not a C++ + string object). The correct thing to do here is to use strcmp() + (or make + typeName into a string object). So, I took the shorter path and + added strcmp() + comparisons instead. This was picked up by the Sun C++ compiler + (why didn't + gcc or icc pick this up?), and flagged as an error. + +2007-12-21 18:26 paultcochrane + + * trunk/xmds-devel/source/xmds_simulation.cc: The math.h in Sun's + CC doesn't define INFINITY. However, it does define + HUGE_VAL, so use this instead of INFINITY if INFINITY isn't + defined. + +2007-12-21 17:46 paultcochrane + + * trunk/xmds-devel/configure.in: Configuring xmds with Sun's C + compiler on Open Solaris means that we need to + have the library paths *before* the libraries. Also we need to + set the LDFLAGS + variable so that configure is able to find the appropriate + libraries when + we use --with-fftw-path. + +2007-12-21 17:05 paultcochrane + + * trunk/xmds-devel/configure.in: Sun's C compiler doesn't handle + -Wall, hence only turning on warnings flags + for gcc. + +2007-12-21 16:14 paultcochrane + + * trunk/xmds-devel/configure.in: Correcting a piece of error text + when fftw3 isn't found. + +2007-12-16 04:01 joehope + + * trunk/xmds-devel/examples/HighdimPlotExample.nb, + trunk/xmds-devel/examples/highdim.xmds: Plotting examples for the + Mathematica input. + +2007-12-16 04:00 joehope + + * trunk/xmds-devel/source/xml_basics.cc, + trunk/xmds-devel/source/xsil2graphics.cc, + trunk/xmds-devel/source/xsil_field.cc, + trunk/xmds-devel/source/xsil_field.h: Support for binary input + into the lastest version of Mathematica. ASCII support for latest + version and binary support for old version are not yet + implemented. + +2007-12-15 19:52 joehope + + * trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.cc: Never say final: + This is the ultimate fix for the multi-block error. + +2007-12-14 02:42 michaelhush + + * trunk/xmds-devel/source/xmds_integrate_ark89.cc: fixed problem + with cycle tag when using ark89 + +2007-12-12 07:23 joehope + + * trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.cc: When multiple + sequence elements are used for any reason, the sample times were + wrong for the adaptive algorithms. Fixed. + I can't believe no-one noticed this one. Further bugs to come. + +2007-11-26 04:11 grahamdennis + + * trunk/xmds-devel/source/xmds_breakpoint.cc: Correct compiler + warning when compiling scripts that use the breakpoint + auto-naming feature. + +2007-11-25 03:52 grahamdennis + + * trunk/xmds-devel/source/xmds_breakpoint.cc, + trunk/xmds-devel/source/xmds_breakpoint.h, + trunk/xmds-devel/source/xmds_simulation.cc: If there isn't a + filename tag for a breakpoint element, then the breakpoints will + be named 1.xsil, 2.xsil, 3.xsil etc. Note that this is not reset + for half-step integration. The naming increments for all + breakpoints in the simulation that lack a filename tag. + +2007-11-18 23:17 paultcochrane + + * ., trunk/xmds-devel/source/xmds_field.cc: Merged more fprintf + statements together. + +2007-11-18 23:17 paultcochrane + + * ., trunk/xmds-devel/source/xmds_field.cc: Changed the following + variables in xmdsField::writeDefines(): + dimI->domain.begin.c_str() and dimI->domain.end.c_str() + to use shorter, but as descriptive, names. + +2007-11-18 23:17 paultcochrane + + * ., trunk/xmds-devel/source/xmds_field.cc: Replaced occurrences of + myName.c_str() with a constant fieldName variable in + xmdsField::writeDefines() + +2007-11-18 23:16 paultcochrane + + * ., trunk/xmds-devel/source/xmds_field.cc: Compacted more fprintf + statements into fewer. Attempting to make the + generated code look as "normal" as possible. + +2007-11-18 23:16 paultcochrane + + * ., trunk/xmds-devel/source/xmds_field.cc: More spacing-out of + code and compression of fprintf statements into one. + +2007-11-18 23:16 paultcochrane + + * ., trunk/xmds-devel/source/xmds_element.cc: Minor formatting + changes. Dunno if it helped readability that much ... + +2007-11-18 20:20 paultcochrane + + * ., trunk/xmds-devel/source/xmds_breakpoint.cc: Further expansion + of generated code. + Some more formatting changes. + +2007-11-18 20:19 paultcochrane + + * ., trunk/xmds-devel/source/xmds_breakpoint.cc: Wrote some of the + generated code a bit more longhand so that it's easier to + read in the xmds code. + +2007-11-18 20:19 paultcochrane + + * ., trunk/xmds-devel/source/xmds_breakpoint.cc: Further + compression of code to be generated into single fprintf + statements + +2007-11-18 20:19 paultcochrane + + * ., trunk/xmds-devel/source/xmds_breakpoint.cc: Caught a mistake + in one of the format strings. + +2007-11-18 20:19 paultcochrane + + * ., trunk/xmds-devel/source/xmds_breakpoint.cc: Merged some + fprintf statements into one, to try to make code to be generated + easier to read. + +2007-11-18 20:19 paultcochrane + + * ., trunk/xmds-devel/source/xmds_breakpoint.cc: Moved 'coordinate' + variable increment into body of 'for' loop instead of + residing in 'for' loop header itself. This is in the generated + code. + BTW: the last commit added braces around this 'for' loop. + +2007-11-18 20:19 paultcochrane + + * ., trunk/xmds-devel/source/xmds_breakpoint.cc: More formatting + changes. I'm doing this in little bits on this file to try + enable us to pinpoint where something went wrong if at all. + +2007-11-18 18:47 paultcochrane + + * ., trunk/xmds-devel/source/xmds_breakpoint.cc: Code formatting + improvements. Hopefully a bit easier to read now. + +2007-11-18 18:47 paultcochrane + + * ., trunk/xmds-devel/source/xmds_complex.h, + trunk/xmds-devel/source/xmds_field.h: Putting declaration of + initialiseFieldFromXSILFile() back in xmds_complex.h + so that diffusion2.xmds can build again. Maybe we need an + xmds_utils.h + header? + +2007-11-18 18:47 paultcochrane + + * ., trunk/xmds-devel/source/xmds_argv.cc: Minor code format + change. + +2007-11-18 18:47 paultcochrane + + * ., trunk/xmds-devel/source/xmds_arg_element.cc: Minor textual + changes; code readability improvements. + +2007-11-18 18:46 paultcochrane + + * ., trunk/xmds-devel/source/kissdom.cc: Minor code tidyups; trying + to improve readability a bit. + +2007-11-17 14:15 paultcochrane + + * ., trunk/xmds-devel/TODO: Minor textual tidyups + +2007-11-17 13:42 paultcochrane + + * ., trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/xmds_arg.cc, + trunk/xmds-devel/source/xmds_complex.h, + trunk/xmds-devel/source/xmds_element.cc, + trunk/xmds-devel/source/xmds_field.cc, + trunk/xmds-devel/source/xmds_filter.cc, + trunk/xmds-devel/source/xmds_globals.cc, + trunk/xmds-devel/source/xmds_integrate.cc, + trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ark45ex.cc, + trunk/xmds-devel/source/xmds_integrate_ark45ip.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.cc, + trunk/xmds-devel/source/xmds_integrate_ark89ex.cc, + trunk/xmds-devel/source/xmds_integrate_ark89ip.cc, + trunk/xmds-devel/source/xmds_integrate_ex.cc, + trunk/xmds-devel/source/xmds_integrate_ip.cc, + trunk/xmds-devel/source/xmds_integrate_rk4.cc, + trunk/xmds-devel/source/xmds_integrate_rk4ex.cc, + trunk/xmds-devel/source/xmds_integrate_rk4ip.cc, + trunk/xmds-devel/source/xmds_integrate_rk9.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ex.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ip.cc, + trunk/xmds-devel/source/xmds_integrate_si.cc, + trunk/xmds-devel/source/xmds_integrate_siex.cc, + trunk/xmds-devel/source/xmds_integrate_siip.cc, + trunk/xmds-devel/source/xmds_moment_group.cc, + trunk/xmds-devel/source/xmds_output.cc, + trunk/xmds-devel/source/xmds_segment.cc, + trunk/xmds-devel/source/xmds_sequence.cc, + trunk/xmds-devel/source/xmds_utils.cc, + trunk/xmds-devel/source/xmds_vector.cc, + trunk/xmds-devel/source/xmds_vector_element.cc, + trunk/xmds-devel/source/xml_parser.h: Spacing code out a bit more + for readability. + +2007-11-17 13:41 paultcochrane + + * ., trunk/xmds-devel/source/xmds_simulation.cc: - Added spaces + around commas and semicolons + - Removed superfluous trailing semicolon in _dtdWstore struct in + generated + code. + +2007-11-17 13:41 paultcochrane + + * ., trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmds_breakpoint.cc, + trunk/xmds-devel/source/xml_basics.cc, + trunk/xmds-devel/source/xml_parser.cc, + trunk/xmds-devel/source/xsil_field.cc: Adding spacing around + commas and semicolons to try to improve readability + +2007-11-17 13:41 paultcochrane + + * ., trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.cc: Rolled lots of + fprintf statements into one fprintf statement where possible. + Hopefully this makes the code to be generated easier to read. + +2007-11-17 13:41 paultcochrane + + * ., trunk/xmds-devel/source/xml_basics.h: Removed unused XMLBASICS + define. + Minor docstring tidyups + +2007-11-17 13:40 paultcochrane + + * ., trunk/xmds-devel/source/xmds_vector.h, + trunk/xmds-devel/source/xml_basics.cc, + trunk/xmds-devel/source/xsil_field.cc, + trunk/xmds-devel/source/xsil_field.h: Updated some Doxygen docs. + +2007-11-17 13:40 paultcochrane + + * ., trunk/xmds-devel/source/kissdom.h: Removed unused #define + variable. + +2007-11-17 13:40 paultcochrane + + * ., trunk/xmds-devel/source/xmds_complex.h, + trunk/xmds-devel/source/xmds_field.h: Moved declaration of + initialiseFieldFromXSILFile to xmds_field.h. Updated + some of the doxygen docs in xmds_field.h + +2007-11-13 07:49 paultcochrane + + * ., trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/xmds_breakpoint.cc, + trunk/xmds-devel/source/xmds_complex.h, + trunk/xmds-devel/source/xmds_element.cc, + trunk/xmds-devel/source/xmds_field.cc, + trunk/xmds-devel/source/xmds_filter.cc, + trunk/xmds-devel/source/xmds_globals.cc, + trunk/xmds-devel/source/xmds_integrate_ark45ex.cc, + trunk/xmds-devel/source/xmds_integrate_ark45ip.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.cc, + trunk/xmds-devel/source/xmds_integrate_ark89ex.cc, + trunk/xmds-devel/source/xmds_integrate_ark89ip.cc, + trunk/xmds-devel/source/xmds_integrate_ex.cc, + trunk/xmds-devel/source/xmds_integrate_ip.cc, + trunk/xmds-devel/source/xmds_integrate_rk4.cc, + trunk/xmds-devel/source/xmds_integrate_rk4ex.cc, + trunk/xmds-devel/source/xmds_integrate_rk4ip.cc, + trunk/xmds-devel/source/xmds_integrate_rk9.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ex.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ip.cc, + trunk/xmds-devel/source/xmds_integrate_si.cc, + trunk/xmds-devel/source/xmds_integrate_siex.cc, + trunk/xmds-devel/source/xmds_integrate_siip.cc, + trunk/xmds-devel/source/xmds_moment_group.cc, + trunk/xmds-devel/source/xmds_output.cc, + trunk/xmds-devel/source/xmds_segment.cc, + trunk/xmds-devel/source/xmds_sequence.cc, + trunk/xmds-devel/source/xmds_utils.cc, + trunk/xmds-devel/source/xmds_vector.cc, + trunk/xmds-devel/source/xmds_vector_element.cc, + trunk/xmds-devel/source/xml_basics.cc, + trunk/xmds-devel/source/xml_parser.cc: Adjusted spacing around + parentheses for consistency and readability + +2007-11-13 07:48 paultcochrane + + * ., trunk/xmds-devel/source/xmds_moment_group.h, + trunk/xmds-devel/source/xml_parser.h, + trunk/xmds-devel/source/xsil_field.h: Correcting filenames in + doxygen documentation. + +2007-11-13 07:47 paultcochrane + + * ., trunk/xmds-devel/source/Doxyfile: Updated Doxyfile format. + +2007-11-11 22:01 paultcochrane + + * trunk/xmds-devel/test/coding_stds/c_parens.t: Added C-language + parenthesis spacing coding standards test from the Parrot + project: www.parrotcode.org. Adjusted the test for the xmds + source. + +2007-11-11 21:55 paultcochrane + + * ., trunk/xmds-devel/source/dom3.h, + trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmds_arg_element.cc, + trunk/xmds-devel/source/xmds_argv.cc, + trunk/xmds-devel/source/xmds_breakpoint.cc, + trunk/xmds-devel/source/xmds_field.cc, + trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.cc, + trunk/xmds-devel/source/xmds_integrate_ark89ex.cc, + trunk/xmds-devel/source/xmds_integrate_ark89ip.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ex.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ip.cc, + trunk/xmds-devel/source/xmds_output.cc, + trunk/xmds-devel/source/xmds_simulation.cc, + trunk/xmds-devel/source/xmds_vector.cc, + trunk/xmds-devel/source/xml_basics.cc, + trunk/xmds-devel/source/xml_parser.cc, + trunk/xmds-devel/source/xsil_field.cc: Adjusted parenthesis + spacing for more consistent formatting. + +2007-11-11 21:55 paultcochrane + + * ., trunk/xmds-devel/test/coding_stds/cuddled_else.t, + trunk/xmds-devel/test/coding_stds/tabs.t, + trunk/xmds-devel/test/coding_stds/trailing_space.t: Removed old + Parrot-specific comments from coding standards test files. + +2007-11-11 21:06 paultcochrane + + * ., trunk/xmds-devel/source/xmds_argv.cc, + trunk/xmds-devel/source/xmds_field.cc, + trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_moment_group.cc, + trunk/xmds-devel/source/xmds_simulation.cc, + trunk/xmds-devel/source/xmds_utils.cc, + trunk/xmds-devel/source/xsil2graphics.cc, + trunk/xmds-devel/source/xsil_field.cc, + trunk/xmds-devel/source/xsil_field.h: Removed trailing whitespace + +2007-11-11 21:05 paultcochrane + + * ., trunk/xmds-devel/source/xmds_breakpoint.cc, + trunk/xmds-devel/source/xmds_integrate_ip.cc, + trunk/xmds-devel/source/xmds_simulation.cc, + trunk/xmds-devel/source/xmds_vector_element.cc: Removed cuddled + else instances. + +2007-11-11 21:05 paultcochrane + + * ., trunk/xmds-devel/test/coding_stds/cuddled_else.t, + trunk/xmds-devel/test/coding_stds/trailing_space.t: Removed + non-existent filename from list of files to test coding + standards. + +2007-11-11 20:21 paultcochrane + + * ., trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.cc, + trunk/xmds-devel/source/xmds_moment_group.cc: Converted hard tabs + into spaces + +2007-11-11 20:21 paultcochrane + + * ., trunk/xmds-devel/test/coding_stds/tabs.t: Removed now + non-existent file from coding standards test + +2007-11-11 20:20 paultcochrane + + * ., trunk/xmds-devel/configure.in: Rolled xmds version information + into a variable. Updated the variable to be + xmds-1.6.4 as we've already released xmds-1.6.3. + +2007-11-11 20:20 paultcochrane + + * ., trunk/xmds-devel/source/xmds_breakpoint.cc, + trunk/xmds-devel/source/xmds_output.cc: Removed superfluous comma + in xmds output info text. + +2007-11-11 20:19 paultcochrane + + * ., trunk/xmds-devel/source/Doxyfile, + trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmds_breakpoint.cc, + trunk/xmds-devel/source/xmds_output.cc, + trunk/xmds-devel/source/xmds_simulation.cc, + trunk/xmds-devel/source/xmds_simulation.h, + trunk/xmds-devel/source/xsil2graphics.cc: Realistically speaking, + we don't need the RELEASE variable as a part of the + xmds version information; it's superfluous. Hence, I've removed + it, and we + can just define minor releases of xmds (i.e. xmds-x.x.y) with + just the + VERSION variable. This has the positive side effect of removing + some + superfluous code to handle the RELEASE information, and making + sure that in + each location where xmds version info is printed that the format + is the + same. Also, it makes packaging xmds easier for downstream + packagers, and + when we make a release ourselves (with 'make dits') the .tar.gz + file comes + out with the full version information instead of just the major + version. + +2007-10-23 04:28 andyferris + + * trunk/xmds-devel/source/xmds_moment_group.cc: Fixed typo "dobule" + +2007-10-23 02:35 andyferris + + * trunk/xmds-devel/source/xmds_utils.cc, + trunk/xmds-devel/source/xml_parser.cc: * xmds now reports the + line number of elements and the parents when encountering an + xmdsException. + * The XML parser now assigns attributes xmdsLineNumber and + xmdsColumnNumber to + EVERY element. This isn't what I'd call XML compliant but it does + the job. + +2007-10-22 03:51 andyferris + + * trunk/xmds-devel/TODO, trunk/xmds-devel/source/xmds_field.cc, + trunk/xmds-devel/source/xmds_moment_group.cc, + trunk/xmds-devel/source/xmds_utils.cc, + trunk/xmds-devel/source/xmds_utils.h: can now be + specified with C-code. + +2007-10-19 14:27 paultcochrane + + * trunk/xmds-devel/admin/xmds.spec: Further updates to spec + (although not yet complete) after more comments from + Patrice Dumas + +2007-10-19 14:25 paultcochrane + + * trunk/xmds-devel/README: Added mention of Octave to README + +2007-10-17 08:39 paultcochrane + + * trunk/xmds-devel/admin/xmds.spec: Several updates to get spec + file to conform to Fedora guidelines. + +2007-10-17 00:30 andyferris + + * trunk/xmds-devel/TODO, + trunk/xmds-devel/source/xmds_breakpoint.cc, + trunk/xmds-devel/source/xmds_integrate.h, + trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.cc, + trunk/xmds-devel/source/xmds_moment_group.cc, + trunk/xmds-devel/source/xmds_sequence.cc, + trunk/xmds-devel/source/xmds_simulation.cc, + trunk/xmds-devel/source/xmds_simulation.h: Some more tags are now + allowed to have C-code inside them: + + * is now interpretted as a string and thus works. If + code is + inserted here then it assumed paths > 1 (so mean_ and sd_ data is + produced). + * used to work for non-adaptive code; now it works + always. + * now allows arbitrary code, not just command-line args. + * Added a discussion in TODO. + +2007-09-20 12:40 grahamdennis + + * trunk/xmds-devel/source/xmds_moment_group.cc: Fix a subtle bug + when outputting data that has the propagation dimension + fourier transformed. This bug was introduced when the + runtime_limit code + was added, and occurs even without a runtime_limit. + I think I implemented the runtime_limit in an awful way. + +2007-09-18 11:12 joehope + + * trunk/xmds-devel/source/xmds_moment_group.cc: Precision = double + actually increases the precision of ascii output. + +2007-09-04 00:18 grahamdennis + + * trunk/xmds-devel/source/xmds_complex.h: Correct the branch cut + for the complex argument function (hence also fixing the branch + cut for the c_sqrt function). This should happen at z = -x (phi = + +/- pi), not at z=-i y (phi = 3pi/2, -pi/2). + +2007-08-31 06:23 grahamdennis + + * trunk/xmds-devel/source/loadxsil.m: Fix loadxsil.m for matlab. + I'm hoping this works for Octave (Paul?) + +2007-08-27 05:59 joehope + + * trunk/xmds-devel/TODO: Another feature requested. Will take a + day. + +2007-08-24 08:54 paultcochrane + + * trunk/xmds-devel/test/generated_code/Makefile: Improved the + generated <-> reference comparison test by grepping out + changable content. + +2007-08-24 02:54 grahamdennis + + * trunk/xmds-devel/source/loadxsil.m: Fix broken loadxsil.m since + r1543. + +2007-08-24 01:13 grahamdennis + + * trunk/xmds-devel/source/xmds_simulation.cc: Instead of defining + an isfinite that is always true, define one that should work on + systems that lack a built-in isfinite. + +2007-08-24 01:03 grahamdennis + + * trunk/xmds-devel/source/xmds_simulation.cc: Compile fix for + systems that don't have isfinite. This defines isfinite as true, + which is kinda hackish. + +2007-08-23 22:12 paultcochrane + + * ., trunk/xmds-devel/source/loadxsil.m: Fixed another problem + associated with matlab handling structures in a more + non-standard manner than octave. + Also indented the generated code for eval() so that one can read + it a bit + more easily. + +2007-08-23 22:01 paultcochrane + + * ., trunk/xmds-devel/source/loadxsil.m: Further spacing out of + code. + +2007-08-23 22:00 paultcochrane + + * ., trunk/xmds-devel/source/loadxsil.m: Made if(debug) statements + more explicit + +2007-08-23 22:00 paultcochrane + + * ., trunk/xmds-devel/source/loadxsil.m: Spaced out the code a + little bit. + +2007-08-23 22:00 paultcochrane + + * ., trunk/xmds-devel/source/loadxsil.m: Correcting address of FSF + +2007-08-23 22:00 paultcochrane + + * ., trunk/xmds-devel/source/loadxsil.m: Now just cleaning up the + text a bit. + +2007-08-23 21:59 paultcochrane + + * ., trunk/xmds-devel/source/loadxsil.m: Unindented some + over-zealous indentation. + +2007-08-23 21:59 paultcochrane + + * ., trunk/xmds-devel/source/loadxsil.m: Removed old commented-out + code + +2007-08-23 21:59 paultcochrane + + * ., trunk/xmds-devel/source/loadxsil.m: Finally found the extra + level of indentation I was looking for. + +2007-08-23 21:59 paultcochrane + + * ., trunk/xmds-devel/source/loadxsil.m: Trying to reindent the + code so that it makes some sense. I wish someone + would be able to tell me that I never wrote this code... *sigh* + +2007-08-23 21:58 paultcochrane + + * ., trunk/xmds-devel/source/loadxsil.m: Replaced hard tabs with + spaces. + +2007-08-23 21:58 paultcochrane + + * ., trunk/xmds-devel/source/loadxsil.m: Added a vim comment to set + tabstops and so-on properly + +2007-08-23 21:58 paultcochrane + + * ., trunk/xmds-devel/source/loadxsil.m: Octave needs the return + character to be properly escaped when loading data + from ascii data files. This change means that both matlab and + octave can + load data, however the matlab informative output doesn't look as + nice any + more. We'll need to think more carefully about how to make this + work on + both systems. + +2007-08-23 21:58 paultcochrane + + * ., trunk/xmds-devel/source/loadxsil.m: When debug is at a level + other than 0, then the assignin call doesn't need + to be run (this fixes a problem with running loadxsil.m with + debuggin on). + +2007-08-23 21:58 paultcochrane + + * ., trunk/xmds-devel/source/loadxsil.m: Applied patch correcting + octave-related compatibility issues. Patch + courtesy of Rafael Laboissiere + +2007-08-23 10:32 paultcochrane + + * trunk/xmds-devel/source/xsil_field.cc: Corrected some superfluous + character output issues when generating command + file output for R. + +2007-08-22 17:00 paultcochrane + + * trunk/xmds-devel/source/main.cc: Now exiting properly when we are + unable to determine the current directory. + +2007-08-22 16:57 paultcochrane + + * trunk/xmds-devel/source/main.cc: Now exiting properly when we + aren't able to properly determine the user's + home directory. + +2007-08-22 16:46 paultcochrane + + * trunk/xmds-devel/source/main.cc: Should have been checking for + .fail() instead of equality with null in file + opening checking code for templates. + +2007-08-22 16:43 paultcochrane + + * trunk/xmds-devel/source/main.cc: The template text variable is + now a string instead of being assigned const + char *, which isn't very C++. This removes a couple of todo items + as + well... + +2007-08-22 16:39 paultcochrane + + * trunk/xmds-devel/source/main.cc: Template output code now uses + C++ completely for output instead of a mixture + between standard C and C++. + +2007-08-22 16:24 paultcochrane + + * trunk/xmds-devel/source/main.cc: Some cout's should have been + cerr's so that the output was directed to + stderr as opposed to just stdout + +2007-08-22 15:48 paultcochrane + + * trunk/xmds-devel/source/xsil_field.cc: Removed repeated code in + writeAsFormat() + +2007-08-22 15:47 paultcochrane + + * trunk/xmds-devel/examples: Added *.gnu and *.R to files to be + ignored. + +2007-08-22 15:45 paultcochrane + + * trunk/xmds-devel/source/xsil2graphics.cc, + trunk/xmds-devel/source/xsil_field.cc, + trunk/xmds-devel/source/xsil_field.h: Added rudimentary support + for the R programming and graphics language. One + can now load variables into R at the R command prompt using + something like: + > source("sine.R") + > ls() + > plot(t_1, c_1) + At present this doesn't handle multi-dimensional data (I'm not + sure if R + handles that at all), but it's a start at least. + +2007-08-22 10:55 paultcochrane + + * trunk/xmds-devel/source/xsil2graphics.cc, + trunk/xmds-devel/source/xsil_field.cc, + trunk/xmds-devel/source/xsil_field.h: Added rudimentary handling + of gnuplot output to xsil2graphics. This + basically just outputs the data file as is and doesn't generate a + variable + loading file as one doesn't require one for gnuplot to display + the data. + This is effectively the same functionality as for the other + display options, + namely: generate a data file, and optionally a variable-loading + command file + such that from within the relevant environment one can then + display the + data. + +2007-08-22 07:39 paultcochrane + + * trunk/xmds-devel/source/xmds_simulation.cc: Added a check for an + inconsistent value of the tag when xmds + is built with only fftw3 support. Many thanks to Graham for + pointing this + situation out. + +2007-08-21 17:30 paultcochrane + + * ., trunk/xmds-devel/admin/xmdsReleaseProcedure.pod: Added some + notes on making the documentation (now it's possible to use make + instead of aap) and making a distribution of the docs. + +2007-08-21 17:30 paultcochrane + + * ., trunk/xmds-devel/examples/Makefile: Now removing files + generated by gcov as part of clean target + +2007-08-21 17:30 paultcochrane + + * ., trunk/xmds-devel/COPYING, + trunk/xmds-devel/examples/atomlaser.xmds, + trunk/xmds-devel/examples/branch.xmds, + trunk/xmds-devel/examples/brusselator.xmds, + trunk/xmds-devel/examples/catcycle.xmds, + trunk/xmds-devel/examples/chain.xmds, + trunk/xmds-devel/examples/chemkin.xmds, + trunk/xmds-devel/examples/diffusion.xmds, + trunk/xmds-devel/examples/diffusion2.xmds, + trunk/xmds-devel/examples/duffing.xmds, + trunk/xmds-devel/examples/fibre.xmds, + trunk/xmds-devel/examples/fisher_reaction_diffusion.xmds, + trunk/xmds-devel/examples/fullpos3D.xmds, + trunk/xmds-devel/examples/gaugeatomlaser.xmds, + trunk/xmds-devel/examples/groundstate.xmds, + trunk/xmds-devel/examples/highdim.xmds, + trunk/xmds-devel/examples/hires.xmds, + trunk/xmds-devel/examples/krebs.xmds, + trunk/xmds-devel/examples/kubo.xmds, + trunk/xmds-devel/examples/lane_emden.xmds, + trunk/xmds-devel/examples/lorenz.xmds, + trunk/xmds-devel/examples/lotka_volterra.xmds, + trunk/xmds-devel/examples/ndparamp.xmds, + trunk/xmds-devel/examples/nlse.xmds, + trunk/xmds-devel/examples/oregonator.xmds, + trunk/xmds-devel/examples/paraxial_wave.xmds, + trunk/xmds-devel/examples/pendulum.xmds, + trunk/xmds-devel/examples/ring_modulator.xmds, + trunk/xmds-devel/examples/sech_soliton.xmds, + trunk/xmds-devel/examples/sech_soliton_tdepk.xmds, + trunk/xmds-devel/examples/sine.xmds, + trunk/xmds-devel/examples/soliton.xmds, + trunk/xmds-devel/examples/thermkin.xmds, + trunk/xmds-devel/examples/tla.xmds, + trunk/xmds-devel/examples/van_der_pol.xmds, + trunk/xmds-devel/examples/vibstring.xmds: Correcting address of + Free Software Foundation. + +2007-08-21 17:28 paultcochrane + + * ., trunk/xmds-devel/configure.in: Corrected location of + FFTW3_LIBS and FFTW3_THREADLIBS variables so that they + are seen in the proper scope + +2007-08-21 14:06 paultcochrane + + * trunk/xmds-devel/source/xmds_breakpoint.h: Removed old todo item. + Breakpoints have already been implemented. + +2007-08-21 13:47 paultcochrane + + * trunk/xmds-devel/source/xsil_field.h: Did some rearranging to + make the text (hopefully) a bit easier to read. + +2007-08-21 13:18 paultcochrane + + * trunk/xmds-devel/source/xmds_simulation.cc: Trying to tidy up + further... + +2007-08-21 13:04 paultcochrane + + * trunk/xmds-devel/source/xmds_simulation.cc: Removed old + commented-out code. + +2007-08-21 13:01 paultcochrane + + * trunk/xmds-devel/source/xmds_simulation.cc: More text tidyups. + +2007-08-21 12:12 paultcochrane + + * trunk/xmds-devel/test/generated_code/reference/diffusion.cc, + trunk/xmds-devel/test/generated_code/reference/diffusion2.cc, + trunk/xmds-devel/test/generated_code/reference/fibre.cc, + trunk/xmds-devel/test/generated_code/reference/nlse.cc, + trunk/xmds-devel/test/generated_code/reference/sech_soliton.cc, + trunk/xmds-devel/test/generated_code/reference/sech_soliton_tdepk.cc: + Updated fftw3 references after Graham's recent xmds bugfix. + +2007-08-21 12:09 paultcochrane + + * trunk/xmds-devel/source/xmds_simulation.cc: Making use of the new + FFTW_THREE_ONLY #defined variable to choose fftw3 as + the default if fftw2 isn't detected at configure time, but fftw3 + is. This + allows systems with fftw3 only to build almost completely "out of + the box", + and to build and run the examples. + Graham: could you confirm whether or not this breaks your build? + I'm not + able to test a dual fftw2/fftw3 system. + +2007-08-21 12:07 paultcochrane + + * trunk/xmds-devel/configure.in: Trying to get fftw3-only builds + working properly. This change checks for + fftw3 in the absence of fftw2 and if so sets up the FFTW_LIBS + appropriately + and sets a flag to later tell xmds that it only has access to + fftw3. + Did some quoting tidyups at the same time. (I should really have + done these + in a separate commit...) + +2007-08-21 10:09 paultcochrane + + * trunk/xmds-devel/source/xsil_field.cc: Further spacing-out of + code. + Made a note of an odd-looking for loop. If it actually does + anything it + should have a comment next to it explaining what it does. + +2007-08-21 09:46 paultcochrane + + * trunk/xmds-devel/source/xsil_field.cc: More generic tidyups. + Added braces to if/else statements. Added space to + try to improve readability. + +2007-08-21 08:21 paultcochrane + + * trunk/xmds-devel/source/xmds_integrate_ark45.cc: Should have been + using boolean AND instead of bitwise AND in some if + statements. Also removed some superfluous brackets and added some + more + spacing. + +2007-08-21 08:17 paultcochrane + + * trunk/xmds-devel/source/xmds_integrate_ark45.cc: Minor touchups. + Trying to see if I can make the code to be autogenerated a + bit easier to read before it is generated. + +2007-08-20 12:51 paultcochrane + + * trunk/xmds-devel/source/xmds_integrate_ark45.cc: Adding some + whitespace for readability. + +2007-08-20 12:50 paultcochrane + + * trunk/xmds-devel/acinclude.m4: Removing some underquoted variable + warnings in generation of autoconf files. + +2007-08-15 10:30 paultcochrane + + * trunk/xmds-devel/configure.in: Configure now no longer barfs on + fftw2 if it doesn't exist. However, it + will now barf if both fftw2 and fftw3 aren't available. + +2007-08-15 09:47 paultcochrane + + * trunk/xmds-devel/source/xmds_arg.h, + trunk/xmds-devel/source/xmds_arg_element.h, + trunk/xmds-devel/source/xmds_argv.h, + trunk/xmds-devel/source/xmds_breakpoint.h, + trunk/xmds-devel/source/xmds_common.h, + trunk/xmds-devel/source/xmds_complex.h, + trunk/xmds-devel/source/xmds_element.h, + trunk/xmds-devel/source/xmds_field.h, + trunk/xmds-devel/source/xmds_filter.h, + trunk/xmds-devel/source/xmds_globals.h, + trunk/xmds-devel/source/xmds_integrate.h, + trunk/xmds-devel/source/xmds_integrate_ark45.h, + trunk/xmds-devel/source/xmds_integrate_ark45ex.h, + trunk/xmds-devel/source/xmds_integrate_ark45ip.h, + trunk/xmds-devel/source/xmds_integrate_ark89.h, + trunk/xmds-devel/source/xmds_integrate_ark89ex.h, + trunk/xmds-devel/source/xmds_integrate_ark89ip.h, + trunk/xmds-devel/source/xmds_integrate_ex.h, + trunk/xmds-devel/source/xmds_integrate_ip.h, + trunk/xmds-devel/source/xmds_integrate_rk4.h, + trunk/xmds-devel/source/xmds_integrate_rk4ex.h, + trunk/xmds-devel/source/xmds_integrate_rk4ip.h, + trunk/xmds-devel/source/xmds_integrate_rk9.h, + trunk/xmds-devel/source/xmds_integrate_rk9ex.h, + trunk/xmds-devel/source/xmds_integrate_rk9ip.h, + trunk/xmds-devel/source/xmds_integrate_si.h, + trunk/xmds-devel/source/xmds_integrate_siex.h, + trunk/xmds-devel/source/xmds_integrate_siip.h, + trunk/xmds-devel/source/xmds_moment_group.h, + trunk/xmds-devel/source/xmds_output.h, + trunk/xmds-devel/source/xmds_segment.h, + trunk/xmds-devel/source/xmds_sequence.h, + trunk/xmds-devel/source/xmds_simulation.h, + trunk/xmds-devel/source/xmds_utils.h, + trunk/xmds-devel/source/xmds_vector.h, + trunk/xmds-devel/source/xmds_vector_element.h: Added copyright + info to the new headers. + +2007-08-15 09:31 paultcochrane + + * trunk/xmds-devel/source/xmds_arg.cc, + trunk/xmds-devel/source/xmds_arg_element.cc, + trunk/xmds-devel/source/xmds_argv.cc, + trunk/xmds-devel/source/xmds_breakpoint.cc, + trunk/xmds-devel/source/xmds_element.cc, + trunk/xmds-devel/source/xmds_field.cc, + trunk/xmds-devel/source/xmds_filter.cc, + trunk/xmds-devel/source/xmds_globals.cc, + trunk/xmds-devel/source/xmds_integrate.cc, + trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ark45ex.cc, + trunk/xmds-devel/source/xmds_integrate_ark45ip.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.cc, + trunk/xmds-devel/source/xmds_integrate_ark89ex.cc, + trunk/xmds-devel/source/xmds_integrate_ark89ip.cc, + trunk/xmds-devel/source/xmds_integrate_ex.cc, + trunk/xmds-devel/source/xmds_integrate_ip.cc, + trunk/xmds-devel/source/xmds_integrate_rk4.cc, + trunk/xmds-devel/source/xmds_integrate_rk4ex.cc, + trunk/xmds-devel/source/xmds_integrate_rk4ip.cc, + trunk/xmds-devel/source/xmds_integrate_rk9.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ex.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ip.cc, + trunk/xmds-devel/source/xmds_integrate_si.cc, + trunk/xmds-devel/source/xmds_integrate_siex.cc, + trunk/xmds-devel/source/xmds_integrate_siip.cc, + trunk/xmds-devel/source/xmds_moment_group.cc, + trunk/xmds-devel/source/xmds_output.cc, + trunk/xmds-devel/source/xmds_segment.cc, + trunk/xmds-devel/source/xmds_sequence.cc, + trunk/xmds-devel/source/xmds_simulation.cc, + trunk/xmds-devel/source/xmds_utils.cc, + trunk/xmds-devel/source/xmds_vector.cc, + trunk/xmds-devel/source/xmds_vector_element.cc, + trunk/xmds-devel/source/xml_basics.cc, + trunk/xmds-devel/source/xml_parser.cc, + trunk/xmds-devel/source/xsil_field.cc: Corrected 'file' field in + doxygen documentation + +2007-08-15 09:28 paultcochrane + + * trunk/xmds-devel/source/main.cc: Removed superfluous text from + doxygen docs. + +2007-08-15 09:25 paultcochrane + + * trunk/xmds-devel/source/Makefile.am: No longer building the latex + docs with the api target + +2007-08-15 09:24 paultcochrane + + * trunk/xmds-devel/source/main.cc: Updated version information for + doxygen + +2007-08-15 09:15 paultcochrane + + * trunk/xmds-devel/source/Doxyfile: Updated the version number to + be current with xmds + +2007-08-15 08:49 paultcochrane + + * trunk/xmds-devel/source/xmds_arg.cc, + trunk/xmds-devel/source/xmds_arg_element.cc, + trunk/xmds-devel/source/xmds_argv.cc: More spacing and textual + cleanups. + +2007-08-15 08:06 paultcochrane + + * trunk/xmds-devel/source/kissdom.cc: Minor textual tidyups. + +2007-08-15 08:06 paultcochrane + + * trunk/xmds-devel/configure.in: The configure script shouldn't + barf on not finding fftw2 when --enable-fftw3 + is set. Hence now only running the fftw2-specific checks when + --enable-fftw3 isn't set when running the configure script. + +2007-08-15 07:52 paultcochrane + + * trunk/xmds-devel/test/generated_code/reference_fftw2/diffusion.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/diffusion2.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/fibre.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/nlse.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/sech_soliton.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/sech_soliton_tdepk.cc: + Updated reference files after recent change by grahamdennis which + fixed an + issue with error calculations in adaptive algorithms. + +2007-08-15 07:50 paultcochrane + + * trunk/xmds-devel/Makefile.am, trunk/xmds-devel/test/Makefile: + Added test-fftw2 targets to makefiles further up the directory + structure. + +2007-08-14 14:31 paultcochrane + + * trunk/xmds-devel/source/xsil2graphics.cc: Further code tidy-ups + and c++ isms. + +2007-08-14 14:19 paultcochrane + + * trunk/xmds-devel/source/xsil2graphics.cc: Added some space to the + code to try to improve readability + +2007-08-14 14:14 paultcochrane + + * trunk/xmds-devel/source/xsil2graphics.cc: Using c++ io output + instead of standard c. This allows us to use stdout and + stderr more easily. is then no longer needed. + Also added usage output when no input file is specified to be + consistent + with xmds behaviour. + +2007-08-14 13:57 paultcochrane + + * trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmds_arg.cc, + trunk/xmds-devel/source/xmds_arg_element.cc, + trunk/xmds-devel/source/xmds_argv.cc, + trunk/xmds-devel/source/xmds_breakpoint.cc, + trunk/xmds-devel/source/xmds_element.cc, + trunk/xmds-devel/source/xmds_field.cc, + trunk/xmds-devel/source/xmds_filter.cc, + trunk/xmds-devel/source/xmds_globals.cc, + trunk/xmds-devel/source/xmds_integrate.cc, + trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ark45ex.cc, + trunk/xmds-devel/source/xmds_integrate_ark45ip.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.cc, + trunk/xmds-devel/source/xmds_integrate_ark89ex.cc, + trunk/xmds-devel/source/xmds_integrate_ark89ip.cc, + trunk/xmds-devel/source/xmds_integrate_ex.cc, + trunk/xmds-devel/source/xmds_integrate_ip.cc, + trunk/xmds-devel/source/xmds_integrate_rk4.cc, + trunk/xmds-devel/source/xmds_integrate_rk4ex.cc, + trunk/xmds-devel/source/xmds_integrate_rk4ip.cc, + trunk/xmds-devel/source/xmds_integrate_rk9.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ex.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ip.cc, + trunk/xmds-devel/source/xmds_integrate_si.cc, + trunk/xmds-devel/source/xmds_integrate_siex.cc, + trunk/xmds-devel/source/xmds_integrate_siip.cc, + trunk/xmds-devel/source/xmds_moment_group.cc, + trunk/xmds-devel/source/xmds_output.cc, + trunk/xmds-devel/source/xmds_segment.cc, + trunk/xmds-devel/source/xmds_sequence.cc, + trunk/xmds-devel/source/xmds_simulation.cc, + trunk/xmds-devel/source/xmds_utils.cc, + trunk/xmds-devel/source/xmds_vector.cc, + trunk/xmds-devel/source/xmds_vector_element.cc, + trunk/xmds-devel/source/xsil2graphics.cc, + trunk/xmds-devel/source/xsil_field.cc: Now using xmds_common.h in + .cc source files. + +2007-08-14 13:56 paultcochrane + + * trunk/xmds-devel/source/Makefile.am: I should have added + xmds_common.h in the last commit. Duh. + +2007-08-14 13:54 paultcochrane + + * trunk/xmds-devel/source/Makefile.am: Removing xmds_classes.h from + dependencies list. + +2007-08-14 13:53 paultcochrane + + * trunk/xmds-devel/source/xmds_common.h: Getting the order of the + headers correct. + +2007-08-14 13:41 paultcochrane + + * trunk/xmds-devel/source/dom3.h, + trunk/xmds-devel/source/getopt_xmds.h, + trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/kissdom.h, + trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmds_arg.cc, + trunk/xmds-devel/source/xmds_arg.h, + trunk/xmds-devel/source/xmds_arg_element.cc, + trunk/xmds-devel/source/xmds_arg_element.h, + trunk/xmds-devel/source/xmds_argv.cc, + trunk/xmds-devel/source/xmds_argv.h, + trunk/xmds-devel/source/xmds_breakpoint.cc, + trunk/xmds-devel/source/xmds_breakpoint.h, + trunk/xmds-devel/source/xmds_common.h, + trunk/xmds-devel/source/xmds_complex.h, + trunk/xmds-devel/source/xmds_element.cc, + trunk/xmds-devel/source/xmds_element.h, + trunk/xmds-devel/source/xmds_field.cc, + trunk/xmds-devel/source/xmds_field.h, + trunk/xmds-devel/source/xmds_filter.cc, + trunk/xmds-devel/source/xmds_filter.h, + trunk/xmds-devel/source/xmds_globals.cc, + trunk/xmds-devel/source/xmds_globals.h, + trunk/xmds-devel/source/xmds_integrate.cc, + trunk/xmds-devel/source/xmds_integrate.h, + trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ark45.h, + trunk/xmds-devel/source/xmds_integrate_ark45ex.cc, + trunk/xmds-devel/source/xmds_integrate_ark45ex.h, + trunk/xmds-devel/source/xmds_integrate_ark45ip.cc, + trunk/xmds-devel/source/xmds_integrate_ark45ip.h, + trunk/xmds-devel/source/xmds_integrate_ark89.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.h, + trunk/xmds-devel/source/xmds_integrate_ark89ex.cc, + trunk/xmds-devel/source/xmds_integrate_ark89ex.h, + trunk/xmds-devel/source/xmds_integrate_ark89ip.cc, + trunk/xmds-devel/source/xmds_integrate_ark89ip.h, + trunk/xmds-devel/source/xmds_integrate_ex.cc, + trunk/xmds-devel/source/xmds_integrate_ex.h, + trunk/xmds-devel/source/xmds_integrate_ip.cc, + trunk/xmds-devel/source/xmds_integrate_ip.h, + trunk/xmds-devel/source/xmds_integrate_rk4.cc, + trunk/xmds-devel/source/xmds_integrate_rk4.h, + trunk/xmds-devel/source/xmds_integrate_rk4ex.cc, + trunk/xmds-devel/source/xmds_integrate_rk4ex.h, + trunk/xmds-devel/source/xmds_integrate_rk4ip.cc, + trunk/xmds-devel/source/xmds_integrate_rk4ip.h, + trunk/xmds-devel/source/xmds_integrate_rk9.cc, + trunk/xmds-devel/source/xmds_integrate_rk9.h, + trunk/xmds-devel/source/xmds_integrate_rk9ex.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ex.h, + trunk/xmds-devel/source/xmds_integrate_rk9ip.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ip.h, + trunk/xmds-devel/source/xmds_integrate_si.cc, + trunk/xmds-devel/source/xmds_integrate_si.h, + trunk/xmds-devel/source/xmds_integrate_siex.cc, + trunk/xmds-devel/source/xmds_integrate_siex.h, + trunk/xmds-devel/source/xmds_integrate_siip.cc, + trunk/xmds-devel/source/xmds_integrate_siip.h, + trunk/xmds-devel/source/xmds_moment_group.cc, + trunk/xmds-devel/source/xmds_moment_group.h, + trunk/xmds-devel/source/xmds_output.cc, + trunk/xmds-devel/source/xmds_output.h, + trunk/xmds-devel/source/xmds_segment.cc, + trunk/xmds-devel/source/xmds_segment.h, + trunk/xmds-devel/source/xmds_sequence.cc, + trunk/xmds-devel/source/xmds_sequence.h, + trunk/xmds-devel/source/xmds_simulation.cc, + trunk/xmds-devel/source/xmds_simulation.h, + trunk/xmds-devel/source/xmds_utils.cc, + trunk/xmds-devel/source/xmds_utils.h, + trunk/xmds-devel/source/xmds_vector.cc, + trunk/xmds-devel/source/xmds_vector.h, + trunk/xmds-devel/source/xmds_vector_element.cc, + trunk/xmds-devel/source/xmds_vector_element.h, + trunk/xmds-devel/source/xml_basics.cc, + trunk/xmds-devel/source/xml_basics.h, + trunk/xmds-devel/source/xml_parser.cc, + trunk/xmds-devel/source/xml_parser.h, + trunk/xmds-devel/source/xsil2graphics.cc, + trunk/xmds-devel/source/xsil_field.cc, + trunk/xmds-devel/source/xsil_field.h: Set the svn:keywords + property on all .cc and .h files. + +2007-08-14 13:38 paultcochrane + + * trunk/xmds-devel/source/xmds_common.h: Should have written + xml_basics.h. duh. + +2007-08-14 13:35 paultcochrane + + * trunk/xmds-devel/source/xmds_common.h: Added a file to wrap the + common headers used in (almost) all xmds source + files. I know this seems to do the same job as what + xmds_classes.h did, + however the name is an important functional change, and we've + managed to + remove the overall dependence on (which wasn't used) and + on + which is only used in certain places. + +2007-08-14 12:24 paultcochrane + + * trunk/xmds-devel/source/xmds_classes.h: We no longer need + xmds_classes.h. Deleting... + +2007-08-14 12:13 paultcochrane + + * trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmds_classes.h: main.cc no longer + requires xmds_classes.h + +2007-08-14 12:12 paultcochrane + + * trunk/xmds-devel/source/xmds_classes.h: xmds_utils.h no longer + necessary in xmds_classes.h + +2007-08-14 12:11 paultcochrane + + * trunk/xmds-devel/source/xmds_classes.h: xmds_element.h no longer + necessary in xmds_classes.h + +2007-08-14 12:10 paultcochrane + + * trunk/xmds-devel/source/xmds_classes.h: xmds_globals.h no longer + necessary in xmds_classes.h + +2007-08-14 12:10 paultcochrane + + * trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_field.cc: xmds_field.h no longer + necessary in xmds_classes.h + +2007-08-14 12:09 paultcochrane + + * trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_vector.cc: xmds_vector.h no longer + necessary in xmds_classes.h + +2007-08-14 12:08 paultcochrane + + * trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_field.cc, + trunk/xmds-devel/source/xmds_vector_element.cc: + xmds_vector_element.h no longer necessary in xmds_classes.h + +2007-08-14 12:07 paultcochrane + + * trunk/xmds-devel/source/xmds_argv.cc, + trunk/xmds-devel/source/xmds_classes.h: xmds_argv.h no longer + necessary in xmds_classes.h + +2007-08-14 12:06 paultcochrane + + * trunk/xmds-devel/source/xmds_classes.h: xmds_arg.h no longer + necessary in xmds_classes.h + +2007-08-14 12:05 paultcochrane + + * trunk/xmds-devel/source/xmds_arg_element.cc, + trunk/xmds-devel/source/xmds_argv.cc, + trunk/xmds-devel/source/xmds_classes.h: xmds_arg_element.h no + longer necessary in xmds_classes.h + +2007-08-14 12:03 paultcochrane + + * trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_moment_group.cc: xmds_moment_group.h + no longer necessary in xmds_classes.h + +2007-08-14 12:02 paultcochrane + + * trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_output.cc: xmds_output.h no longer + necessary in xmds_classes.h + +2007-08-14 11:54 paultcochrane + + * trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_segment.cc: xmds_segment.h no longer + needed in xmds_classes.h + +2007-08-14 11:53 paultcochrane + + * trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_filter.cc: xmds_filters.h wasn't + needed in xmds_classes.h + +2007-08-14 11:51 paultcochrane + + * trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmds_arg_element.cc, + trunk/xmds-devel/source/xmds_argv.cc, + trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_field.cc, + trunk/xmds-devel/source/xmds_filter.cc, + trunk/xmds-devel/source/xmds_moment_group.cc, + trunk/xmds-devel/source/xmds_output.cc, + trunk/xmds-devel/source/xmds_segment.cc, + trunk/xmds-devel/source/xmds_simulation.cc, + trunk/xmds-devel/source/xmds_vector.cc, + trunk/xmds-devel/source/xmds_vector_element.cc: Disentangled + xmds_simulation.h from xmds_classes.h + +2007-08-14 10:32 paultcochrane + + * trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_sequence.cc: Removed xmds_sequence.h + from xmds_classes.h + +2007-08-14 10:25 paultcochrane + + * trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_integrate.cc: xmds_integrate.h + removed from xmds_classes.h + +2007-08-14 10:23 paultcochrane + + * trunk/xmds-devel/source/xmds_breakpoint.cc, + trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_sequence.cc: Disentangled + xmds_breakpoint.h from xmds_classes.h + +2007-08-14 10:14 paultcochrane + + * trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.cc, + trunk/xmds-devel/source/xmds_integrate_ex.cc, + trunk/xmds-devel/source/xmds_integrate_ip.cc, + trunk/xmds-devel/source/xmds_integrate_rk4.cc, + trunk/xmds-devel/source/xmds_integrate_si.cc, + trunk/xmds-devel/source/xmds_integrate_siex.cc, + trunk/xmds-devel/source/xmds_integrate_siip.cc, + trunk/xmds-devel/source/xmds_sequence.cc: Removed the remaining + xmds_classes.h dependenices from the + algorithm-related class files. + +2007-08-14 05:16 grahamdennis + + * trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.cc: Finally, the bug + I wanted to fix... Due to the way errors were calculated for + adaptive algorithms, in really bad situations (where the field + becomes infinite due to overly large step sizes), small errors + would be reported instead of really large errors. This is + particularly noticeable for situations with density-dependent + loss. This caused the rest of the simulation to fail. + +2007-08-14 04:42 grahamdennis + + * trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/xmds_filter.cc, + trunk/xmds-devel/source/xmds_integrate.cc, + trunk/xmds-devel/source/xmds_integrate_siip.cc, + trunk/xmds-devel/source/xmds_sequence.cc: Fixing warnings due to + size_t's being passed to printf where the format specifier %i was + used instead of %zi. + +2007-08-14 04:32 grahamdennis + + * trunk/xmds-devel/configure.in, + trunk/xmds-devel/source/xmds_simulation.cc: Reverting changes in + r1379 and 1453 (making it possible to build xmds without FFTW2) + because it broke the ability to build xmds with FFTW2 and FFTW3. + +2007-08-14 04:16 grahamdennis + + * trunk/xmds-devel/Makefile.am: Fixing broken Makefile.am + +2007-08-13 15:52 paultcochrane + + * trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_integrate_rk4ex.cc, + trunk/xmds-devel/source/xmds_integrate_rk4ip.cc, + trunk/xmds-devel/source/xmds_sequence.cc: RK4 subclasses now no + longer depend upon xmds_classes.h + +2007-08-13 10:35 paultcochrane + + * trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_integrate_rk9.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ex.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ip.cc, + trunk/xmds-devel/source/xmds_sequence.cc: RK9 headers + disentangled from xmds_classes.h + +2007-08-13 10:29 paultcochrane + + * trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_integrate_ark45ex.cc, + trunk/xmds-devel/source/xmds_integrate_ark45ip.cc, + trunk/xmds-devel/source/xmds_sequence.cc: Removed ark45 header + dependencies from xmds_classes.h + +2007-08-13 08:28 paultcochrane + + * trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_integrate_ark89ip.cc, + trunk/xmds-devel/source/xmds_sequence.cc: xmds_classes.h no + longer depends upon xmds_integrate_ark89ip.h + +2007-08-13 08:24 paultcochrane + + * trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_integrate_ark89ex.cc, + trunk/xmds-devel/source/xmds_sequence.cc: xmds_classes.h now no + longer depends upon xmds_integrate_ark89ex.h + +2007-08-13 08:12 paultcochrane + + * trunk/xmds-devel/source/xmds_arg_element.cc, + trunk/xmds-devel/source/xmds_argv.cc, + trunk/xmds-devel/source/xmds_breakpoint.cc, + trunk/xmds-devel/source/xmds_field.cc, + trunk/xmds-devel/source/xmds_filter.cc, + trunk/xmds-devel/source/xmds_filter.h, + trunk/xmds-devel/source/xmds_integrate.cc, + trunk/xmds-devel/source/xmds_integrate.h, + trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ark45ex.cc, + trunk/xmds-devel/source/xmds_integrate_ark45ip.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.cc, + trunk/xmds-devel/source/xmds_integrate_ark89ex.cc, + trunk/xmds-devel/source/xmds_integrate_ark89ip.cc, + trunk/xmds-devel/source/xmds_integrate_ex.cc, + trunk/xmds-devel/source/xmds_integrate_ip.cc, + trunk/xmds-devel/source/xmds_integrate_rk4.cc, + trunk/xmds-devel/source/xmds_integrate_rk4ex.cc, + trunk/xmds-devel/source/xmds_integrate_rk4ip.cc, + trunk/xmds-devel/source/xmds_integrate_rk9.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ex.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ip.cc, + trunk/xmds-devel/source/xmds_integrate_si.cc, + trunk/xmds-devel/source/xmds_integrate_siex.cc, + trunk/xmds-devel/source/xmds_integrate_siip.cc, + trunk/xmds-devel/source/xmds_moment_group.cc, + trunk/xmds-devel/source/xmds_output.cc, + trunk/xmds-devel/source/xmds_output.h, + trunk/xmds-devel/source/xmds_segment.cc, + trunk/xmds-devel/source/xmds_sequence.cc, + trunk/xmds-devel/source/xmds_simulation.cc, + trunk/xmds-devel/source/xmds_simulation.h, + trunk/xmds-devel/source/xmds_vector.cc, + trunk/xmds-devel/source/xmds_vector.h, + trunk/xmds-devel/source/xmds_vector_element.cc, + trunk/xmds-devel/source/xmds_vector_element.h: Each .cc file now + includes its own header. Also needed to add some explicit + header dependencies to various sub headers to get things to + compile again. + +2007-08-13 07:46 paultcochrane + + * trunk/xmds-devel/source/xmds_arg_element.h, + trunk/xmds-devel/source/xmds_breakpoint.h, + trunk/xmds-devel/source/xmds_filter.h, + trunk/xmds-devel/source/xmds_integrate.h, + trunk/xmds-devel/source/xmds_integrate_ark45.h, + trunk/xmds-devel/source/xmds_integrate_ark45ex.h, + trunk/xmds-devel/source/xmds_integrate_ark45ip.h, + trunk/xmds-devel/source/xmds_integrate_ark89.h, + trunk/xmds-devel/source/xmds_integrate_ark89ex.h, + trunk/xmds-devel/source/xmds_integrate_ark89ip.h, + trunk/xmds-devel/source/xmds_integrate_ex.h, + trunk/xmds-devel/source/xmds_integrate_ip.h, + trunk/xmds-devel/source/xmds_integrate_rk4.h, + trunk/xmds-devel/source/xmds_integrate_rk4ex.h, + trunk/xmds-devel/source/xmds_integrate_rk4ip.h, + trunk/xmds-devel/source/xmds_integrate_rk9.h, + trunk/xmds-devel/source/xmds_integrate_rk9ex.h, + trunk/xmds-devel/source/xmds_integrate_rk9ip.h, + trunk/xmds-devel/source/xmds_integrate_si.h, + trunk/xmds-devel/source/xmds_integrate_siex.h, + trunk/xmds-devel/source/xmds_integrate_siip.h, + trunk/xmds-devel/source/xmds_moment_group.h, + trunk/xmds-devel/source/xmds_output.h, + trunk/xmds-devel/source/xmds_segment.h, + trunk/xmds-devel/source/xmds_sequence.h, + trunk/xmds-devel/source/xmds_simulation.h, + trunk/xmds-devel/source/xmds_vector_element.h: Added header + dependencies for objects inheriting directly from other + objects. + +2007-08-13 07:07 paultcochrane + + * trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_integrate_ark45ex.h, + trunk/xmds-devel/source/xmds_integrate_ark45ip.h, + trunk/xmds-devel/source/xmds_integrate_ark89ex.h, + trunk/xmds-devel/source/xmds_integrate_ark89ip.h, + trunk/xmds-devel/source/xmds_integrate_rk4ex.h, + trunk/xmds-devel/source/xmds_integrate_rk4ip.h, + trunk/xmds-devel/source/xmds_integrate_rk9ex.h, + trunk/xmds-devel/source/xmds_integrate_rk9ip.h, + trunk/xmds-devel/source/xmds_simulation.h: Moved the remaining + class declarations out of xmds_classes.h into their own + header files. Now to try and unravel the header dependencies so + that if + something changes in a header, absolutely everything needs to get + rebuilt... + +2007-08-11 15:50 paultcochrane + + * ., trunk/xmds-devel/test/generated_code/Makefile, + trunk/xmds-devel/test/generated_code/reference_fftw2, + trunk/xmds-devel/test/generated_code/reference_fftw2/atomlaser.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/branch.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/brusselator.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/catcycle.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/chain.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/chemkin.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/diffusion.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/diffusion2.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/duffing.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/fibre.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/fisher_reaction_diffusion.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/fullpos3D.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/groundstate.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/hires.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/krebs.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/kubo.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/lane_emden.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/lorenz.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/lotka_volterra.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/ndparamp.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/nlse.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/oregonator.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/paraxial_wave.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/pendulum.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/ring_modulator.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/sech_soliton.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/sech_soliton_tdepk.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/sine.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/soliton.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/thermkin.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/tla.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/van_der_pol.cc, + trunk/xmds-devel/test/generated_code/reference_fftw2/vibstring.cc: + FFTW2 and FFTW3 generated output is different, so we need + different + references depending upon which version xmds is built with. Here + is a quick + hack of the test Makefile to handle this, and the appropriate + reference + files. + +2007-08-10 18:41 paultcochrane + + * ., trunk/xmds-devel/configure.in: I'd failed to properly + initialise USING_FFTW3. This has been fixed. + +2007-08-10 18:41 paultcochrane + + * ., trunk/xmds-devel/admin/cvs2cl.pl: We're using svn now, so + don't need the script anymore. + +2007-08-10 15:34 paultcochrane + + * trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_integrate_ark89.h, + trunk/xmds-devel/source/xmds_integrate_rk4.h, + trunk/xmds-devel/source/xmds_integrate_rk9.h, + trunk/xmds-devel/source/xmds_integrate_siex.h, + trunk/xmds-devel/source/xmds_integrate_siip.h: I know I should do + these as individual commits as then one has more + fine-grained control over when things have broken if at all. + However, it + can't hurt to separate some of the xmdsIntegrate* declarations in + one go, + can it? ;-) + +2007-08-10 15:02 paultcochrane + + * trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_integrate_ark45.h: Moved + xmdsIntegrateARK45 declarations into xmds_integrate_ark45.h + +2007-08-10 14:59 paultcochrane + + * trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_integrate_si.h: Moved + xmdsIntegrateSI declarations into xmds_integrate_si.h + +2007-08-10 14:55 paultcochrane + + * trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_integrate_ex.h: Moved + xmdsIntegrateEX declarations into xmds_integrate_ex.h + +2007-08-10 14:45 paultcochrane + + * trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_integrate_ip.h: Moved + xmdsIntegrateIP stuff into xmds_integrate_ip.h + +2007-08-10 14:33 paultcochrane + + * trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/xmds_breakpoint.h, + trunk/xmds-devel/source/xmds_classes.h: Moved xmdsBreakpoint + declarations into xmds_breakpoint.h + +2007-08-10 14:30 paultcochrane + + * trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_filter.h: Moved xmdsFilter + declarations into xmds_filter.h + +2007-08-10 14:27 paultcochrane + + * trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_integrate.h: Moved xmdsIntegrate + declarations into xmds_integrate.h + +2007-08-10 14:24 paultcochrane + + * trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_sequence.h: Moved xmdsSequence + declarations into xmds_sequence.h + +2007-08-10 14:20 paultcochrane + + * trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_segment.h: Moved xmdsSegment + declarations into xmds_segment.h + +2007-08-10 14:20 paultcochrane + + * trunk/xmds-devel/source/xmds_arg.cc, + trunk/xmds-devel/source/xmds_arg.h, + trunk/xmds-devel/source/xmds_argv.cc: Trying to improve header + dependencies further. Not getting far though... + +2007-08-10 13:58 paultcochrane + + * trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_output.h: Moved xmdsOutput + declarations into xmds_output.h + +2007-08-10 13:43 paultcochrane + + * trunk/xmds-devel/source/xmds_element.cc, + trunk/xmds-devel/source/xmds_globals.cc: Starting to remove + dependencies upon xmds_classes.h + +2007-08-10 13:30 paultcochrane + + * trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/xmds_arg_element.h, + trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_moment_group.h: Moved xmdsArgElement + and xmdsMomentGroup declarations into their own + headers. + +2007-08-10 13:20 paultcochrane + + * trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/xmds_arg.h, + trunk/xmds-devel/source/xmds_classes.h: Moved xmdsArg + declarations into xmds_arg.h + +2007-08-10 13:11 paultcochrane + + * trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/xmds_argv.cc, + trunk/xmds-devel/source/xmds_argv.h, + trunk/xmds-devel/source/xmds_classes.h: Moved declarations of + xmdsArgv into xmds_argv.h + +2007-08-10 13:10 paultcochrane + + * trunk/xmds-devel/source/xmds_element.h: We should have been + #including xmds_utils.h here... Oops. Fixed that. + +2007-08-10 13:02 paultcochrane + + * trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_vector_element.h: Moved + xmdsVectorElement declarations into xmds_vector_element.h + +2007-08-10 12:58 paultcochrane + + * trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_vector.h: Moved xmdsVector + declarations into xmds_vector.h + +2007-08-10 08:25 paultcochrane + + * trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_field.h: Moved xmdsField + declarations int xmds_field.h + +2007-08-10 08:12 paultcochrane + + * trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_globals.cc, + trunk/xmds-devel/source/xmds_globals.h: Moved xmdsGloabls + declarations into xmds_globals.h + +2007-08-10 08:12 paultcochrane + + * trunk/xmds-devel/source/xmds_utils.cc, + trunk/xmds-devel/source/xml_basics.cc: Removed old commented-out + code. + +2007-08-10 07:44 paultcochrane + + * trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_element.h: Moved xmdsElement + delcarations from xmds_classes.h into its own header. + Added the relevant references to the Makefile and to + xmds_classes.h so that + the other classes can find everything properly. + +2007-08-10 07:42 paultcochrane + + * trunk/xmds-devel/source/xmds_utils.h: Put header guards in + xmds_utils.h + +2007-08-10 07:22 paultcochrane + + * trunk/xmds-devel/source/xmds_classes.h: Added a guard for the + header, this is to protect against multiple calls of + the header once I've broken up the header a bit (I'm going to try + to + modularise the code a bit more). + +2007-08-09 16:39 paultcochrane + + * trunk/xmds-devel/source/xmds_field.cc: Trying to get the code to + look ok within 80 chars. + +2007-08-09 16:20 paultcochrane + + * trunk/xmds-devel/source/xmds_field.cc: Added spaces, braces and + other minor cleanups + +2007-08-09 15:50 paultcochrane + + * trunk/xmds-devel/source/xmds_integrate.cc, + trunk/xmds-devel/source/xmds_utils.cc: Cleaning up after myself + (just removing trailing whitespace) + +2007-08-09 15:46 paultcochrane + + * trunk/xmds-devel/source/xmds_integrate.cc: Trying even harder to + get things within 80 chars, or at least make things + a bit easier to work out what's going on. + +2007-08-09 15:42 paultcochrane + + * trunk/xmds-devel/source/xmds_integrate.cc, + trunk/xmds-devel/source/xmds_utils.cc: More line-length + shortening... + +2007-08-09 15:33 paultcochrane + + * trunk/xmds-devel/source/xmds_integrate.cc: Some bitwise ANDs + should have been boolean ANDs + +2007-08-09 12:43 paultcochrane + + * trunk/xmds-devel/source/xmds_integrate.cc: Split long lines + across multiple lines; again, trying to improve the + readability of the code. + +2007-08-09 12:39 paultcochrane + + * trunk/xmds-devel/test/generated_code/Makefile, + trunk/xmds-devel/test/generated_code/reference/atomlaser.cc, + trunk/xmds-devel/test/generated_code/reference/branch.cc, + trunk/xmds-devel/test/generated_code/reference/brusselator.cc, + trunk/xmds-devel/test/generated_code/reference/catcycle.cc, + trunk/xmds-devel/test/generated_code/reference/chain.cc, + trunk/xmds-devel/test/generated_code/reference/chemkin.cc, + trunk/xmds-devel/test/generated_code/reference/diffusion.cc, + trunk/xmds-devel/test/generated_code/reference/diffusion2.cc, + trunk/xmds-devel/test/generated_code/reference/duffing.cc, + trunk/xmds-devel/test/generated_code/reference/fibre.cc, + trunk/xmds-devel/test/generated_code/reference/fisher_reaction_diffusion.cc, + trunk/xmds-devel/test/generated_code/reference/fullpos3D.cc, + trunk/xmds-devel/test/generated_code/reference/groundstate.cc, + trunk/xmds-devel/test/generated_code/reference/hires.cc, + trunk/xmds-devel/test/generated_code/reference/krebs.cc, + trunk/xmds-devel/test/generated_code/reference/kubo.cc, + trunk/xmds-devel/test/generated_code/reference/lane_emden.cc, + trunk/xmds-devel/test/generated_code/reference/lorenz.cc, + trunk/xmds-devel/test/generated_code/reference/lotka_volterra.cc, + trunk/xmds-devel/test/generated_code/reference/ndparamp.cc, + trunk/xmds-devel/test/generated_code/reference/nlse.cc, + trunk/xmds-devel/test/generated_code/reference/oregonator.cc, + trunk/xmds-devel/test/generated_code/reference/paraxial_wave.cc, + trunk/xmds-devel/test/generated_code/reference/pendulum.cc, + trunk/xmds-devel/test/generated_code/reference/ring_modulator.cc, + trunk/xmds-devel/test/generated_code/reference/sech_soliton.cc, + trunk/xmds-devel/test/generated_code/reference/sech_soliton_tdepk.cc, + trunk/xmds-devel/test/generated_code/reference/sine.cc, + trunk/xmds-devel/test/generated_code/reference/soliton.cc, + trunk/xmds-devel/test/generated_code/reference/thermkin.cc, + trunk/xmds-devel/test/generated_code/reference/tla.cc, + trunk/xmds-devel/test/generated_code/reference/van_der_pol.cc, + trunk/xmds-devel/test/generated_code/reference/vibstring.cc: The + generated output changes as soon as the version information + changes. + Now grepping out this dynamic output, and have removed the + relevant lines + from the references. + +2007-08-09 12:06 paultcochrane + + * trunk/xmds-devel/source: Updated svn:ignore property to ignore + files generated by gcov + +2007-08-09 12:00 paultcochrane + + * trunk/xmds-devel/source/xmds_integrate.cc: Continuing with code + tidying. Extra spaces, more brackets in places etc. + etc. + +2007-08-09 09:56 paultcochrane + + * trunk/xmds-devel/source/xmds_utils.cc: Whitespace *within* code, + however, is a good thing. It makes code easier to + read. Hence I've just added some... + +2007-08-09 09:11 paultcochrane + + * trunk/xmds-devel/configure.in: Removed extra gcc-specific + warnings options (I only wanted to use them for + testing purposes, sorry for the extra commit) + +2007-08-09 09:00 paultcochrane + + * trunk/xmds-devel/configure.in, + trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/xmds_arg.cc, + trunk/xmds-devel/source/xmds_arg_element.cc, + trunk/xmds-devel/source/xmds_argv.cc, + trunk/xmds-devel/source/xmds_breakpoint.cc, + trunk/xmds-devel/source/xmds_element.cc, + trunk/xmds-devel/source/xmds_field.cc, + trunk/xmds-devel/source/xmds_filter.cc, + trunk/xmds-devel/source/xmds_globals.cc, + trunk/xmds-devel/source/xmds_integrate.cc, + trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ark45ex.cc, + trunk/xmds-devel/source/xmds_integrate_ark45ip.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.cc, + trunk/xmds-devel/source/xmds_integrate_ark89ex.cc, + trunk/xmds-devel/source/xmds_integrate_ark89ip.cc, + trunk/xmds-devel/source/xmds_integrate_ex.cc, + trunk/xmds-devel/source/xmds_integrate_ip.cc, + trunk/xmds-devel/source/xmds_integrate_rk4.cc, + trunk/xmds-devel/source/xmds_integrate_rk4ex.cc, + trunk/xmds-devel/source/xmds_integrate_rk4ip.cc, + trunk/xmds-devel/source/xmds_integrate_rk9.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ex.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ip.cc, + trunk/xmds-devel/source/xmds_integrate_si.cc, + trunk/xmds-devel/source/xmds_integrate_siex.cc, + trunk/xmds-devel/source/xmds_integrate_siip.cc, + trunk/xmds-devel/source/xmds_moment_group.cc, + trunk/xmds-devel/source/xmds_output.cc, + trunk/xmds-devel/source/xmds_segment.cc, + trunk/xmds-devel/source/xmds_sequence.cc, + trunk/xmds-devel/source/xmds_simulation.cc, + trunk/xmds-devel/source/xmds_utils.cc, + trunk/xmds-devel/source/xmds_vector.cc, + trunk/xmds-devel/source/xmds_vector_element.cc, + trunk/xmds-devel/source/xml_basics.cc, + trunk/xmds-devel/source/xml_basics.h, + trunk/xmds-devel/source/xml_parser.cc, + trunk/xmds-devel/source/xsil_field.cc: There shouldn't be + semicolons at the end of class/function etc. definitions. + Hence removed them. + +2007-08-09 07:30 paultcochrane + + * trunk/xmds-devel/source/dom3.h, + trunk/xmds-devel/source/getopt_xmds.h, + trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/kissdom.h, + trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmds_arg.cc, + trunk/xmds-devel/source/xmds_arg_element.cc, + trunk/xmds-devel/source/xmds_argv.cc, + trunk/xmds-devel/source/xmds_breakpoint.cc, + trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_complex.h, + trunk/xmds-devel/source/xmds_element.cc, + trunk/xmds-devel/source/xmds_field.cc, + trunk/xmds-devel/source/xmds_filter.cc, + trunk/xmds-devel/source/xmds_globals.cc, + trunk/xmds-devel/source/xmds_integrate.cc, + trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ark45ex.cc, + trunk/xmds-devel/source/xmds_integrate_ark45ip.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.cc, + trunk/xmds-devel/source/xmds_integrate_ark89ex.cc, + trunk/xmds-devel/source/xmds_integrate_ark89ip.cc, + trunk/xmds-devel/source/xmds_integrate_ex.cc, + trunk/xmds-devel/source/xmds_integrate_ip.cc, + trunk/xmds-devel/source/xmds_integrate_rk4.cc, + trunk/xmds-devel/source/xmds_integrate_rk4ex.cc, + trunk/xmds-devel/source/xmds_integrate_rk4ip.cc, + trunk/xmds-devel/source/xmds_integrate_rk9.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ex.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ip.cc, + trunk/xmds-devel/source/xmds_integrate_si.cc, + trunk/xmds-devel/source/xmds_integrate_siex.cc, + trunk/xmds-devel/source/xmds_integrate_siip.cc, + trunk/xmds-devel/source/xmds_moment_group.cc, + trunk/xmds-devel/source/xmds_output.cc, + trunk/xmds-devel/source/xmds_segment.cc, + trunk/xmds-devel/source/xmds_sequence.cc, + trunk/xmds-devel/source/xmds_simulation.cc, + trunk/xmds-devel/source/xmds_utils.cc, + trunk/xmds-devel/source/xmds_utils.h, + trunk/xmds-devel/source/xmds_vector.cc, + trunk/xmds-devel/source/xmds_vector_element.cc, + trunk/xmds-devel/source/xml_basics.cc, + trunk/xmds-devel/source/xml_basics.h, + trunk/xmds-devel/source/xml_parser.cc, + trunk/xmds-devel/source/xml_parser.h, + trunk/xmds-devel/source/xsil2graphics.cc, + trunk/xmds-devel/source/xsil_field.cc, + trunk/xmds-devel/source/xsil_field.h: Purged the source of + trailing whitespace + +2007-08-08 16:25 paultcochrane + + * trunk/xmds-devel/test/coding_stds/trailing_space.t: This adds a + test for trailing spaces in source code. This is fairly aesthetic + but trailing spaces *are* yuckky. + +2007-08-08 16:21 paultcochrane + + * trunk/xmds-devel/source/kissdom.h, + trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_complex.h, + trunk/xmds-devel/source/xmds_filter.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.cc, + trunk/xmds-devel/source/xmds_integrate_rk4.cc, + trunk/xmds-devel/source/xmds_sequence.cc, + trunk/xmds-devel/source/xmds_simulation.cc, + trunk/xmds-devel/source/xmds_utils.h, + trunk/xmds-devel/source/xmds_vector.cc, + trunk/xmds-devel/source/xml_basics.h, + trunk/xmds-devel/source/xml_parser.h, + trunk/xmds-devel/source/xsil_field.h: Banishing hard tabs from + the source. + +2007-08-08 16:20 paultcochrane + + * trunk/xmds-devel/test/generated_code/reference/fibre.cc: Removing + hard tabs from the sources altered the fibre.cc reference. This + commit updates the reference. + +2007-08-08 16:08 paultcochrane + + * trunk/xmds-devel/test/coding_stds/tabs.t: Added a coding + standards test to test for hard tabs (hard tabs aren't + portable across editors, however spaces are). I.e. this will help + ensure + that the source looks the same wherever you are, and what you use + to view it. + +2007-08-08 15:57 paultcochrane + + * trunk/xmds-devel/source/xmds_breakpoint.cc, + trunk/xmds-devel/source/xmds_field.cc, + trunk/xmds-devel/source/xmds_integrate.cc, + trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ark45ip.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.cc, + trunk/xmds-devel/source/xmds_integrate_ark89ip.cc, + trunk/xmds-devel/source/xmds_integrate_ip.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ip.cc, + trunk/xmds-devel/source/xmds_sequence.cc, + trunk/xmds-devel/source/xmds_simulation.cc, + trunk/xmds-devel/source/xmds_vector.cc, + trunk/xmds-devel/source/xmds_vector_element.cc, + trunk/xmds-devel/source/xsil_field.cc: Banishing cuddled else's + from the source (they make if/else statments harder + to read). + +2007-08-08 15:40 paultcochrane + + * trunk/xmds-devel/test/coding_stds, + trunk/xmds-devel/test/coding_stds/cuddled_else.t: Added the first + of a set of coding standards tests which will help clean up + the xmds source. These tests are borrowed from the Parrot project + (http://www.parrotcode.org) and are licensed in a way which plays + with the gpl + +2007-08-08 15:03 paultcochrane + + * trunk/xmds-devel/configure.in: Beginning to add warning flags to + gcc when building xmds to help pick up + common errors. + +2007-08-08 14:46 paultcochrane + + * trunk/xmds-devel/source/xmds_vector_element.cc: Removed + superfluous argument from dollar-sign POSIX extended fprintf() + statement. + +2007-08-08 14:45 paultcochrane + + * trunk/xmds-devel/test/generated_code/Makefile: No longer + compiling the test examples before comparing them with the + examples. + This saves a *lot* of time when running the tests often. The xmds + output is + compared to a reference C output anyway... + +2007-08-08 14:41 paultcochrane + + * trunk/xmds-devel/source/xmds_vector_element.cc: Dollar signs were + missing within POSIX extended fprintf() statement + +2007-08-08 14:34 paultcochrane + + * trunk/xmds-devel/source/xmds_integrate.cc: Corrected a leftover + comparison between signed and unsigned + +2007-08-08 14:33 paultcochrane + + * trunk/xmds-devel/Makefile.am: Made the test suite dependent upon + xmds being built first. + +2007-08-08 13:18 paultcochrane + + * trunk/xmds-devel/source/xmds_integrate_ark89.cc: Corrected + potential bug whereby an argument was missing to an fprintf() + statement. + +2007-08-08 13:09 paultcochrane + + * trunk/xmds-devel/source/xmds_breakpoint.cc, + trunk/xmds-devel/source/xmds_vector_element.cc: Corrected more + integer length issues in fprintf() statements. + +2007-08-08 12:23 paultcochrane + + * trunk/xmds-devel/source/xmds_breakpoint.cc, + trunk/xmds-devel/source/xmds_integrate_ark45ex.cc, + trunk/xmds-devel/source/xmds_integrate_ark45ip.cc, + trunk/xmds-devel/source/xmds_integrate_ark89ex.cc, + trunk/xmds-devel/source/xmds_integrate_ark89ip.cc, + trunk/xmds-devel/source/xmds_integrate_rk9.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ex.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ip.cc, + trunk/xmds-devel/source/xmds_vector.cc, + trunk/xmds-devel/source/xmds_vector_element.cc: Removed remaining + superfluous fprintf() arguments. + +2007-08-08 12:06 paultcochrane + + * trunk/xmds-devel/source/xmds_integrate_ark89.cc: Removing excess + arguments to fprintf() functions. + +2007-08-08 10:31 paultcochrane + + * trunk/xmds-devel/source/xmds_integrate_ark45.cc: Removed extra + (and therefore unused) arguments to fprintf() statements. + +2007-08-08 10:22 paultcochrane + + * trunk/xmds-devel/source/dom3.h: Giving a destructor to those + objects lacking one. + +2007-08-08 10:14 paultcochrane + + * trunk/xmds-devel/source/xmds_breakpoint.cc, + trunk/xmds-devel/source/xmds_vector_element.cc: Removed unused + variables + +2007-08-08 10:14 paultcochrane + + * trunk/xmds-devel/test/generated_code: Corrected svn:ignore + property + +2007-08-08 09:57 paultcochrane + + * trunk/xmds-devel/test/generated_code: Updated svn:ignore property + +2007-08-08 09:55 paultcochrane + + * trunk/xmds-devel/Makefile.am, trunk/xmds-devel/test/Makefile, + trunk/xmds-devel/test/generated_code/Makefile: First rough cut at + getting the generated code test suite to do something + meaningful + +2007-08-08 09:13 paultcochrane + + * trunk/xmds-devel/test/generated_code, + trunk/xmds-devel/test/generated_code/atomlaser.xmds, + trunk/xmds-devel/test/generated_code/branch.xmds, + trunk/xmds-devel/test/generated_code/brusselator.xmds, + trunk/xmds-devel/test/generated_code/catcycle.xmds, + trunk/xmds-devel/test/generated_code/chain.xmds, + trunk/xmds-devel/test/generated_code/chemkin.xmds, + trunk/xmds-devel/test/generated_code/diffusion.xmds, + trunk/xmds-devel/test/generated_code/diffusion2.xmds, + trunk/xmds-devel/test/generated_code/duffing.xmds, + trunk/xmds-devel/test/generated_code/fibre.xmds, + trunk/xmds-devel/test/generated_code/fisher_reaction_diffusion.xmds, + trunk/xmds-devel/test/generated_code/fullpos3D.xmds, + trunk/xmds-devel/test/generated_code/groundstate.xmds, + trunk/xmds-devel/test/generated_code/hires.xmds, + trunk/xmds-devel/test/generated_code/krebs.xmds, + trunk/xmds-devel/test/generated_code/kubo.xmds, + trunk/xmds-devel/test/generated_code/lane_emden.xmds, + trunk/xmds-devel/test/generated_code/lorenz.xmds, + trunk/xmds-devel/test/generated_code/lotka_volterra.xmds, + trunk/xmds-devel/test/generated_code/ndparamp.xmds, + trunk/xmds-devel/test/generated_code/nlse.xmds, + trunk/xmds-devel/test/generated_code/oregonator.xmds, + trunk/xmds-devel/test/generated_code/paraxial_wave.xmds, + trunk/xmds-devel/test/generated_code/pendulum.xmds, + trunk/xmds-devel/test/generated_code/reference, + trunk/xmds-devel/test/generated_code/reference/atomlaser.cc, + trunk/xmds-devel/test/generated_code/reference/branch.cc, + trunk/xmds-devel/test/generated_code/reference/brusselator.cc, + trunk/xmds-devel/test/generated_code/reference/catcycle.cc, + trunk/xmds-devel/test/generated_code/reference/chain.cc, + trunk/xmds-devel/test/generated_code/reference/chemkin.cc, + trunk/xmds-devel/test/generated_code/reference/diffusion.cc, + trunk/xmds-devel/test/generated_code/reference/diffusion2.cc, + trunk/xmds-devel/test/generated_code/reference/duffing.cc, + trunk/xmds-devel/test/generated_code/reference/fibre.cc, + trunk/xmds-devel/test/generated_code/reference/fisher_reaction_diffusion.cc, + trunk/xmds-devel/test/generated_code/reference/fullpos3D.cc, + trunk/xmds-devel/test/generated_code/reference/groundstate.cc, + trunk/xmds-devel/test/generated_code/reference/hires.cc, + trunk/xmds-devel/test/generated_code/reference/krebs.cc, + trunk/xmds-devel/test/generated_code/reference/kubo.cc, + trunk/xmds-devel/test/generated_code/reference/lane_emden.cc, + trunk/xmds-devel/test/generated_code/reference/lorenz.cc, + trunk/xmds-devel/test/generated_code/reference/lotka_volterra.cc, + trunk/xmds-devel/test/generated_code/reference/ndparamp.cc, + trunk/xmds-devel/test/generated_code/reference/nlse.cc, + trunk/xmds-devel/test/generated_code/reference/oregonator.cc, + trunk/xmds-devel/test/generated_code/reference/paraxial_wave.cc, + trunk/xmds-devel/test/generated_code/reference/pendulum.cc, + trunk/xmds-devel/test/generated_code/reference/ring_modulator.cc, + trunk/xmds-devel/test/generated_code/reference/sech_soliton.cc, + trunk/xmds-devel/test/generated_code/reference/sech_soliton_tdepk.cc, + trunk/xmds-devel/test/generated_code/reference/sine.cc, + trunk/xmds-devel/test/generated_code/reference/soliton.cc, + trunk/xmds-devel/test/generated_code/reference/thermkin.cc, + trunk/xmds-devel/test/generated_code/reference/tla.cc, + trunk/xmds-devel/test/generated_code/reference/van_der_pol.cc, + trunk/xmds-devel/test/generated_code/reference/vibstring.cc, + trunk/xmds-devel/test/generated_code/ring_modulator.xmds, + trunk/xmds-devel/test/generated_code/sech_soliton.xmds, + trunk/xmds-devel/test/generated_code/sech_soliton_tdepk.xmds, + trunk/xmds-devel/test/generated_code/sine.xmds, + trunk/xmds-devel/test/generated_code/soliton.xmds, + trunk/xmds-devel/test/generated_code/thermkin.xmds, + trunk/xmds-devel/test/generated_code/tla.xmds, + trunk/xmds-devel/test/generated_code/van_der_pol.xmds, + trunk/xmds-devel/test/generated_code/vibstring.xmds: Added a + directory to test the generated C code of xmds. This includes + most of + the current example xmds files, and a directory of the current C + output + from an xmds run using fftw3. + +2007-08-08 08:58 paultcochrane + + * trunk/xmds-devel/test: Added a test directory (as a base for a + more extended test suite) + +2007-08-08 08:48 paultcochrane + + * trunk/xmds-devel/source/xmds_breakpoint.cc, + trunk/xmds-devel/source/xmds_vector_element.cc, + trunk/xmds-devel/source/xsil_field.cc: Correcting comparisons + between signed and unsigned integers + +2007-08-08 08:22 paultcochrane + + * trunk/xmds-devel/source/xmds_breakpoint.cc, + trunk/xmds-devel/source/xmds_field.cc, + trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.cc, + trunk/xmds-devel/source/xmds_sequence.cc, + trunk/xmds-devel/source/xmds_simulation.cc, + trunk/xmds-devel/source/xmds_vector.cc: Correcting format strings + in fprintf() statements to use the appropriate long + and in some cases short) format. + +2007-08-07 14:09 paultcochrane + + * trunk/xmds-devel/source/main.cc: Minor code reformatting. + +2007-08-07 13:54 paultcochrane + + * trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/kissdom.h, + trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmds_arg.cc, + trunk/xmds-devel/source/xmds_arg_element.cc, + trunk/xmds-devel/source/xmds_argv.cc, + trunk/xmds-devel/source/xmds_breakpoint.cc, + trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmds_complex.h, + trunk/xmds-devel/source/xmds_element.cc, + trunk/xmds-devel/source/xmds_field.cc, + trunk/xmds-devel/source/xmds_filter.cc, + trunk/xmds-devel/source/xmds_globals.cc, + trunk/xmds-devel/source/xmds_integrate.cc, + trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ark45ex.cc, + trunk/xmds-devel/source/xmds_integrate_ark45ip.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.cc, + trunk/xmds-devel/source/xmds_integrate_ark89ex.cc, + trunk/xmds-devel/source/xmds_integrate_ark89ip.cc, + trunk/xmds-devel/source/xmds_integrate_ex.cc, + trunk/xmds-devel/source/xmds_integrate_ip.cc, + trunk/xmds-devel/source/xmds_integrate_rk4.cc, + trunk/xmds-devel/source/xmds_integrate_rk4ex.cc, + trunk/xmds-devel/source/xmds_integrate_rk4ip.cc, + trunk/xmds-devel/source/xmds_integrate_rk9.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ex.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ip.cc, + trunk/xmds-devel/source/xmds_integrate_si.cc, + trunk/xmds-devel/source/xmds_integrate_siex.cc, + trunk/xmds-devel/source/xmds_integrate_siip.cc, + trunk/xmds-devel/source/xmds_moment_group.cc, + trunk/xmds-devel/source/xmds_output.cc, + trunk/xmds-devel/source/xmds_segment.cc, + trunk/xmds-devel/source/xmds_sequence.cc, + trunk/xmds-devel/source/xmds_simulation.cc, + trunk/xmds-devel/source/xmds_utils.cc, + trunk/xmds-devel/source/xmds_utils.h, + trunk/xmds-devel/source/xmds_vector.cc, + trunk/xmds-devel/source/xmds_vector_element.cc, + trunk/xmds-devel/source/xml_basics.cc, + trunk/xmds-devel/source/xml_basics.h, + trunk/xmds-devel/source/xml_parser.cc, + trunk/xmds-devel/source/xml_parser.h, + trunk/xmds-devel/source/xsil2graphics.cc, + trunk/xmds-devel/source/xsil_field.cc, + trunk/xmds-devel/source/xsil_field.h: Indented the code using + emacs' built in formatting engine. + +2007-08-07 13:06 paultcochrane + + * trunk/xmds-devel/Makefile.am, trunk/xmds-devel/configure.in, + trunk/xmds-devel/source, trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmds_arg.cc, + trunk/xmds-devel/source/xmds_arg_element.cc, + trunk/xmds-devel/source/xmds_argv.cc, + trunk/xmds-devel/source/xmds_breakpoint.cc, + trunk/xmds-devel/source/xmds_complex.h, + trunk/xmds-devel/source/xmds_element.cc, + trunk/xmds-devel/source/xmds_field.cc, + trunk/xmds-devel/source/xmds_filter.cc, + trunk/xmds-devel/source/xmds_globals.cc, + trunk/xmds-devel/source/xmds_integrate.cc, + trunk/xmds-devel/source/xmds_integrate_ark45.cc, + trunk/xmds-devel/source/xmds_integrate_ark45ex.cc, + trunk/xmds-devel/source/xmds_integrate_ark45ip.cc, + trunk/xmds-devel/source/xmds_integrate_ark89.cc, + trunk/xmds-devel/source/xmds_integrate_ark89ex.cc, + trunk/xmds-devel/source/xmds_integrate_ark89ip.cc, + trunk/xmds-devel/source/xmds_integrate_ex.cc, + trunk/xmds-devel/source/xmds_integrate_ip.cc, + trunk/xmds-devel/source/xmds_integrate_rk4.cc, + trunk/xmds-devel/source/xmds_integrate_rk4ex.cc, + trunk/xmds-devel/source/xmds_integrate_rk4ip.cc, + trunk/xmds-devel/source/xmds_integrate_rk9.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ex.cc, + trunk/xmds-devel/source/xmds_integrate_rk9ip.cc, + trunk/xmds-devel/source/xmds_integrate_si.cc, + trunk/xmds-devel/source/xmds_integrate_siex.cc, + trunk/xmds-devel/source/xmds_integrate_siip.cc, + trunk/xmds-devel/source/xmds_moment_group.cc, + trunk/xmds-devel/source/xmds_output.cc, + trunk/xmds-devel/source/xmds_segment.cc, + trunk/xmds-devel/source/xmds_sequence.cc, + trunk/xmds-devel/source/xmds_simulation.cc, + trunk/xmds-devel/source/xmds_utils.cc, + trunk/xmds-devel/source/xmds_utils.h, + trunk/xmds-devel/source/xmds_vector.cc, + trunk/xmds-devel/source/xmds_vector_element.cc, + trunk/xmds-devel/source/xmdscomplex.h, + trunk/xmds-devel/source/xmdselement.cc, + trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsglobals.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateark45.cc, + trunk/xmds-devel/source/xmdsintegrateark45ex.cc, + trunk/xmds-devel/source/xmdsintegrateark45ip.cc, + trunk/xmds-devel/source/xmdsintegrateark89.cc, + trunk/xmds-devel/source/xmdsintegrateark89ex.cc, + trunk/xmds-devel/source/xmdsintegrateark89ip.cc, + trunk/xmds-devel/source/xmdsintegrateex.cc, + trunk/xmds-devel/source/xmdsintegrateip.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegraterk4ex.cc, + trunk/xmds-devel/source/xmdsintegraterk4ip.cc, + trunk/xmds-devel/source/xmdsintegraterk9.cc, + trunk/xmds-devel/source/xmdsintegraterk9ex.cc, + trunk/xmds-devel/source/xmdsintegraterk9ip.cc, + trunk/xmds-devel/source/xmdsintegratesi.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdsoutput.cc, + trunk/xmds-devel/source/xmdssegment.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc, + trunk/xmds-devel/source/xmdsutils.cc, + trunk/xmds-devel/source/xmdsutils.h, + trunk/xmds-devel/source/xmdsvector.cc, + trunk/xmds-devel/source/xmdsvectorelement.cc, + trunk/xmds-devel/source/xml_basics.cc, + trunk/xmds-devel/source/xml_basics.h, + trunk/xmds-devel/source/xml_parser.cc, + trunk/xmds-devel/source/xml_parser.h, + trunk/xmds-devel/source/xmlbasics.cc, + trunk/xmds-devel/source/xmlbasics.h, + trunk/xmds-devel/source/xmlparser.cc, + trunk/xmds-devel/source/xmlparser.h, + trunk/xmds-devel/source/xsil2graphics.cc, + trunk/xmds-devel/source/xsil_field.cc, + trunk/xmds-devel/source/xsil_field.h, + trunk/xmds-devel/source/xsilfield.cc, + trunk/xmds-devel/source/xsilfield.h: Added underscores to + remaining filenames for increased readability + +2007-08-07 12:27 paultcochrane + + * trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmds_arg.cc, + trunk/xmds-devel/source/xmds_arg_element.cc, + trunk/xmds-devel/source/xmds_argv.cc, + trunk/xmds-devel/source/xmds_breakpoint.cc, + trunk/xmds-devel/source/xmds_classes.h, + trunk/xmds-devel/source/xmdsbreakpoint.cc, + trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdselement.cc, + trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsglobals.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateark45.cc, + trunk/xmds-devel/source/xmdsintegrateark45ex.cc, + trunk/xmds-devel/source/xmdsintegrateark45ip.cc, + trunk/xmds-devel/source/xmdsintegrateark89.cc, + trunk/xmds-devel/source/xmdsintegrateark89ex.cc, + trunk/xmds-devel/source/xmdsintegrateark89ip.cc, + trunk/xmds-devel/source/xmdsintegrateex.cc, + trunk/xmds-devel/source/xmdsintegrateip.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegraterk4ex.cc, + trunk/xmds-devel/source/xmdsintegraterk4ip.cc, + trunk/xmds-devel/source/xmdsintegraterk9.cc, + trunk/xmds-devel/source/xmdsintegraterk9ex.cc, + trunk/xmds-devel/source/xmdsintegraterk9ip.cc, + trunk/xmds-devel/source/xmdsintegratesi.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdsoutput.cc, + trunk/xmds-devel/source/xmdssegment.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc, + trunk/xmds-devel/source/xmdsvector.cc, + trunk/xmds-devel/source/xmdsvectorelement.cc: Added underscores + to filenames for better readability + +2007-08-07 12:15 paultcochrane + + * trunk/xmds-devel/examples/atomlaser.xmds, + trunk/xmds-devel/examples/branch.xmds, + trunk/xmds-devel/examples/brusselator.xmds, + trunk/xmds-devel/examples/catcycle.xmds, + trunk/xmds-devel/examples/chain.xmds, + trunk/xmds-devel/examples/chemkin.xmds, + trunk/xmds-devel/examples/diffusion.xmds, + trunk/xmds-devel/examples/diffusion2.xmds, + trunk/xmds-devel/examples/duffing.xmds, + trunk/xmds-devel/examples/fibre.xmds, + trunk/xmds-devel/examples/fisher_reaction_diffusion.xmds, + trunk/xmds-devel/examples/fullpos3D.xmds, + trunk/xmds-devel/examples/gaugeatomlaser.xmds, + trunk/xmds-devel/examples/highdim.xmds, + trunk/xmds-devel/examples/hires.xmds, + trunk/xmds-devel/examples/krebs.xmds, + trunk/xmds-devel/examples/kubo.xmds, + trunk/xmds-devel/examples/lane_emden.xmds, + trunk/xmds-devel/examples/lorenz.xmds, + trunk/xmds-devel/examples/lotka_volterra.xmds, + trunk/xmds-devel/examples/ndparamp.xmds, + trunk/xmds-devel/examples/nlse.xmds, + trunk/xmds-devel/examples/oregonator.xmds, + trunk/xmds-devel/examples/paraxial_wave.xmds, + trunk/xmds-devel/examples/pendulum.xmds, + trunk/xmds-devel/examples/ring_modulator.xmds, + trunk/xmds-devel/examples/sech_soliton.xmds, + trunk/xmds-devel/examples/sech_soliton_tdepk.xmds, + trunk/xmds-devel/examples/sine.xmds, + trunk/xmds-devel/examples/soliton.xmds, + trunk/xmds-devel/examples/thermkin.xmds, + trunk/xmds-devel/examples/tla.xmds, + trunk/xmds-devel/examples/van_der_pol.xmds, + trunk/xmds-devel/examples/vibstring.xmds: Updated more copyright + dates + +2007-08-07 12:11 paultcochrane + + * trunk/xmds-devel/source/dom3.h, + trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/kissdom.h, + trunk/xmds-devel/source/loadxsil.m, + trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmds_arg.cc, + trunk/xmds-devel/source/xmds_arg_element.cc, + trunk/xmds-devel/source/xmds_argv.cc, + trunk/xmds-devel/source/xmdsbreakpoint.cc, + trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdscomplex.h, + trunk/xmds-devel/source/xmdselement.cc, + trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsglobals.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateark45.cc, + trunk/xmds-devel/source/xmdsintegrateark45ex.cc, + trunk/xmds-devel/source/xmdsintegrateark45ip.cc, + trunk/xmds-devel/source/xmdsintegrateark89.cc, + trunk/xmds-devel/source/xmdsintegrateark89ex.cc, + trunk/xmds-devel/source/xmdsintegrateark89ip.cc, + trunk/xmds-devel/source/xmdsintegrateex.cc, + trunk/xmds-devel/source/xmdsintegrateip.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegraterk4ex.cc, + trunk/xmds-devel/source/xmdsintegraterk4ip.cc, + trunk/xmds-devel/source/xmdsintegraterk9.cc, + trunk/xmds-devel/source/xmdsintegraterk9ex.cc, + trunk/xmds-devel/source/xmdsintegraterk9ip.cc, + trunk/xmds-devel/source/xmdsintegratesi.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdsoutput.cc, + trunk/xmds-devel/source/xmdssegment.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc, + trunk/xmds-devel/source/xmdsutils.cc, + trunk/xmds-devel/source/xmdsutils.h, + trunk/xmds-devel/source/xmdsvector.cc, + trunk/xmds-devel/source/xmdsvectorelement.cc, + trunk/xmds-devel/source/xmlbasics.cc, + trunk/xmds-devel/source/xmlbasics.h, + trunk/xmds-devel/source/xmlparser.cc, + trunk/xmds-devel/source/xmlparser.h, + trunk/xmds-devel/source/xsil2graphics.cc, + trunk/xmds-devel/source/xsilfield.cc, + trunk/xmds-devel/source/xsilfield.h: Updated copyright date + +2007-08-07 11:44 paultcochrane + + * trunk/xmds-devel/source: Now ignoring the version.h file and + vim-generated .swp files + +2007-08-07 11:42 paultcochrane + + * trunk/xmds-devel/configure.in, + trunk/xmds-devel/source/xmdssimulation.cc: Some first steps at + getting xmds to configure and work properly on systems + which only have fftw3 installed. + +2007-08-03 07:12 joehope + + * trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsintegrateark45.cc, + trunk/xmds-devel/source/xmdsintegrateark89.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegraterk9.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdssimulation.cc, + trunk/xmds-devel/source/xmdsvectorelement.cc: Making Poissonian + noise sources work. + + dpsi_dt = n_1 + + for a poissonian noise now works like + + dpsi = dn + + Not implemented for adaptive algorithms, but there's an + exception. + +2007-07-30 05:52 grahamdennis + + * trunk/xmds-devel/source/xmdsmomentgroup.cc: Fix for bug + introduced in r1350 where it was possible to cause an integer + overflow when writing moment groups. This only affected + stochastic simulations or simulations with error checking, and + then only those moment groups that had a very large number of + time samples. + +2007-07-13 02:31 grahamdennis + + * trunk/xmds-devel/source/xmdsintegrateark45.cc, + trunk/xmds-devel/source/xmdsintegrateark89.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc: There was a bug in the + adaptive timestep algorithms for deterministic MPI simulations + caused when the number of points in the first dimension isn't + divisible by the number of CPUs. The problem was that it was + assumed that on each rank, total_local_size was the size of the + grid on that node, and this is not necessarily the case, as it is + just the maximum of the grid size on the node (as the swapped and + unswapped cases can use different amounts of memory). + This mistake is fairly widespread but mostly it isn't a problem, + it's just a small wastage of CPU cycles (when the first dimension + isn't divisible by the number of CPUs), however the adaptive + timestep algorithms need to calculate the maximum of the vectors + on the grid and this is where it does cause a problem. + +2007-07-11 06:22 grahamdennis + + * trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdssequence.cc: Significantly reduce + memory consumption caused by output moment groups for + deterministic MPI simulations. (Memory consumption is only + reduced for ranks other than 0). + +2007-07-09 04:20 grahamdennis + + * trunk/xmds-devel/source/xmds_argv.cc, + trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdsglobals.cc: Allow elements to + work when you don't have a element. + +2007-07-03 07:25 grahamdennis + + * trunk/xmds-devel/source/xmdssimulation.cc: Fixed bug with the + runtime limit for deterministic simulations using MPI where it + was possible for some nodes to decide they were running overtime, + but others could think otherwise. + Prevented the runtime limit code being used for stochastic + simulations until I work out how to do that properly. + +2007-07-02 05:15 grahamdennis + + * trunk/xmds-devel/source/xmdssequence.cc: Fix for another bug + introduced in r1368. + +2007-06-28 08:51 grahamdennis + + * trunk/xmds-devel/source/xmdsintegrateark89.cc: Fix for a serious + bug in ARK89 (when using MPI on more than one CPU) where ranks + other than 0 would sample at any time greater (potentially much + greater) than the sample time, but not at the sample time. Rank 0 + was unaffected. For strongly convergent paths, this could lead to + the path far overshooting the entire time-range of the + simulation. + +2007-06-28 05:17 grahamdennis + + * trunk/xmds-devel/source/xmdssequence.cc: Ooops. I made a mistake + in my last commit. + +2007-06-28 02:01 grahamdennis + + * trunk/xmds-devel/TODO, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc: Fix for an issue when + using MPI to distribute a stochastic simulation that only has 1 + path when using the Uniform MPI_Method on more than one CPU. + +2007-06-27 06:55 joehope + + * trunk/xmds-devel/ChangeLog: Bump for bugfix release. + +2007-06-27 06:32 joehope + + * trunk/xmds-devel/admin/xmdsReleaseProcedure.pod: Added notes for + the website updates. + +2007-06-27 03:24 joehope + + * trunk/xmds-devel/TODO, trunk/xmds-devel/configure.in, + trunk/xmds-devel/source/xmdsvector.cc: Fixed a very rarely + occurring bug when sampling in mixed Fourier and normal space on + uneven grids. + + Turns out FFTW didn't work exactly as I expected, but all is + well, now. + +2007-06-26 02:40 grahamdennis + + * trunk/xmds-devel/source/loadxsil.m: When I made loadxsil.m deal + with missing moment groups (produced by simulations that have hit + a run-time limit) it didn't work for when the last moment group + was missing. Fixed. + +2007-06-23 13:29 joehope + + * trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdsvector.cc: Minor fixes while hunting + for the mixed space bug. + +2007-06-21 01:31 joehope + + * trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmds_arg_element.cc, + trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateark45.cc, + trunk/xmds-devel/source/xmdsintegrateark89.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdssimulation.cc, + trunk/xmds-devel/source/xmdsutils.cc, + trunk/xmds-devel/source/xmlparser.cc, + trunk/xmds-devel/source/xsil2graphics.cc, + trunk/xmds-devel/source/xsilfield.cc: Extra includes to allow + compilation with g++ 4.3 + Submitted by Rafael Laboissiere, rafael@debian.org + +2007-06-20 06:03 grahamdennis + + * trunk/xmds-devel/source/xmdsintegrateark89.cc: Bug fixes for + ARK89. + There was a bug in ARK89 where infrequently it would not sample + exactly at the correct sample times, but earlier (usually only + slightly earlier), and these incorrect sample times would not be + the same for all paths. + There was a second 'bug' due to the finite precision of doubles + that infrequently led to smaller-than-necessary timesteps being + calculated. This bug did not affect simulation results, it only + slightly increased the time taken for simulations. + +2007-06-15 01:45 joehope + + * trunk/xmds-devel/MANIFEST, + trunk/xmds-devel/admin/xmdsReleaseProcedure.pod, + trunk/xmds-devel/configure.in: Trivial updates for the xmds-1.6-2 + bugfix release. + +2007-06-14 04:56 joehope + + * trunk/xmds-devel/ChangeLog, trunk/xmds-devel/README, + trunk/xmds-devel/configure.in: Version bumps for bugfix release. + +2007-06-12 03:34 grahamdennis + + * trunk/xmds-devel/source/xmdsbreakpoint.cc: Breakpoints for + vectors of type double would be written incorrectly (the same + data would be written multiple times) if MPI was used for + deterministic simulations. This is a regression since r1179 + (2006-12-14). + +2007-06-08 07:33 grahamdennis + + * trunk/xmds-devel/source/xmdssequence.cc: Rest of Scheduling fix. + +2007-06-08 07:14 joehope + + * trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc: Partial fix for the + Scheduler bug. Has to be finished for Scheduling+Error checking. + Fix for argv fix. + Fix for IntelMKL case. + +2007-06-08 01:31 grahamdennis + + * trunk/xmds-devel/source/xmdssimulation.cc: Make XMDS not crash + when there isn't an ARGV element. + +2007-06-07 05:51 grahamdennis + + * trunk/xmds-devel/TODO, trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc: Add (optional) for + using the Intel MKL for generating random numbers. For Gaussian + numbers, Intel MKL is ~5x faster than + our current implementation of "gaussFast" (when generating 1000 + numbers). + Note that MKL is a vector library, and so will not necessarily be + faster than the current implementation for single-dimensional + problems. + In terms of real-world performance, this sped up the kubo + oscillator by 2.5x (when using a transverse dimension for paths). + The tag to enable Intel MKL is , and it defaults + to 'no'. + +2007-06-06 06:50 andyferris + + * trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc: * Allowed command-line + arguments to be used as the random seed. + This might be useful when analysing trajectory data using a + batch script rather than XMDS's internal sampling. + + * This pretty much mitigates my desire for XMDS to dump all its + trajectory data as the same thing can be done with a batch + script and without hacking the output .cc code (as I was + previously forced to do). + + * XMDS checks whether the seed element contains positive integers + or strings matching one of the names. I have now made + the first element to be processed to accommodate this + search. + + * In future, we might want to consider allowing many of the tags + to + be replaced by a command-line arg. Unfortunately, most numbers + are #define'd rather than initialised, making things difficult to + generalise... + +2007-06-05 01:19 grahamdennis + + * trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateark45.cc, + trunk/xmds-devel/source/xmdsintegrateark89.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegraterk9.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc: Fix for compiler + warning caused by the runtime limit code when there is no runtime + limit. + +2007-06-03 05:10 grahamdennis + + * trunk/xmds-devel/examples/diffusion.xmds, + trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/loadxsil.m, + trunk/xmds-devel/source/xmdsbreakpoint.cc, + trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateark45.cc, + trunk/xmds-devel/source/xmdsintegrateark89.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegraterk9.cc, + trunk/xmds-devel/source/xmdsintegratesi.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdssegment.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc, + trunk/xmds-devel/source/xsil2graphics.cc, + trunk/xmds-devel/source/xsilfield.cc, + trunk/xmds-devel/testsuite/test_xmds.pl: Runtime-limiting + support. + Add the tag to the simulation to specify an + *advisory* maximum running time. + The format for this string is HH:MM, HH:MM:SS or SSSS. Note that + HH can be greater than 24. + Once each timestep, the simulation will determine if it is + running overtime. If it is, then + any pending samples *for that integrate element* will be sampled, + and all remaining integrate + and filter elements will be skipped. The only elements that will + execute after the runtime limit + has been hit are breakpoint elements. Note that if a moment group + is never sampled, then it won't + get written to the XSIL file, and a .dat file will not be created + (for binary output). + + This patch adds support for XSIL files with 'missing' moment + groups and fixes a bug in loadxsil when + loading breakpoints from an XMDS script that uses ASCII output. + +2007-06-01 05:57 joehope + + * trunk/xmds-devel/TODO: Results of the Brainstorm. This will be + handy later too. Andy and Grahama are great. + +2007-05-22 04:14 grahamdennis + + * trunk/xmds-devel/source/main.cc: Forgot a space... oops. + +2007-05-22 01:45 grahamdennis + + * trunk/xmds-devel/source/main.cc: Make sure that the revision is + printed when xmds processes scripts (I didn't notice this when + adding the revision information. + +2007-05-21 05:16 grahamdennis + + * trunk/xmds-devel/source/xmdsintegrateark45.cc, + trunk/xmds-devel/source/xmdsintegrateark89.cc: Prevented the ARK + algorithms from printing large amounts of information when there + is more than one path, as otherwise this information will swamp + everything else. + +2007-05-10 06:51 joehope + + * trunk/xmds-devel/admin/xmdsReleaseProcedure.pod: Whoops, and + again. + +2007-05-10 06:50 joehope + + * trunk/xmds-devel/admin/xmdsReleaseProcedure.pod: More admin notes + moved to svn + +2007-05-09 07:16 joehope + + * trunk/xmds-devel/configure.in: Seeding the version script so it + works on a clean install. It would be better to run version.sh at + the top of every make, if we knew how to force that through + autoconf. + +2007-05-09 05:24 joehope + + * trunk/xmds-devel/MANIFEST: Near release adjustment. + +2007-05-09 05:18 joehope + + * trunk/xmds-devel/ChangeLog, trunk/xmds-devel/README, + trunk/xmds-devel/README.Windows, + trunk/xmds-devel/admin/xmdsReleaseProcedure.pod, + trunk/xmds-devel/configure.in, + trunk/xmds-devel/examples/fibre.xmds, + trunk/xmds-devel/examples/sech_soliton_tdepk.xmds: Misc changes + before release. + +2007-05-08 06:52 grahamdennis + + * trunk/xmds-devel/source/Makefile.am: Moving the version.h make + target to the top of the automake file so that maybe make will be + able to find it... + +2007-05-07 10:51 grahamdennis + + * trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/version.sh: I forgot that the version.h + file wouldn't get updated once it existed. So I've made version.h + depend on all of the other xmds sources in the automake file. + There's probably a cleaner way, but I can't think of one. + +2007-05-07 10:31 grahamdennis + + * trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/version.sh, + trunk/xmds-devel/source/xmdsbreakpoint.cc, + trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdsoutput.cc, + trunk/xmds-devel/source/xmdssimulation.cc: Add the subversion + revision number to the end of the version number reported by the + application, and saved to XSIL files. This makes it easier for + those of us living on the bleeding edge to track down exactly + which revision number was used to create a script (for example, + for tracking performance regressions). + +2007-05-05 09:10 grahamdennis + + * trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateex.cc, + trunk/xmds-devel/source/xmdsintegrateip.cc, + trunk/xmds-devel/source/xmdssegment.cc, + trunk/xmds-devel/source/xmdssequence.cc: Move allocation of + k_operator_field's to one place in both the xmds source, and the + source generated from scripts. This makes it easier to control + when the fields are allocated, so that they are allocated only + while they are needed, and are free'd after the segment they + belong to has completed. Previously, the k_operator_field's were + leaked. + +2007-05-03 08:08 grahamdennis + + * trunk/xmds-devel/source/xmdsvectorelement.cc: For large data + files, the size of each component could be larger than can fit + into a long, so an off_t should be used. + +2007-05-03 02:14 joehope + + * trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateark45.cc, + trunk/xmds-devel/source/xmdsintegrateark89.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegraterk9.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc: Multiple bugfixes. + SIEX is now restored in the post FFTW 3 age. + Cross-propagation now works with stochastic equations. + +2007-05-03 00:59 joehope + + * trunk/xmds-devel/admin/xmdsReleaseProcedure.pod: Quick update to + the release procedures. + +2007-05-03 00:58 joehope + + * trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc: Start of another + bugfix. + +2007-05-02 10:22 joehope + + * trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdssequence.cc: Force initialisation of + moment group data if post-propagation is performed. + Most importantly, this initialises the Fourier space tag. + Strictly speaking, + the rest of the initialisation is unnecessary unless at least one + transverse + dimension is integrated, or the system is stochastic with + multiple paths, + but it is always safe to do, and should have approximately zero + impact on speed. + +2007-05-02 07:18 joehope + + * trunk/xmds-devel/source/xsilfield.cc: Suppress unnecessary output + when loading data into Mathematica. + +2007-04-26 07:46 grahamdennis + + * trunk/xmds-devel/source/xmdsvectorelement.cc: When I added the + noises to the XSIL loading code, I forgot to make sure they were + deleted at the end. + +2007-04-24 05:45 grahamdennis + + * trunk/xmds-devel/source/xmdssimulation.cc: Just because there's a + use_openmp tag, and use_mpi is true doesn't mean that someone + actually wants to use both OpenMP and MPI... + +2007-04-23 03:33 grahamdennis + + * trunk/xmds-devel/source/xmdsvectorelement.cc: It wasn't possible + to use noises in the CDATA section when initialising a vector + from an XSIL file. + +2007-04-05 13:17 paultcochrane + + * trunk/xmds-devel/examples/groundstate.xmds: Added + groundstate.xmds back in. + +2007-04-05 13:17 paultcochrane + + * trunk/xmds-devel/examples/groundstate.xmds: Temporarily deleting + groundstate.xmds to see if can remove the executable + bit from the file as it stands in the repository. + +2007-04-05 12:58 paultcochrane + + * ., trunk/xmds-devel/examples/groundstate.xmds: Changed the + copyright info in an attempt to change the executable mode on + the file (causes problems when building the Debian package). Can + only see + if this will work... + +2007-04-02 00:28 grahamdennis + + * trunk/xmds-devel/source/loadxsil.m: loadxsil couldn't load + 4-dimensional (or higher) arrays (correctly). xsil2graphics + generated correct code, just loadxsil didn't. + +2007-03-28 07:17 grahamdennis + + * trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsmomentgroup.cc: Increase precision of + field limits so that when changing the size of fields which don't + have nice round sizes we don't confuse the XSIL loading code + which expects the grids to line up almost exactly. + +2007-03-22 03:43 joehope + + * trunk/xmds-devel/examples/nlse.xmds: Give an example with the + adaptive 9(8) RK algorithm. + +2007-03-22 03:41 joehope + + * trunk/xmds-devel/MANIFEST, trunk/xmds-devel/admin/svn2cl.xsl: + Still updating for 1.6 release. + +2007-03-22 03:34 joehope + + * trunk/xmds-devel/ChangeLog, trunk/xmds-devel/README, + trunk/xmds-devel/admin/xmdsReleaseProcedure.pod, + trunk/xmds-devel/configure.in: Preparing for release of version + 1.6. + +2007-03-20 01:26 michaelhush + + * trunk/xmds-devel/source/xmdsintegrateark89.cc, + trunk/xmds-devel/source/xmdssimulation.cc: Fixed memory leak in + ARK89EX and ARK89IP methods for stochastic problem + +2007-03-12 00:58 joehope + + * trunk/xmds-devel/source/xmdssequence.cc: Fixed a bug where the + scheduler didn't handle lack of error checking properly. + +2007-02-23 05:55 michaelhush + + * trunk/xmds-devel/source/xmdsintegrateark89.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc: Fixed bug triggered + when multiple segements were created using the ARK89 methods + +2007-02-14 13:59 paultcochrane + + * ., trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/xmds_arg.cc, + trunk/xmds-devel/source/xmds_arg_element.cc, + trunk/xmds-devel/source/xmds_argv.cc, + trunk/xmds-devel/source/xmdsarg.cc, + trunk/xmds-devel/source/xmdsargelement.cc, + trunk/xmds-devel/source/xmdsargv.cc: Moved argument parsing + sources to filenames with names a bit easier to read. + +2007-02-14 13:58 paultcochrane + + * ., trunk/xmds-devel/source/Makefile.am: Swapped the names of two + source files to group the names better + +2007-02-14 13:58 paultcochrane + + * ., trunk/xmds-devel/source/Makefile.am: Moved XML parsing sources + and argument parsing sources into their own + variable. + +2007-02-14 13:58 paultcochrane + + * ., trunk/xmds-devel/source/Makefile.am: Separated the sources + specific to algorithm processing into its own + variable. + +2007-02-14 13:58 paultcochrane + + * ., trunk/xmds-devel/source/Makefile.am: Expanded source listing + so makes it easier to add files as needed + +2007-02-12 03:40 grahamdennis + + * trunk/xmds-devel/source/main.cc: Adding -openmp to compile + options when compiling a threaded OpenMP simulation + +2007-02-12 03:20 grahamdennis + + * trunk/xmds-devel/source/xmdsbreakpoint.cc: Breakpoints would be + written incorrectly when writing more than one field when one of + the fields was of type complex. Oops. + +2007-02-12 03:02 grahamdennis + + * trunk/xmds-devel/source/loadxsil.m: Enable loadxsil.m to work + with XSIL files produced from breakpoints. + +2007-02-11 03:43 andyferris + + * trunk/xmds-devel/configure.in: Reverted my change to the + configure script. The previous problem was misdiagnosed. Note + that the libraries are tested by configure using the "cc" + command, and thus uses the CC=... option. However, these + libraries are only ever linked to programs compiled by the + XMDS_CC=... In this case my fftw3_threads library was + incompatible with gcc on my computer, when I set XMDS_CC=icc. + +2007-02-08 06:35 andyferris + + * trunk/xmds-devel/configure.in: Changed configure.in to use the + fftw library path when searching for or using the fftw3_threads + library. + +2007-02-08 03:18 grahamdennis + + * trunk/xmds-devel/source/xmdsvector.cc: Unbreak moment groups for + MPI (broken yesterday when fixing buffer overflow bug). + +2007-02-07 03:58 grahamdennis + + * trunk/xmds-devel/source/xmdsvector.cc: There was a bug in + xmdsVector initialisation (not xmdsVectorElement initialisation) + that caused a buffer overflow. I think this only affected MPI + simulations that used explicit picture integration algorithms + (e.g. RK4EX). It certainly only affected MPI simulations. + +2007-02-05 06:46 grahamdennis + + * trunk/xmds-devel/source/xmdsfield.cc: Make deterministic + simulations that use MPI but not fourier transforms work. + +2007-02-05 05:08 grahamdennis + + * trunk/xmds-devel/source/loadxsil.m: Make loadxsil work for + zero-dimensional variables stored in XSIL files. + +2007-02-05 01:30 grahamdennis + + * trunk/xmds-devel/source/xmdsvectorelement.cc: Output more + information for debugging when input grids don't match simulation + grids. + +2007-01-31 02:51 grahamdennis + + * trunk/xmds-devel/examples/Makefile: Actually cause 'make run' in + the examples directory to run the examples instead of just + pretending to do so. + +2007-01-30 20:43 paultcochrane + + * ., trunk/xmds-devel/admin/build-and-test.sh: Initial import to + repository. An initial first cut at a build and test + script to run on the sourceforge compile farm. + +2007-01-29 21:42 paultcochrane + + * ., trunk/xmds-devel/examples: Updated svn:ignore property to + ignore gcov-generated files. + +2007-01-29 21:42 paultcochrane + + * ., trunk/xmds-devel/examples/Makefile: Added a default target. + Added a run target so that can run all simulations as well as + just build + them. + +2007-01-29 21:42 paultcochrane + + * ., trunk/xmds-devel/source/getopt_xmds.h, + trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmdsarg.cc, + trunk/xmds-devel/source/xmdsargelement.cc, + trunk/xmds-devel/source/xmdsargv.cc, + trunk/xmds-devel/source/xmdsbreakpoint.cc, + trunk/xmds-devel/source/xmdselement.cc, + trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsglobals.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateark45.cc, + trunk/xmds-devel/source/xmdsintegrateark45ex.cc, + trunk/xmds-devel/source/xmdsintegrateark45ip.cc, + trunk/xmds-devel/source/xmdsintegrateark89.cc, + trunk/xmds-devel/source/xmdsintegrateark89ex.cc, + trunk/xmds-devel/source/xmdsintegrateark89ip.cc, + trunk/xmds-devel/source/xmdsintegrateex.cc, + trunk/xmds-devel/source/xmdsintegrateip.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegraterk4ex.cc, + trunk/xmds-devel/source/xmdsintegraterk4ip.cc, + trunk/xmds-devel/source/xmdsintegraterk9.cc, + trunk/xmds-devel/source/xmdsintegraterk9ex.cc, + trunk/xmds-devel/source/xmdsintegraterk9ip.cc, + trunk/xmds-devel/source/xmdsintegratesi.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdsoutput.cc, + trunk/xmds-devel/source/xmdssegment.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc, + trunk/xmds-devel/source/xmdsutils.cc, + trunk/xmds-devel/source/xmdsutils.h, + trunk/xmds-devel/source/xmdsvector.cc, + trunk/xmds-devel/source/xmdsvectorelement.cc, + trunk/xmds-devel/source/xmlbasics.cc, + trunk/xmds-devel/source/xmlparser.cc, + trunk/xmds-devel/source/xsil2graphics.cc, + trunk/xmds-devel/source/xsilfield.cc: Banishing hard tabs from + the source. Replaced with relevant number of spaces. + +2007-01-29 21:40 paultcochrane + + * ., trunk/xmds-devel/source: Updated svn:ignore property to ignore + *.bak files + +2007-01-29 21:40 paultcochrane + + * ., trunk/xmds-devel/source/xmdsintegraterk9.cc, + trunk/xmds-devel/source/xmdsintegraterk9ex.cc, + trunk/xmds-devel/source/xmdsintegraterk9ip.cc: Added emacs/vim + coda to load common editor settings + +2007-01-29 21:39 paultcochrane + + * ., trunk/xmds-devel/Makefile.am: Removed latexdocs variable + +2007-01-25 05:46 michaelhush + + * trunk/xmds-devel/source/xmdsintegrateark89.cc: Changed adaptive + time step algorithm, so step size is halved after a failure to + improve stability + +2007-01-18 03:31 michaelhush + + * trunk/xmds-devel/source/xmdssequence.cc: fixed problem with + benchmark changes I made + +2007-01-18 02:50 michaelhush + + * trunk/xmds-devel/examples/diffusion.xmds, + trunk/xmds-devel/examples/kubo.xmds, + trunk/xmds-devel/source/xmdsintegrateark89.cc, + trunk/xmds-devel/source/xmdssequence.cc: Fixed time step for + ARK89EX and IP for non stochastic problems + and changed bemchmark so it displays a more accurate time + +2007-01-16 03:03 joehope + + * trunk/xmds-devel/Makefile.am: Adding the missing examples into + the distribution packages + +2007-01-11 08:07 michaelhush + + * trunk/xmds-devel/source/xmdsintegrateark89.cc, + trunk/xmds-devel/source/xmdsintegrateark89ip.cc: ARK89EX and + ARK89IP both now work for normal and simple stochastic problems + +2007-01-11 04:35 michaelhush + + * trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdsintegrateark89.cc, + trunk/xmds-devel/source/xmdsintegrateark89ex.cc: ARK89EX now + working and convergerges on diffusion.xmds and a simple + stochastic problem + +2007-01-07 23:52 paultcochrane + + * ., trunk/xmds-devel/source/xmdsintegraterk9.cc: Corrected + docstring; was throwing a warning from doxygen. + +2007-01-07 23:52 paultcochrane + + * ., trunk/xmds-devel/source/Doxyfile: Explicitly specifying the + patterns to look for when searching for source + files. + +2007-01-07 23:51 paultcochrane + + * ., trunk/xmds-devel/source/dom3.h: Reformatted docstrings and + made most of the lines of code within 80 + character limits. + +2007-01-07 19:34 paultcochrane + + * ., trunk/xmds-devel/source/Makefile.am: Building the pdf as well + as the html version of the api when running + 'make api' + +2007-01-07 19:34 paultcochrane + + * ., trunk/xmds-devel/source/Doxyfile: CALL_GRAPH and CALLER_GRAPH + set to YES + +2007-01-07 19:33 paultcochrane + + * ., trunk/xmds-devel/source/Doxyfile: GENERATE_MAN set to NO + +2007-01-07 19:33 paultcochrane + + * ., trunk/xmds-devel/source/Doxyfile: WARN_NO_PARAMDOC set to YES + +2007-01-07 19:33 paultcochrane + + * ., trunk/xmds-devel/source/Doxyfile: Tab size set to 4. + +2007-01-07 19:33 paultcochrane + + * ., trunk/xmds-devel/source/Doxyfile: Updated to current version + of doxygen (1.5.1) + +2007-01-07 19:32 paultcochrane + + * ., trunk/xmds-devel/source/Doxyfile: Moved link to where + documentation should be output to be in the xmds.org + directory. + +2007-01-05 01:21 michaelhush + + * trunk/xmds-devel/source/xmdsintegrateark89.cc: Another file I + forgot to add for ARK89 methods + +2007-01-04 06:48 michaelhush + + * trunk/xmds-devel/source/xmdsintegrateark89ex.cc, + trunk/xmds-devel/source/xmdsintegrateark89ip.cc: Added ARK89 + classes I forgot + +2007-01-04 06:46 michaelhush + + * trunk/xmds-devel/examples/sech_soliton.xmds, + trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateark45.cc, + trunk/xmds-devel/source/xmdsintegrateark45ex.cc, + trunk/xmds-devel/source/xmdsintegrateark45ip.cc, + trunk/xmds-devel/source/xmdsintegrateex.cc, + trunk/xmds-devel/source/xmdsintegrateip.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegraterk4ex.cc, + trunk/xmds-devel/source/xmdsintegraterk4ip.cc, + trunk/xmds-devel/source/xmdsintegraterk9.cc, + trunk/xmds-devel/source/xmdsintegraterk9ex.cc, + trunk/xmds-devel/source/xmdsintegraterk9ip.cc, + trunk/xmds-devel/source/xmdsintegratesi.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdssequence.cc: RK9IP now works with + diffusion and sech_soliton examples, added ARK89EX and ARK89IP + classes but functionality still to come + +2006-12-28 15:58 paultcochrane + + * ., trunk/xmds-devel/configure.in: A test was missing for the + fftw3.h header file (which is what fftw installs + this header as by default, I would guess so that one can run + fftw2 and fftw3 + on the same system), this hopefully fixes bug #1600319 + +2006-12-28 15:58 paultcochrane + + * ., trunk/xmds-devel/examples/Makefile: Added the xmds binary as a + dependency so that when xmds is rebuilt, one + doesn't have to run 'make examples-clean; make examples' one can + just run + 'make examples' + +2006-12-28 15:58 paultcochrane + + * ., trunk/xmds-devel/examples/pendulum.xmds: Fixed typo. + +2006-12-25 21:05 paultcochrane + + * ., trunk/xmds-devel/source/main.cc: Changed some output info and + added some more todo items. + +2006-12-25 21:05 paultcochrane + + * ., trunk/xmds-devel/source/main.cc: Minor formatting changes. + +2006-12-25 21:05 paultcochrane + + * ., trunk/xmds-devel/source/main.cc: Changed some more printf + statements to cout. + +2006-12-25 21:05 paultcochrane + + * ., trunk/xmds-devel/source/main.cc: Converted many printf + statements to cout statements (more C++ like). + Generic code formatting and tidying. + +2006-12-25 21:04 paultcochrane + + * ., trunk/xmds-devel/source/main.cc: Added a todo item to improve + an if-elseif sequence (no book handy atm to + make it properly clean). + +2006-12-25 21:04 paultcochrane + + * ., trunk/xmds-devel/source/main.cc: Added a note to the + parsePrefs() routine about possibly making it more + object oriented to reduce the number of params passed to the + routine. + +2006-12-25 21:04 paultcochrane + + * ., trunk/xmds-devel/source: Updated svn:ignore property. + +2006-12-25 21:04 paultcochrane + + * ., trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/xmdsarg.cc, + trunk/xmds-devel/source/xmdsargelement.cc, + trunk/xmds-devel/source/xmdsargv.cc, + trunk/xmds-devel/source/xmdsbreakpoint.cc, + trunk/xmds-devel/source/xmdselement.cc, + trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsglobals.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateark45.cc, + trunk/xmds-devel/source/xmdsintegrateark45ex.cc, + trunk/xmds-devel/source/xmdsintegrateark45ip.cc, + trunk/xmds-devel/source/xmdsintegrateex.cc, + trunk/xmds-devel/source/xmdsintegrateip.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegraterk4ex.cc, + trunk/xmds-devel/source/xmdsintegraterk4ip.cc, + trunk/xmds-devel/source/xmdsintegraterk9.cc, + trunk/xmds-devel/source/xmdsintegraterk9ex.cc, + trunk/xmds-devel/source/xmdsintegraterk9ip.cc, + trunk/xmds-devel/source/xmdsintegratesi.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdsoutput.cc, + trunk/xmds-devel/source/xmdssegment.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc, + trunk/xmds-devel/source/xmdsutils.cc, + trunk/xmds-devel/source/xmdsvector.cc, + trunk/xmds-devel/source/xmdsvectorelement.cc, + trunk/xmds-devel/source/xmlbasics.cc, + trunk/xmds-devel/source/xmlparser.cc, + trunk/xmds-devel/source/xsilfield.cc: Reduced length of comments + used as spacers between code sections (it fits + within an 80 character window nicely now). + +2006-12-25 21:03 paultcochrane + + * ., trunk/xmds-devel/examples/Makefile: Allowing all examples to + run even if one fails. This is useful if one + hasn't compiled xmds for mpi, and in which case highdim will + fail. + +2006-12-25 21:03 paultcochrane + + * ., trunk/xmds-devel/Makefile.am: Added "examples" and + "examples-clean" rules for running the examples from + the base xmds-devel directory. + +2006-12-25 21:02 paultcochrane + + * ., trunk/xmds-devel/Makefile.am, + trunk/xmds-devel/source/Makefile.am: Added an api rule to the + makefiles so that one can build the + Doxygen-generated api docs using "make api" + +2006-12-25 21:02 paultcochrane + + * ., trunk/xmds-devel/source/Doxyfile: Updated the version number + of xmds for the api documentation. + +2006-12-25 21:02 paultcochrane + + * ., trunk/xmds-devel/source/main.cc: Changed the variable c to + currentChar in parsePrefs() + Some more basic reformatting of code for readability. + +2006-12-25 21:02 paultcochrane + + * ., trunk/xmds-devel/source/main.cc: Some basic code reformatting + in parsePrefs() + +2006-12-25 21:02 paultcochrane + + * ., trunk/xmds-devel/source/main.cc: Basic reformat of + parsePrefs() argument list to try to improve readability. + Also reformatted some comments. + +2006-12-25 21:01 paultcochrane + + * ., trunk/xmds-devel/source/main.cc: Tried to improve the + display_usage() code formatting both internally, and + that of the text printed to the screen. + +2006-12-25 21:01 paultcochrane + + * ., trunk/xmds-devel/source/main.cc: Reformatted some of the + comment/documentation text. + +2006-12-20 07:26 paultcochrane + + * ., trunk/xmds-devel/admin/xmdsNewsPost.pl, + trunk/xmds-devel/admin/xmdsNewsPost.txt: Deleted. No longer + necessary, or a good idea. + +2006-12-20 05:35 michaelhush + + * trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdsintegrateip.cc, + trunk/xmds-devel/source/xmdsintegraterk9.cc, + trunk/xmds-devel/source/xmdsintegraterk9ex.cc, + trunk/xmds-devel/source/xmdsintegraterk9ip.cc, + trunk/xmds-devel/source/xmdssequence.cc: Classes added for the + 9th order stochastically safe rk method, ex is working but ip is + still being completed + +2006-12-18 13:03 paultcochrane + + * ., trunk/xmds-devel/.cvsignore, + trunk/xmds-devel/examples/.cvsignore, + trunk/xmds-devel/source/.cvsignore, + trunk/xmds-devel/testsuite/.cvsignore, + trunk/xmds-doc/latex/.cvsignore, + trunk/xmds-doc/latex/figures/.cvsignore: Removed old .cvsignore + files. + +2006-12-18 12:59 paultcochrane + + * ., trunk/xmds-devel/AUTHORS, trunk/xmds-devel/INSTALL, + trunk/xmds-devel/Makefile.am, trunk/xmds-devel/NEWS, + trunk/xmds-devel/README, trunk/xmds-devel/README.Windows, + trunk/xmds-devel/acinclude.m4, trunk/xmds-devel/acx_mpi.m4, + trunk/xmds-devel/acx_pthread.m4, + trunk/xmds-devel/admin/xmdsNewsPost.pl, + trunk/xmds-devel/admin/xmdsReleaseProcedure.pod, + trunk/xmds-devel/benchmark/bench, + trunk/xmds-devel/benchmark/fullpos3D_16.xmds, + trunk/xmds-devel/benchmark/fullpos3D_32.xmds, + trunk/xmds-devel/benchmark/fullpos3D_64.xmds, + trunk/xmds-devel/benchmark/gaugeatomlaser.xmds, + trunk/xmds-devel/benchmark/gaugeatomlaser_128.xmds, + trunk/xmds-devel/benchmark/ndparamp_100.xmds, + trunk/xmds-devel/benchmark/ndparamp_200.xmds, + trunk/xmds-devel/benchmark/ndparamp_50.xmds, + trunk/xmds-devel/benchmark/ndparamp_500.xmds, + trunk/xmds-devel/benchmark/nlse_100.xmds, + trunk/xmds-devel/benchmark/nlse_1000.xmds, + trunk/xmds-devel/benchmark/nlse_10000.xmds, + trunk/xmds-devel/benchmark/nlse_500.xmds, + trunk/xmds-devel/benchmark/nlse_5000.xmds, + trunk/xmds-devel/benchmark/runbenchmarks, + trunk/xmds-devel/configure.in, + trunk/xmds-devel/examples/atomlaser.xmds, + trunk/xmds-devel/examples/branch.xmds, + trunk/xmds-devel/examples/brusselator.xmds, + trunk/xmds-devel/examples/catcycle.xmds, + trunk/xmds-devel/examples/chain.xmds, + trunk/xmds-devel/examples/chemkin.xmds, + trunk/xmds-devel/examples/diffusion.xmds, + trunk/xmds-devel/examples/diffusion2.xmds, + trunk/xmds-devel/examples/duffing.xmds, + trunk/xmds-devel/examples/fibre.xmds, + trunk/xmds-devel/examples/fisher_reaction_diffusion.xmds, + trunk/xmds-devel/examples/fullpos3D.xmds, + trunk/xmds-devel/examples/gaugeatomlaser.xmds, + trunk/xmds-devel/examples/highdim.xmds, + trunk/xmds-devel/examples/hires.xmds, + trunk/xmds-devel/examples/krebs.xmds, + trunk/xmds-devel/examples/kubo.xmds, + trunk/xmds-devel/examples/lane_emden.xmds, + trunk/xmds-devel/examples/lorenz.xmds, + trunk/xmds-devel/examples/lotka_volterra.xmds, + trunk/xmds-devel/examples/ndparamp.xmds, + trunk/xmds-devel/examples/nlse.xmds, + trunk/xmds-devel/examples/oregonator.xmds, + trunk/xmds-devel/examples/paraxial_wave.xmds, + trunk/xmds-devel/examples/pendulum.xmds, + trunk/xmds-devel/examples/ring_modulator.xmds, + trunk/xmds-devel/examples/sine.xmds, + trunk/xmds-devel/examples/soliton.xmds, + trunk/xmds-devel/examples/thermkin.xmds, + trunk/xmds-devel/examples/tla.xmds, + trunk/xmds-devel/examples/van_der_pol.xmds, + trunk/xmds-devel/examples/vibstring.xmds, + trunk/xmds-devel/source/Doxyfile, + trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/dom3.h, + trunk/xmds-devel/source/getopt_xmds.c, + trunk/xmds-devel/source/getopt_xmds.h, + trunk/xmds-devel/source/getopt_xmds1.c, + trunk/xmds-devel/source/getopt_xmds_init.c, + trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/kissdom.h, + trunk/xmds-devel/source/loadxsil.m, + trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmdsarg.cc, + trunk/xmds-devel/source/xmdsargelement.cc, + trunk/xmds-devel/source/xmdsargv.cc, + trunk/xmds-devel/source/xmdsbreakpoint.cc, + trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdscomplex.h, + trunk/xmds-devel/source/xmdselement.cc, + trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsglobals.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateark45.cc, + trunk/xmds-devel/source/xmdsintegrateark45ex.cc, + trunk/xmds-devel/source/xmdsintegrateark45ip.cc, + trunk/xmds-devel/source/xmdsintegrateex.cc, + trunk/xmds-devel/source/xmdsintegrateip.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegraterk4ex.cc, + trunk/xmds-devel/source/xmdsintegraterk4ip.cc, + trunk/xmds-devel/source/xmdsintegratesi.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdsoutput.cc, + trunk/xmds-devel/source/xmdssegment.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc, + trunk/xmds-devel/source/xmdsutils.cc, + trunk/xmds-devel/source/xmdsutils.h, + trunk/xmds-devel/source/xmdsvector.cc, + trunk/xmds-devel/source/xmdsvectorelement.cc, + trunk/xmds-devel/source/xmlbasics.cc, + trunk/xmds-devel/source/xmlbasics.h, + trunk/xmds-devel/source/xmlparser.cc, + trunk/xmds-devel/source/xmlparser.h, + trunk/xmds-devel/source/xsil2graphics.cc, + trunk/xmds-devel/source/xsilfield.cc, + trunk/xmds-devel/source/xsilfield.h, + trunk/xmds-devel/testsuite/atomlaser.xmds, + trunk/xmds-devel/testsuite/fibre.xmds, + trunk/xmds-devel/testsuite/fullpos3D.xmds, + trunk/xmds-devel/testsuite/gaugeatomlaser.xmds, + trunk/xmds-devel/testsuite/kubo.xmds, + trunk/xmds-devel/testsuite/ndparamp.xmds, + trunk/xmds-devel/testsuite/nlse.xmds, + trunk/xmds-devel/testsuite/sine.xmds, + trunk/xmds-devel/testsuite/soliton.xmds, + trunk/xmds-devel/testsuite/test_xmds.pl, + trunk/xmds-devel/testsuite/tla.xmds: Updated svn keywords + property to make the "Id" keyword be expanded in + source files. + +2006-12-17 15:31 paultcochrane + + * ., trunk/xmds-devel/configure.in, + trunk/xmds-devel/examples/atomlaser.xmds, + trunk/xmds-devel/examples/branch.xmds, + trunk/xmds-devel/examples/brusselator.xmds, + trunk/xmds-devel/examples/catcycle.xmds, + trunk/xmds-devel/examples/chain.xmds, + trunk/xmds-devel/examples/chemkin.xmds, + trunk/xmds-devel/examples/diffusion.xmds, + trunk/xmds-devel/examples/diffusion2.xmds, + trunk/xmds-devel/examples/duffing.xmds, + trunk/xmds-devel/examples/fibre.xmds, + trunk/xmds-devel/examples/fisher_reaction_diffusion.xmds, + trunk/xmds-devel/examples/fullpos3D.xmds, + trunk/xmds-devel/examples/gaugeatomlaser.xmds, + trunk/xmds-devel/examples/groundstate.xmds, + trunk/xmds-devel/examples/highdim.xmds, + trunk/xmds-devel/examples/hires.xmds, + trunk/xmds-devel/examples/krebs.xmds, + trunk/xmds-devel/examples/kubo.xmds, + trunk/xmds-devel/examples/lane_emden.xmds, + trunk/xmds-devel/examples/lorenz.xmds, + trunk/xmds-devel/examples/lotka_volterra.xmds, + trunk/xmds-devel/examples/ndparamp.xmds, + trunk/xmds-devel/examples/nlse.xmds, + trunk/xmds-devel/examples/oregonator.xmds, + trunk/xmds-devel/examples/paraxial_wave.xmds, + trunk/xmds-devel/examples/pendulum.xmds, + trunk/xmds-devel/examples/ring_modulator.xmds, + trunk/xmds-devel/examples/sech_soliton.xmds, + trunk/xmds-devel/examples/sech_soliton_tdepk.xmds, + trunk/xmds-devel/examples/sine.xmds, + trunk/xmds-devel/examples/soliton.xmds, + trunk/xmds-devel/examples/thermkin.xmds, + trunk/xmds-devel/examples/tla.xmds, + trunk/xmds-devel/examples/van_der_pol.xmds, + trunk/xmds-devel/examples/vibstring.xmds, + trunk/xmds-devel/source/dom3.h, + trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/kissdom.h, + trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmdsarg.cc, + trunk/xmds-devel/source/xmdsargelement.cc, + trunk/xmds-devel/source/xmdsargv.cc, + trunk/xmds-devel/source/xmdsbreakpoint.cc, + trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdscomplex.h, + trunk/xmds-devel/source/xmdselement.cc, + trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsglobals.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateark45.cc, + trunk/xmds-devel/source/xmdsintegrateark45ex.cc, + trunk/xmds-devel/source/xmdsintegrateark45ip.cc, + trunk/xmds-devel/source/xmdsintegrateex.cc, + trunk/xmds-devel/source/xmdsintegrateip.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegraterk4ex.cc, + trunk/xmds-devel/source/xmdsintegraterk4ip.cc, + trunk/xmds-devel/source/xmdsintegratesi.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdsoutput.cc, + trunk/xmds-devel/source/xmdssegment.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc, + trunk/xmds-devel/source/xmdsutils.cc, + trunk/xmds-devel/source/xmdsutils.h, + trunk/xmds-devel/source/xmdsvector.cc, + trunk/xmds-devel/source/xmdsvectorelement.cc, + trunk/xmds-devel/source/xmlbasics.cc, + trunk/xmds-devel/source/xmlbasics.h, + trunk/xmds-devel/source/xmlparser.cc, + trunk/xmds-devel/source/xmlparser.h, + trunk/xmds-devel/source/xsil2graphics.cc, + trunk/xmds-devel/source/xsilfield.cc, + trunk/xmds-devel/source/xsilfield.h: Updated copyright date + information. + +2006-12-17 15:29 paultcochrane + + * ., trunk/xmds-devel/configure.in, + trunk/xmds-devel/source/main.cc: Updated revision number (1.5-3 + has been released) + +2006-12-17 15:00 paultcochrane + + * ., trunk/xmds-devel/examples/sech_soliton.xmds, + trunk/xmds-devel/examples/sech_soliton_tdepk.xmds: Added + copyright notice. + +2006-12-17 15:00 paultcochrane + + * ., trunk/xmds-devel/examples/fullpos3D.xmds, + trunk/xmds-devel/examples/gaugeatomlaser.xmds: The line at the + top of each xmds file should read: + + not + + for the file to be a well formed xml document. + +2006-12-17 11:17 paultcochrane + + * trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmdsarg.cc, + trunk/xmds-devel/source/xmdsargelement.cc, + trunk/xmds-devel/source/xmdsargv.cc, + trunk/xmds-devel/source/xmdsbreakpoint.cc, + trunk/xmds-devel/source/xmdselement.cc, + trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsglobals.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateark45.cc, + trunk/xmds-devel/source/xmdsintegrateark45ex.cc, + trunk/xmds-devel/source/xmdsintegrateark45ip.cc, + trunk/xmds-devel/source/xmdsintegrateex.cc, + trunk/xmds-devel/source/xmdsintegrateip.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegraterk4ex.cc, + trunk/xmds-devel/source/xmdsintegraterk4ip.cc, + trunk/xmds-devel/source/xmdsintegratesi.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdsoutput.cc, + trunk/xmds-devel/source/xmdssegment.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc, + trunk/xmds-devel/source/xmdsutils.cc, + trunk/xmds-devel/source/xmdsvector.cc, + trunk/xmds-devel/source/xmdsvectorelement.cc, + trunk/xmds-devel/source/xmlbasics.cc, + trunk/xmds-devel/source/xmlparser.cc, + trunk/xmds-devel/source/xsil2graphics.cc, + trunk/xmds-devel/source/xsilfield.cc: Added emacs/vim coda to + help with formatting of code. + +2006-12-17 11:15 paultcochrane + + * trunk/xmds-devel/examples/groundstate.xmds: Changed simulation + name to match filename: this helps the examples makefile + correctly work out dependencies. + +2006-12-17 11:15 paultcochrane + + * trunk/xmds-devel/examples/Makefile: Initial import to repository. + This makefile is used to build the examples. + We probably need to add this as part of autoconf, however, this + does the job + at present. + +2006-12-16 18:16 paultcochrane + + * trunk/xmds-devel/preconf: Removed; this command would have worked + nicely for older versions of the + autoconf suite (i.e. those used when the original scripts were + written), + however now there exists the autoreconf program which comes with + the + autoconf suite, and so makes the preconf script obsolete. + +2006-12-14 09:17 sebwuester + + * trunk/xmds-devel/examples/sech_soliton.xmds, + trunk/xmds-devel/source/xmdsintegrateark45.cc, + trunk/xmds-devel/source/xmdsintegrateark45ex.cc, + trunk/xmds-devel/source/xmdsintegrateark45ip.cc, + trunk/xmds-devel/source/xmdsintegrateip.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegraterk4ex.cc, + trunk/xmds-devel/source/xmdsintegraterk4ip.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc: added underscores + to some variables in ark45 which didn't have them; also added + underscores to akfield etc. in rk4 and siip siex + +2006-12-14 08:00 grahamdennis + + * trunk/xmds-devel/source/xmdsvectorelement.cc: Fix bug in earlier + commit causing some simulations to not compile (those that use + XSIL files to initialise non-main fields). + +2006-12-14 07:46 grahamdennis + + * trunk/xmds-devel/source/xmdsbreakpoint.cc: Significantly sped up + writing breakpoints when using MPI (removed unnecessary fseeks). + For an example of the reduction, in examples/fullpos3D.xmds, the + number of fseeks when writing the field data (in a breakpoint) + was reduced from 393216 to 48. + + Also caught a bug where the data was being sent as the incorrect + type when using MPI breakpoints. I continue to be astonished that + this has worked in the past on the AC. + +2006-12-14 05:39 joehope + + * trunk/xmds-devel/configure.in: Recovering 'out of the box' + compilation for Mac OS X by defaulting to c++ compiler + Still to achieve this for OPENMPI without passing MPI compiler + explicitly as mpic++ + +2006-12-14 01:57 grahamdennis + + * trunk/xmds-devel/source/xmdsvectorelement.cc: Significantly + reduced the number of fseeks during loading of XSIL files. This + is particularly important for large simulations as fseeks + significantly slow down the loading procedure. + +2006-12-01 05:44 paultcochrane + + * trunk/xmds-devel/configure.in: No longer automatically checking + for icc during the configuration stage. If + the user wants to use icc they can use the syntax: + XMDS_CC=icc ./configure --with-user --enable-mpi (for example) + +2006-12-01 04:54 paultcochrane + + * trunk/xmds-devel/preconf: Initial import to repository. This is a + script to run to perform the + autoconf preconfiguration dance before running ./configure after + one has + changed the configure.in or Makefile.am files. Maybe this will + save some + hands from RSI. + +2006-12-01 04:39 paultcochrane + + * trunk/xmds-devel/Makefile.am: Removed trailing space. This was + causing a warning from automake. + +2006-12-01 04:33 paultcochrane + + * trunk/xmds-devel/testsuite/test_xmds.pl: Corrected a typo, and + added cvs Id keyword. + +2006-12-01 04:20 paultcochrane + + * trunk/xmds-devel, trunk/xmds-devel/.cvsignore: Initial import to + repository. Getting cvs to ignore some of the autogenerated + files in the root xmds-devel directory. + +2006-11-30 00:13 joehope + + * trunk/xmds-devel/configure.in: Changing PREFIX behaviour on + installation. This is one less patch separating + the CVS from the Debian version. + +2006-11-27 13:41 paultcochrane + + * trunk/xmds-devel/testsuite, + trunk/xmds-devel/testsuite/.cvsignore: Initial import to + repository. This file helps 'cvs status' ignore several + files in the testsuite/ directory. + +2006-11-27 00:05 joehope + + * trunk/xmds-devel/Makefile.am: Including lorentzInput.dat in the + distribution tarball, as posted by Rafael Laboissiere + +2006-11-24 13:08 paultcochrane + + * trunk/xmds-devel/source/main.cc: Updated copyright information + (2004 -> 2006) + +2006-11-24 13:07 paultcochrane + + * trunk/xmds-devel/source, trunk/xmds-devel/source/.cvsignore: + Ignoring automatically generated files. + +2006-11-24 12:44 paultcochrane + + * trunk/xmds-devel/examples, trunk/xmds-devel/examples/.cvsignore: + Added .wisdom files to list to ignore, and the names of the + output example + executables. + +2006-11-24 12:31 paultcochrane + + * trunk/xmds-devel/examples, trunk/xmds-devel/examples/.cvsignore: + Added a .cvsignore file so that cvs status doesn't generate so + much unwanted + output. + +2006-11-21 04:41 grahamdennis + + * trunk/xmds-devel/source/xmdsbreakpoint.cc: Significantly sped up + writing breakpoints to disk by reordering the fwrites + so that fseeks are mostly not needed. + +2006-11-18 08:57 grahamdennis + + * trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsintegrateip.cc: I hereby swear to try + to make sure my xmds variables start with an underscore. + Fixed OpenMP slowdown + +2006-11-17 07:18 grahamdennis + + * trunk/xmds-devel/source/xmdsintegrateip.cc: I forgot to mark the + k operators as thread-private in my previous commit. + +2006-11-17 05:26 grahamdennis + + * trunk/xmds-devel/source/xmdsintegrateip.cc: Loop index variables + must be signed for OpenMP to work + +2006-11-17 05:21 grahamdennis + + * trunk/xmds-devel/source/xmdsintegrateip.cc: Parallelised (OpenMP) + k_propagate and calculate_k_operator_field for ARK45. + This should have a decent effect on performance with OpenMP + +2006-11-17 04:19 grahamdennis + + * trunk/xmds-devel/source/xmdsintegrateark45ip.cc: It worked on my + machine... + Fix crash + +2006-11-17 04:15 grahamdennis + + * trunk/xmds-devel/source/xmdsintegrateark45ip.cc: Combined ARK45IP + for loops for cleaner code and better OpenMP compatibility + This can be done for all algorithms, I'll do it as I go + +2006-11-17 02:49 grahamdennis + + * trunk/xmds-devel/source/xmdsvectorelement.cc: One day I will + remember to use underscores in variable names written by XMDS. + (Fix compile warning for scripts using XSIL input) + +2006-11-03 18:57 paultcochrane + + * trunk/xmds-devel/NEWS: Updated to the current version of xmds, + and added all news items from + between xmds-1.3-2 and xmds-1.5-3. + +2006-11-03 18:28 paultcochrane + + * trunk/xmds-devel/AUTHORS: Updated the author list, and reordered + all names (except for Greg's - he + wrote it to start with, well, that's my reasoning) in + alphabetical order by + last name. + +2006-11-03 14:02 paultcochrane + + * trunk/xmds-devel/configure.in: Moved fftw3-path help information + over a bit so that it lines up with the + other text when one does ./configure --help. (yes, I'm pedantic) + +2006-10-17 04:59 grahamdennis + + * trunk/xmds-devel/source/xmdssimulation.cc, + trunk/xmds-devel/source/xmdsutils.cc: Fixed a problem with how + description elements were being read which caused xmds to crash + when reading certain examples (e.g. branch.xmds) + +2006-10-05 00:57 grahamdennis + + * trunk/xmds-devel/examples/lorenz.xmds, + trunk/xmds-devel/source/xmdssimulation.cc: Changing the example + lorenz.xmds not to require an input file as the options can be + supplied on the command line + Fix a bug in the byte-swapping routines due to a choice in the + variable name which would result in problems for + simulations that define the variable 'x'. + +2006-09-19 04:49 joehope + + * trunk/xmds-devel/ChangeLog, trunk/xmds-devel/MANIFEST: Update of + MANIFEST and ChangeLog + +2006-09-19 04:46 joehope + + * trunk/xmds-devel/README, trunk/xmds-devel/README.Windows, + trunk/xmds-devel/configure.in: Version updates prior to release + +2006-09-19 04:01 joehope + + * trunk/xmds-devel/ChangeLog, trunk/xmds-devel/examples/kubo.xmds, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc: Fixes for a collection + of MPI scheduler bugs (1558333,1551791,1551790). Single path runs + are now handled by the "Uniform" scheduler automatically. Trying + to run stochastic simulations without MPI no longer + bombs. + +2006-08-30 03:33 grahamdennis + + * trunk/xmds-devel/source/xmdssequence.cc: Flushing output after + each path for stochastic simulations at Mattias' request. + +2006-08-24 00:54 grahamdennis + + * trunk/xmds-devel/source/xmdsbreakpoint.cc: For MPI breakpoints, I + was sending and receiving some values with the wrong + datatype (double instead of int). I'm honestly surprised that + this even + worked for some systems before. + +2006-08-23 23:50 grahamdennis + + * trunk/xmds-devel/examples/atomlaser.xmds: Removed the old-style + breakpoint element from the example atomlaser.xmds as + that style breakpoint was never implemented. And we don't want + any confusion + arising with new-style breakpoints. + +2006-08-22 05:52 matt0064 + + * trunk/xmds-devel/source/loadxsil.m: Added code to loadxsil.m to + initialise multi-dimensional arrays when loading in binary data. + This can be a significant speed up. + +2006-08-09 00:54 grahamdennis + + * trunk/xmds-devel/source/main.cc: Fixing a compile bug for + stochastic MPI simulations with FFTW3. Thanks Andy! + +2006-08-03 06:17 grahamdennis + + * trunk/xmds-devel/source/xsilfield.cc: Fixing a bug in the matlab + output of xsil2graphics that would cause the script + not to load the data from a binary file if the data is a scalar + (zero dimensional) + +2006-07-31 01:50 grahamdennis + + * trunk/xmds-devel/source/xmdsbreakpoint.cc, + trunk/xmds-devel/source/xmdsvectorelement.cc: Fixing bugs with + the breakpoint code. I'm fairly sure that it works now. + +2006-07-28 05:09 grahamdennis + + * trunk/xmds-devel/source/xmdsvectorelement.cc: Adding rank number + to diagnostic output when an error occurs while loading + an XSIL file (with MPI). + +2006-07-21 03:39 grahamdennis + + * trunk/xmds-devel/examples/diffusion.xmds, + trunk/xmds-devel/examples/diffusion2.xmds, + trunk/xmds-devel/source/xmdsbreakpoint.cc: I have fixed the + breakpoint code for non-MPI simulations, and breakpoints should + now + also work for deterministic MPI simulations (it makes no sense to + use breakpoints for + stochastic MPI simulations). I have also modified the diffusion + example to use a + breakpoint and then to continue from that breakpoint (with a + larger simulation grid) in + a second diffusion example. + +2006-07-19 03:28 joehope + + * trunk/xmds-devel/source/xmdsintegrateex.cc: Fix for a tiny bug + temporarily introduced with the openMP code, which + broke compilation of *EX algorithms. + +2006-06-29 07:33 grahamdennis + + * trunk/xmds-devel/examples/nlse.xmds, + trunk/xmds-devel/source/xmdssimulation.cc: Fixing a bug where a + simulation with ascii output and a breakpoint element + would not compile + +2006-06-29 07:24 grahamdennis + + * trunk/xmds-devel/source/xmdsbreakpoint.cc, + trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdsoutput.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdsvectorelement.cc, + trunk/xmds-devel/source/xsilfield.cc: First crack at the + breakpoint code. Currently it only works for simulations that + aren't both deterministic and use MPI. Of course, the whole point + of this code + is for the deterministic MPI case, but for the moment, the vast + majority of the helper + code has been written. + + Changes to behaviour: when loading double-type variables with the + XSIL loading code, + it looks for a variable with an 'R' suffix instead of a variable + of the same name. As it + is impossible to have an output moment group variable of the same + name as a field variable. + +2006-06-23 01:54 grahamdennis + + * trunk/xmds-devel/source/xsilfield.cc: Increased verbosity of some + errors when loading XSIL files to mention what the + probable cause of the error was. + +2006-06-21 07:33 grahamdennis + + * trunk/xmds-devel/source/xmdsvector.cc: Parallelised the + multiplication loop at the end of the *go_space routines. + This was causing a massive slowdown on NUMA architecture machines + because + the whole field was accessed from a single node. + +2006-06-20 02:20 grahamdennis + + * trunk/xmds-devel/source/xmdssequence.cc: Added a fflush() after + the 'beginning integration ...' printf lines to better keep track + of simulations run with a buffered output stream (e.g. + simulations run through batch + queueing systems) + +2006-06-20 01:59 grahamdennis + + * trunk/xmds-devel/source/xsilfield.cc: Increased the verbosity of + one of the error shown when loading XSIL files when none of the + variables to be loaded have been found. This is typically due to + the wrong moment group being + set. + +2006-06-16 04:17 joehope + + * trunk/xmds-devel/source/xmdsvector.cc: Fix for the MPI version of + mixed space Fourier transforms. It was simply wrong previously. + +2006-06-07 06:40 joehope + + * trunk/xmds-devel/ChangeLog, trunk/xmds-devel/README.Windows, + trunk/xmds-devel/configure.in, trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc: Fix for multiple + bugs when using moment groups in filter and integrate blocks. + The bugs were all specific to MPI specific code implementation. + +2006-05-28 10:34 grahamdennis + + * trunk/xmds-devel/source/xmdsvectorelement.cc: Correction to my + previous commit: + It helps to actually set the field to zero instead of just + looping over it. + +2006-05-28 10:24 grahamdennis + + * trunk/xmds-devel/source/xmdsvectorelement.cc: Fix for OpenMP so + that each field is initialised by the thread that will + use it. This is important for NUMA-architecture supercomputers + (e.g. ANU's ac) + +2006-05-25 03:19 grahamdennis + + * trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateark45ex.cc, + trunk/xmds-devel/source/xmdsintegrateark45ip.cc, + trunk/xmds-devel/source/xmdsintegrateex.cc, + trunk/xmds-devel/source/xmdsintegrateip.cc, + trunk/xmds-devel/source/xmdsintegraterk4ex.cc, + trunk/xmds-devel/source/xmdsintegraterk4ip.cc, + trunk/xmds-devel/source/xmdssimulation.cc, + trunk/xmds-devel/source/xmdsvectorelement.cc: OpenMP support. Use + the tag yes in the simulation + element to use this. This does not work with deterministic MPI + simulations, + and doesn't really make sense to use it with stochastic MPI + simulations. + To make use of this, you will need a compiler that supports + OpenMP such as icc + or gcc 4.4 (currently unreleased). Note that one will get best + performance if + FFTW is compiled using OpenMP threads instead of pthreads. + +2006-05-13 01:12 grahamdennis + + * trunk/xmds-devel/source/xmdsmomentgroup.cc: Forcing a fflush() + after writing the 'sampled field...' lines. + This way, it is easier to keep track of the progress of jobs on + supercomputers + +2006-05-12 07:49 grahamdennis + + * trunk/xmds-devel/source/xmdsvectorelement.cc: Fixed binary + importing to not load the entire file into memory. This is needed + for MPI situations where + the initialisation data won't fit into memory. Also, previously, + it was just plain wrong when used with + deterministic MPI simulations. + +2006-05-12 06:54 grahamdennis + + * trunk/xmds-devel/source/xsilfield.cc: Removing text claiming that + the XSIL loading code does not support byte-swapping (it does) + +2006-05-12 06:27 grahamdennis + + * trunk/xmds-devel/configure.in, + trunk/xmds-devel/source/xmdsvectorelement.cc: Reducing the + verbosity of the XSIL loading code + Adding a --with-fftw3-path to the configure script so that the + location of fftw3 can be specified + independently of fftw2. Note that the path for fftw3 defaults to + the path for fftw2 + +2006-05-12 04:23 grahamdennis + + * trunk/xmds-devel/source/xmdssimulation.cc: Fixing a missing \n in + a printf statement + +2006-05-12 01:48 grahamdennis + + * trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdscomplex.h, + trunk/xmds-devel/source/xmdssimulation.cc, + trunk/xmds-devel/source/xmdsvectorelement.cc, + trunk/xmds-devel/source/xsilfield.cc, + trunk/xmds-devel/source/xsilfield.h: Vector initialisation from + XSIL moment groups (binary format only) + This should work for MPI simulations (it doesn't load the entire + binary file into memory, + this is why the this code does not support importing data in + ASCII format from XSIL files) + This should deal with byte-swapping if necessary. (Not tested, + but I'm going to). + The input moment group grid does not have to match up exactly + with the simulation grid, + there are two modes for importing, 'strict' mode and 'loose' + mode. + + In 'strict' mode, the initialisation geometry must match the + simulation geometry to within 1% + of the step size in each dimension. In 'loose' mode, the step + size in each initialisation dimension + (you may initialise from a mix of x- and k-space) must match the + simulation step size in each dimension, + but the start and end points (and the number of points) may be + different. + + Documentation is forthcoming after I have given this a bit more + testing. + +2006-05-07 09:39 pharaoh84 + + * trunk/xmds-devel/configure.in, trunk/xmds-devel/source/main.cc: + Fixing threads for fftw3 + +2006-05-07 03:10 pharaoh84 + + * trunk/xmds-devel/configure.in: Fixing my previous fix for systems + with requiring explicit linking + of the thread libraries. + Also, the agressive CFLAGS are now used for systems that don't + require + explicit linking of the thread libraries (removed a pointless + test) + + I hate autoconf. + +2006-05-07 02:48 pharaoh84 + + * trunk/xmds-devel/configure.in: Fixing configure.in for fftw3 for + systems that require explicit linking of thread + libraries + +2006-05-05 06:20 pharaoh84 + + * trunk/xmds-devel/configure.in: Fixing the configure.in script... + I hate autoconf. + +2006-05-05 06:10 pharaoh84 + + * trunk/xmds-devel/configure.in, trunk/xmds-devel/source/main.cc: + configure.in has been modified to support fftw3. Now you need to + provide the option + --enable-fftw3 in order to get fftw3 support. + One thing I forgot to mention in my previous commit comment was + that the tag required to use fftw3 + is . This tag belongs in the simulation element. + The default is 2 (fftw2), and set + it to 3 to use fftw3. + +2006-05-04 07:53 pharaoh84 + + * trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdscomplex.h, + trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsintegrateark45.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc, + trunk/xmds-devel/source/xmdsvector.cc: Initial support for fftw3. + It should work for simulations that are not deterministic MPI + simulations with the following caveats: + You are not permitted to use fftw_complex in your simulation + script (fftw3 uses a different format for their fftw_complex type + than + is used by fftw2), instead you should be using the 'complex' + type. + autoconf does not yet detect fftw3, so to get your scripts to + compile, you will need to insert a 'FFTW3_LIBS = ' line defining + the + fftw3 libraries to link in (-lfftw3 and optionally + -lfftw3_threads) and the path to find the library if needed. + + Note that fftw3 uses a different format for wisdom, and this is + stored under the new filename + ~/.xmds/wisdom/hostname.wisdom.fftw3 + or ~/.xmds/wisdom/hostname.wisdom.fftw3_threads for + threaded-simulations. + + I have tested threaded, non-threaded, deterministic and + stochastic simulations. I have not tested MPI-based stochastic + simulations yet, + however the scripts do compile. + +2006-04-20 00:47 pharaoh84 + + * trunk/xmds-devel/examples/groundstate.xmds: Modifying this + example to use the new tag for output groups + +2006-04-18 07:15 pharaoh84 + + * trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-doc/latex/languageReference.tex: Added a tag to + the element for outputs. + If this is set to 'double' then the output type is forced to type + double. + It defaults to 'complex' + +2006-04-07 04:17 pharaoh84 + + * trunk/xmds-devel/source/xmdssequence.cc: Fixing the elapsed time + for non-MPI simulations + +2006-04-07 03:35 pharaoh84 + + * trunk/xmds-devel/source/xsil2graphics.cc: Fix spelling mistake + 'Proccessing...' --> 'Processing..' + +2006-03-29 00:34 athiator + + * trunk/xmds-devel/source/xsilfield.cc: Also prints created + variables to screen when executing Mathematica instructions + +2006-03-15 04:27 athiator + + * trunk/xmds-devel/source/xmlbasics.cc, + trunk/xmds-devel/source/xmlbasics.h, + trunk/xmds-devel/source/xsil2graphics.cc, + trunk/xmds-devel/source/xsilfield.cc, + trunk/xmds-devel/source/xsilfield.h: Changes to xsil2graphics to + output a file with commands to read simulation data into + Mathematica + +2006-01-27 01:04 joehope + + * trunk/xmds-devel/source/xmdsmomentgroup.cc: Fixed error in MPI + reduction for deterministic systems. + The problem only affected some moment groups that used + post_propagation. + +2005-11-23 23:44 joehope + + * trunk/xmds-devel/examples/gaugeatomlaser.xmds, + trunk/xmds-devel/examples/groundstate.xmds: Adding imaginary time + evolution algorithm to the examples. It is often requested, + demonstrates + filters and moment_groups, and saves mailing it regularly. + +2005-10-31 00:34 joehope + + * trunk/xmds-devel/source/xmdsintegraterk4ip.cc: Avoid warning for + one case where it does not apply. + +2005-10-27 07:01 joehope + + * trunk/xmds-devel/ChangeLog, trunk/xmds-devel/MANIFEST, + trunk/xmds-devel/admin/xmds.spec: Final updates before 1.5-2 + release + +2005-10-27 00:58 joehope + + * trunk/xmds-devel/ChangeLog, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc: Fixed adaptive + scheduler to compile cleanly on other systems. + +2005-10-26 03:46 joehope + + * trunk/xmds-devel/ChangeLog, trunk/xmds-devel/README, + trunk/xmds-devel/README.Windows, trunk/xmds-devel/configure.in, + trunk/xmds-devel/examples/kubo.xmds, + trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc: Added new scheduling + option for stochastic MPI calculations. It uses + an adaptive scheduler to allocate batches of work to individual + nodes, + making for large speed increases on heterogenous systems. Bumped + version numbers. + +2005-10-24 22:40 joehope + + * trunk/xmds-devel/source/xmdssequence.cc: Fix for new timer. + +2005-10-24 04:11 joehope + + * trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc: Changed timer to work + better on MPI systems. + +2005-10-18 23:33 joehope + + * trunk/xmds-devel/examples/kubo.xmds, + trunk/xmds-devel/examples/tla.xmds, + trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdssimulation.cc, + trunk/xmds-devel/source/xmdsvectorelement.cc: Fix for stack + overflow in binary read from file. + Preliminary support for MPI Scheduling options. + +2005-10-13 00:45 joehope + + * trunk/xmds-devel/source/xmdssequence.cc: MPI runs only print out + the benchmark time from the master node. + +2005-10-12 04:34 joehope + + * trunk/xmds-devel/source/xmdsvectorelement.cc: Fix for crashing + bug when loading from file in stochastic simulations. + +2005-09-29 05:35 joehope + + * trunk/xmds-devel/ChangeLog, + trunk/xmds-devel/source/xmdsmomentgroup.cc: Fix compile error for + error-free stochastic binary output. + +2005-08-12 05:46 sebwuester + + * trunk/xmds-devel/examples/sech_soliton.xmds, + trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdsintegrateark45.cc: -Bugfixes in + ARK45: + -current step now states last accepted step instead of current + forecast + -fixed problems with timescales <10^-24 + -fixed problem with N_samples=N_steps + -Cosmetic in ARK45 + - rephrased "cutoff defaulting to" not to contain the word error + +2005-07-27 06:57 joehope + + * trunk/xmds-devel/source/xmdsintegratesiip.cc: Fixed an error in + the cross propagation routines of the SIIP algorithm. + Boundary conditions that are independent of the propagation + dimension are + now correct. + +2005-07-05 10:13 joehope + + * trunk/xmds-devel/ChangeLog, trunk/xmds-devel/MANIFEST: Updating + Changelog and MANIFEST prior to release + +2005-07-05 09:37 joehope + + * trunk/xmds-devel/README, trunk/xmds-devel/README.Windows, + trunk/xmds-devel/examples/highdim.xmds: Adjusting READMEs and + examples for version 1.5-1x + +2005-06-30 07:44 sebwuester + + * trunk/xmds-devel/source/xmdsintegrateark45.cc: Minor Bugfixes: + Corrected typo in on-screen message and call to noise generator + in the case of errorchecking + +2005-05-25 03:33 paultcochrane + + * trunk/xmds-devel/examples/highdim.xmds: Fixed xml header. + +2005-05-24 03:54 paultcochrane + + * trunk/xmds-devel/configure.in: Doing a check to see if the + library lammpi++ exists in the mpicc -showme + output, and if not adds -llammpi++ to the MPI_LIBS variable. This + should + only affect users of lam 7.x.x, this problem didn't occur in + 6.x.x. + +2005-05-19 05:46 paultcochrane + + * trunk/xmds-devel/source/xmdssequence.cc: Outputting standard C + argument stuff even when is not defined. + This fixes a problem where I didn't check for all possible paths + in an if loop + +2005-05-19 03:50 joehope + + * trunk/xmds-devel/ChangeLog: Update of ChangeLog + +2005-05-19 03:42 joehope + + * trunk/xmds-devel/source/xsilfield.cc: The m file now closes files + when it is done to avoid excess file + pointer usage in Matlab. + +2005-05-17 06:01 sebwuester + + * trunk/xmds-devel/source/xmdsintegrateark45.cc, + trunk/xmds-devel/source/xmdsintegraterk4ip.cc: Fixed bug in + warning about RK4IP and t-dep k operators. Made ARK45 error + determination routine more efficient for ODEs + +2005-05-10 03:40 paultcochrane + + * trunk/xmds-devel/source/main.cc: Moved -o + .cc to just behind the mpicc + call in the mpi compilation calls. This gets around problems with + mpicc not + finding various libraries. In particular, when getopt was turned + on for mpi + problems, mpicc wasn't finding -lxmds. + +2005-05-10 01:23 paultcochrane + + * trunk/xmds-devel/configure.in: Changed ordering of MPICCFLAGS so + that XMDS_LIBS is at the end. This should stop problems with + mpicc not finding the xmds libraries. + +2005-05-05 09:34 paultcochrane + + * trunk/xmds-devel/source/xmdssequence.cc: Hopefully fixed problem + with mpi not being able to make use of the arugment + parsing code. Added -h as a valid option; --help was only + possible before. + +2005-05-02 05:42 sebwuester + + * trunk/xmds-devel/examples/sech_soliton.xmds, + trunk/xmds-devel/examples/sech_soliton_tdepk.xmds, + trunk/xmds-devel/source/xmdsintegrateark45.cc: Fixed float + precision issue in ARK45 sampling and typos in examples. + +2005-05-02 02:35 sebwuester + + * trunk/xmds-devel/examples/sech_soliton.xmds, + trunk/xmds-devel/examples/sech_soliton_tdepk.xmds, + trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateark45.cc, + trunk/xmds-devel/source/xmdsintegrateark45ex.cc, + trunk/xmds-devel/source/xmdsintegrateark45ip.cc, + trunk/xmds-devel/source/xmdsintegrateip.cc, + trunk/xmds-devel/source/xmdsintegraterk4ip.cc, + trunk/xmds-devel/source/xmdsvectorelement.cc: Added ARK45IP and + ARK45EX adaptive timestep algorithms. + Added example files sech_soliton.xmds, sech_soliton_tdepk.xmds + Added parallel initialisation from file (ascii only) + +2005-04-28 05:21 joehope + + * trunk/xmds-devel/source/loadxsil.m: Fix for loadxsil loading of + 64 bit binaries + +2005-04-27 05:44 joehope + + * trunk/xmds-devel/source/xmdsfield.cc: Andy's fix for cluster + nodes testing the same filesystem simultaneously with the same + files. + +2005-04-24 04:31 joehope + + * trunk/xmds-devel/source/xsilfield.h: Final commit for previous + fix. + +2005-04-21 06:32 joehope + + * trunk/xmds-devel/configure.in, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xsilfield.cc: Added test for the size of + unsigned longs in the configure script. This, + like endianness, is stored in the xsil file for binary output, + and then + used when generating the MATLAB script. Fixes bug with moving + binary + data between machines. + +2005-04-12 07:25 joehope + + * trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateark45ex.cc, + trunk/xmds-devel/source/xmdsintegrateark45ip.cc: Set up template + for passing the adaptive boolean to the xmdsintegrate class. + +2005-04-12 05:44 joehope + + * trunk/xmds-devel/source/xsilfield.cc: Fixed matlab error message + when using binary files without the output file + +2005-04-06 06:41 paultcochrane + + * trunk/xmds-devel/examples/lorenzInput.dat: Initial import to + repository. This is the data file associated with the lorenz.xmds + example. + +2005-04-06 05:54 joehope + + * trunk/xmds-devel/examples/branch.xmds, + trunk/xmds-devel/examples/brusselator.xmds, + trunk/xmds-devel/examples/catcycle.xmds, + trunk/xmds-devel/examples/chain.xmds, + trunk/xmds-devel/examples/chemkin.xmds, + trunk/xmds-devel/examples/duffing.xmds, + trunk/xmds-devel/examples/fibre.xmds, + trunk/xmds-devel/examples/fisher_reaction_diffusion.xmds, + trunk/xmds-devel/examples/highdim.xmds, + trunk/xmds-devel/examples/hires.xmds, + trunk/xmds-devel/examples/krebs.xmds, + trunk/xmds-devel/examples/lane_emden.xmds, + trunk/xmds-devel/examples/lorenz.xmds, + trunk/xmds-devel/examples/lotka_volterra.xmds, + trunk/xmds-devel/examples/oregonator.xmds, + trunk/xmds-devel/examples/pendulum.xmds, + trunk/xmds-devel/examples/ring_modulator.xmds, + trunk/xmds-devel/examples/sine.xmds, + trunk/xmds-devel/examples/soliton.xmds, + trunk/xmds-devel/examples/thermkin.xmds, + trunk/xmds-devel/examples/van_der_pol.xmds: Fixing all examples + to conform with the (post 1.4-1) rule to always specify the used + vectors in integrate blocks. + +2005-04-06 02:22 joehope + + * trunk/xmds-devel/source/xmdsmomentgroup.cc: Fix for potential + problem with handling sample spaces when there are no transverse + dimensions. + +2005-04-06 01:43 joehope + + * trunk/xmds-devel/source/xmdsmomentgroup.cc: Made verbose output + on the moment groups more consistent with the numbering of the + groups. + +2005-04-05 23:23 joehope + + * trunk/xmds-devel/ChangeLog, trunk/xmds-devel/configure.in: + Version bump + +2005-04-05 07:23 joehope + + * trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdsintegrateark45.cc, + trunk/xmds-devel/source/xmdsintegrateark45ex.cc, + trunk/xmds-devel/source/xmdsintegrateark45ip.cc, + trunk/xmds-devel/source/xmdssequence.cc: Adding in shell files + for new ARK45 algorithms and bumping versions. + +2005-04-05 05:32 joehope + + * trunk/xmds-devel/examples/diffusion.xmds: Fixed sampling in + example. + +2004-12-06 04:58 paultcochrane + + * trunk/xmds-devel/source/xsilfield.cc: Now orienting independent + variable vectors for binary input to agree with that from ascii + input. + +2004-12-06 04:42 paultcochrane + + * trunk/xmds-devel/source/xsilfield.cc: Changed ordering of + variables in binary input to matlab. Should work the same as + ascii now. Some changes to comments. + +2004-11-17 23:35 joehope + + * trunk/xmds-devel/source/xsilfield.cc: Fixed a bug when using + MATLAB import of output moment groups of >2 dimensions in binary + format. + +2004-11-17 04:54 joehope + + * trunk/xmds-devel/source/xsilfield.cc: Adding explicit include + line to avoid problem with non-standard compilers. + +2004-11-02 22:51 joehope + + * trunk/xmds-devel/examples/atomlaser.xmds: Changing this example + to demo binary output, now that it works without explosions. + +2004-11-02 22:48 joehope + + * trunk/xmds-devel/ChangeLog: New ChangeLog for the new version + +2004-11-02 22:47 joehope + + * trunk/xmds-devel/MANIFEST: New manifest for the new version. + +2004-11-02 22:43 joehope + + * trunk/xmds-devel/source/xsilfield.cc: Fix for an error where an + integer overflow lead to dramatic problems with bianry output. + +2004-10-25 06:02 joehope + + * trunk/xmds-devel/configure.in, trunk/xmds-devel/source/main.cc: + Bumping the release version in preparation for a new release. + +2004-10-22 08:04 paultcochrane + + * trunk/xmds-devel/admin/xmdsReleaseProcedure.pod: Made mention + that one should update the xmds version and release numbers in + configure.in. Gave a more complete explanation of generating a + distribution, including checking out a temporary copy of the + xmds-devel repository and going through the relevant steps to be + able to do a make dist. + +2004-10-22 01:16 paultcochrane + + * trunk/xmds-devel/source/xsilfield.cc: Added some error text for + when a user tries to use binary output and then load the data + using scilab. Also put in some hopefully helpful information + about how to use scilab and data that comes out of xmds. + Basically this means just using ascii output. + +2004-10-21 10:01 paultcochrane + + * trunk/xmds-devel/source/xsilfield.h: Correction log for + previously stuffed up commit without a log. Added extra variables + to implement binary data handling of xsil2graphics. + +2004-10-21 10:00 paultcochrane + + * trunk/xmds-devel/source/xsilfield.cc: Simple commit to actually + add a log for the previous commit, because I stuffed up. Major + changes. Binary files are now handled by xsil2graphics. + Unfortunately, only the matlab script is produced at this stage. + The scilab version is to come. + +2004-10-21 09:51 paultcochrane + + * trunk/xmds-devel/source/xsilfield.cc, + trunk/xmds-devel/source/xsilfield.h: xsilfield.cc + +2004-10-21 09:51 paultcochrane + + * trunk/xmds-devel/source/xmdsvectorelement.cc: Changed some return + statements to exit statements. Basically, the program could keep + going at this point as opposed to barfing which would be far more + logical in the circumstances. + +2004-10-21 09:50 paultcochrane + + * trunk/xmds-devel/source/xmdsvector.cc: Changed unsigned long to + unsigned long int. I must have been in a pedantic mood. + +2004-10-21 09:49 paultcochrane + + * trunk/xmds-devel/source/xmdsoutput.cc: Added xmdsOutputFileName() + function. This is so that I can properly determine what the + output binary data filename should be, and base that upon the + name of the xsil filename as opposed to the simulation filename. + +2004-10-21 09:48 paultcochrane + + * trunk/xmds-devel/source/xmdsmomentgroup.cc: Major changes. Added + more attributes to the Metalink tag of the xsil file that gets + output so that can load binary data properly using xsil2graphics. + Implemented a better way of constructing the output binary data + filename. It is now based upon the xsilFilename rather than the + simulation name (these can be different). Fixed major bug where + if there is only one sample in the entire simulation (possible + but not common) then data was being written over as an array was + incorrectly sized. This is all happy now, and I even tested it. + Yay. + +2004-10-21 09:42 paultcochrane + + * trunk/xmds-devel/source/xmdsfilter.cc: Added a Doxygen docstring. + +2004-10-21 09:41 paultcochrane + + * trunk/xmds-devel/source/xmdscomplex.h: Fixed problem with there + being no newline at the end of the file. + +2004-10-21 09:40 paultcochrane + + * trunk/xmds-devel/source/xmdsclasses.h: Was pedantic again and + changed some unsigned constants to long unsigned ints. Added the + getOutputFileName() function, and its Doxygen docstring. + +2004-10-21 09:39 paultcochrane + + * trunk/xmds-devel/source/loadxsil.m: Removed some superfluous code + in the binary loading section. Made loading of the binary data + file part of the eval, as opposed to running it here. Added some + strings to say that the text that follows isn't actually just + informative, it is actually the code that is being executed. + +2004-10-21 09:37 paultcochrane + + * trunk/xmds-devel/source/getopt_xmds1.c, + trunk/xmds-devel/source/getopt_xmds_init.c: Added some Doxygen + docstrings. + +2004-10-21 09:36 paultcochrane + + * trunk/xmds-devel/source/getopt_xmds.c: Reformat of the C code. + Documentation with Doxygen docstrings. + +2004-10-21 09:34 paultcochrane + + * trunk/xmds-devel/configure.in: Updated version number to interim + release number. + +2004-10-15 07:53 joehope + + * trunk/xmds-devel/configure.in: Various fixes to the mpi autoconf + testing. It now works with non-gcc mpi. + +2004-10-11 04:06 joehope + + * trunk/xmds-devel/configure.in: Removed a "-Wall -pedantic" check + that broke compilation when cc/mpicc were gnu/non-gnu compilers. + +2004-10-06 07:52 joehope + + * trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdsvectorelement.cc: Fixed a memory leak + on strict compilers that didn't know that "delete(pointer)" + means "delete[] pointer" for pointer arrays. + +2004-10-06 07:50 joehope + + * trunk/xmds-devel/examples/kubo.xmds, + trunk/xmds-devel/examples/van_der_pol.xmds: These, and possibly + others, now need elements in the integrate blocks. + +2004-09-30 03:27 paultcochrane + + * trunk/xmds-devel/source/loadxsil.m: Fixed binary loading support. + This now works for mutli-dimensional matrices (ie greater than + two dims). Probably should be tested a bit more extensively than + I've tested it, but it seems to go well in the tests that I've + done. The ascii loading takes ages, especially for large output + data files, so I've added a message saying that it will take + ages, and have added progress output to keep the user amused + while they're waiting. Realistically for large files people + should use binary as it loads a couple of orders of magnitude + faster than ascii. I've also implemented preallocation of + matrices to help the ascii loading to run more quickly. Using + this script turns out to be a better option for very large files + as it doesn't use up as much memory as xsil2graphics does. For + some sims I've been doing recently, xsil2graphics maxes out the + memory on my machine when it's trying to generate the matlab file + and data file, however, loadxsil sits there quite happily and + doesn't even bother making the machine page to disk. This implies + that there could be a memory leak in xsil2graphics, or that + something could be done a bit more carefully concerning memory + useage. + +2004-09-24 03:29 paultcochrane + + * trunk/xmds-devel/Makefile.am: Fixed typo in orgeonator name. + +2004-09-15 06:01 joehope + + * trunk/xmds-devel/source/xmdsintegraterk4ex.cc, + trunk/xmds-devel/source/xmdsintegraterk4ip.cc: Fix for + flag in RK4 algorithms. + +2004-09-15 04:46 joehope + + * trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc: Added flag that + turns off the noise generation in an integration + or filter element. This allows deterministic elements in + stochastic + simulations (e.g. the noise is in the initial state only) to run + faster. + + Activated by the flag yes, and the default + is to + turn off this feature. + +2004-09-15 04:27 joehope + + * trunk/xmds-devel/ChangeLog: Updated with cvs2cl.pl + +2004-08-03 05:29 paultcochrane + + * trunk/xmds-devel/examples/brusselator.xmds, + trunk/xmds-devel/examples/chain.xmds, + trunk/xmds-devel/examples/oregonator.xmds, + trunk/xmds-devel/examples/thermkin.xmds: Added GPL header. + +2004-08-02 10:04 paultcochrane + + * trunk/xmds-devel/source/xmdsoutput.cc: Changed long to long + unsigned int, which gets rid of a compiler warning, and appears + only because compilers can choose which sign ints can take, hence + being pedantic is the way to go. + +2004-08-02 10:02 paultcochrane + + * trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc: Changed longs to + long unsigned ints. Also fixed warnings that appear due to a + .size() call on a list (which returns int) being given a format + in a printf statement as being a long int. If this isn't quite + the right thing to do then one probably needs to + overload/override the .size() method to return long ints as + opposed to just ints. + +2004-08-02 09:59 paultcochrane + + * trunk/xmds-devel/source/xmdsclasses.h: Changed longs to long + unsigned ints. + +2004-08-02 09:57 paultcochrane + + * trunk/xmds-devel/Makefile.am: Added new example simulations to + list of files to be added when doing a make dist. + +2004-08-02 08:50 paultcochrane + + * trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc: Reformatted code so + it looks nicer. + +2004-08-02 08:47 paultcochrane + + * trunk/xmds-devel/source/xmdsfield.cc: Changed long to long + unsigned int. This is a really pedantic change I know, but we + need to be really explicit so that the code is really + pedantically ansi compliant, and hopefully therefore more + portable. + +2004-08-02 08:45 paultcochrane + + * trunk/xmds-devel/source/xmdsclasses.h: Changed variables declared + as longs to be long unsigned ints. This gets rid of some compiler + warnings, especially between compilers that define ints to be + signed or unsigned on their whim. + +2004-08-02 08:16 paultcochrane + + * trunk/xmds-devel/examples/chain.xmds: Initial import to + repository. This is another chemical kinetics reaction I found + lying around in my sandbox. + +2004-08-02 08:10 paultcochrane + + * trunk/xmds-devel/examples/brusselator.xmds, + trunk/xmds-devel/examples/oregonator.xmds, + trunk/xmds-devel/examples/thermkin.xmds: Initial import to + repository. These are some more example simulations of chemical + kinetics type reactions. + +2004-08-02 08:04 paultcochrane + + * trunk/xmds-devel/benchmark/ndparamp_100.xmds, + trunk/xmds-devel/benchmark/ndparamp_200.xmds, + trunk/xmds-devel/benchmark/ndparamp_50.xmds, + trunk/xmds-devel/benchmark/ndparamp_500.xmds, + trunk/xmds-devel/benchmark/nlse_100.xmds, + trunk/xmds-devel/benchmark/nlse_1000.xmds, + trunk/xmds-devel/benchmark/nlse_10000.xmds, + trunk/xmds-devel/benchmark/nlse_500.xmds, + trunk/xmds-devel/benchmark/nlse_5000.xmds: Removed the + binary_output tag as it is now obsolete. + +2004-08-02 08:02 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Stopped storing all of + the description text; we weren't using it anyway. There is now a + message added to say that the description has been found, and to + look in the xmds file for more info. The reason for this change + is because if the description is too big, then this causes a + buffer overflow and all kinds of wierd things can happen. I have + commented out the original code that read the description in. + +2004-07-30 07:43 joehope + + * trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsvector.cc: Allowed integrate moment + groups to deal with mixed spaces and MPI transposed spaces + properly. + +2004-07-30 06:56 joehope + + * trunk/xmds-devel/source/xmdsfield.cc: Fixed the close_loops + function which used to be simply wrong for mixed spaces. + +2004-07-30 06:02 joehope + + * trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsvector.cc: Fixed a bug where some + mixed spaces were incorrectly recognised as being in the + transposed order for deterministic MPI solutions. + +2004-07-29 08:28 joehope + + * trunk/xmds-devel/examples/highdim.xmds: Added example syntax for + the new elements in the evolution. + +2004-07-29 08:27 joehope + + * trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc: Added the option of + putting elements as well as elements + in blocks. + elements let you define moments that are + integrated through any number of transverse dimensions, + so XMDS can now evolve equations that depend on integrals of the + fields. + Also added and elements to + elements. + + You can put as many as you like, of any dimension, in any order. + The element defines the position + of the or code, so it is now mandatory. + Sample syntax will be added to an example. + +2004-07-27 07:33 paultcochrane + + * trunk/xmds-devel/source/xmlparser.cc: Cast a variable as + unsigned. This stopped a warning message turning up in the + compiler output due to an integer which should have been cast as + unsigned. + +2004-07-27 07:31 paultcochrane + + * trunk/xmds-devel/source/xmdsvectorelement.cc: Fixed error whereby + an extra comma was added to a fprintf statement, and hence caused + incorrect output when generating the code for reading in an input + file. + +2004-07-27 06:45 paultcochrane + + * trunk/xmds-devel/source/getopt_xmds_init.c: Replaced C++ comments + with C-style comments. This stops some compilers complaining. + +2004-07-23 07:27 joehope + + * trunk/xmds-devel/source/xmdsfield.cc: Fixes problem when multiple + FFTW plans were created using wisdom. The + variables used for the wisdom manipulation are all now local + variables, so there are no more multiple definitions. + +2004-07-21 05:45 joehope + + * trunk/xmds-devel/source/xmdsoutput.cc: Added the command line + variables to the element in the output tag. + This will make the xsil file completely self documenting. + +2004-07-19 03:59 paultcochrane + + * trunk/xmds-devel/admin/xmdsReleaseProcedure.pod: Found a command + to put on its own line that I'd missed. + +2004-07-19 03:57 paultcochrane + + * trunk/xmds-devel/MANIFEST: Updated manifest to xmds-1.3-5. + +2004-07-19 03:56 paultcochrane + + * trunk/xmds-devel/admin/xmdsReleaseProcedure.pod: Put all of the + commands to run on their own line. + +2004-07-19 03:53 paultcochrane + + * trunk/xmds-devel/ChangeLog: Updated with cvs2cl.pl + +2004-07-19 03:52 paultcochrane + + * trunk/xmds-devel/README, trunk/xmds-devel/README.Windows: Changed + xmds-1.3-4 to xmds 1.3-5. + +2004-07-19 03:43 paultcochrane + + * trunk/xmds-devel/ChangeLog: Updated with cvs2cl.pl + +2004-07-19 03:42 paultcochrane + + * trunk/xmds-devel/source/loadxsil.m: Now detecting when there are + more than two independent variables when loading binary data and + output an error saying that one should use ascii data and + xsil2graphics to get around the problem. The file still works for + less than two independent variables (or less) with binary data + and for any number of variables with ascii data (but one might as + well just use xsil2graphics in that case). + +2004-07-19 03:40 paultcochrane + + * trunk/xmds-devel/source/getopt_xmds.h: Fixed warnings that were + produced as a result of having C++ comments within a C file (and + when using -pedantic and -ansi). Having C++ style comments isn't + a problem with modern compilers, however it's nice for users to + not have warnings come up when xmds compiles. + +2004-07-16 04:02 paultcochrane + + * trunk/xmds-devel/examples/atomlaser.xmds: Removed + precision=single bit from output tag. + +2004-07-16 03:46 paultcochrane + + * trunk/xmds-devel/admin/xmdsReleaseProcedure.pod: Added more + detailed info about how to perform a release of the xmds + documentation. Put the tagging commands earlier in the list of + things to do before making a release, and mentioned the format of + the tag to use. Also added the actual commands to use. + +2004-07-16 03:25 paultcochrane + + * trunk/xmds-devel/admin/xmdsReleaseProcedure.pod: Changed the + order of when the Readmes are updated and when the ChangeLog is + updated. Added a line explaining how one should check to see if + the cvs and/or the local repository needs updating before running + a make dist. + +2004-07-16 03:20 paultcochrane + + * trunk/xmds-devel/ChangeLog: Updated to current output of + cvs2cl.pl. + +2004-07-16 03:19 paultcochrane + + * trunk/xmds-devel/admin/xmdsReleaseProcedure.pod: We're now + automatically generating the ChangeLog with cvs2cl.pl, so have + changed what to do as far as that is concerned. + +2004-07-16 03:16 paultcochrane + + * trunk/xmds-devel/ChangeLog: Updated to current output of + cvs2cl.pl. + +2004-07-16 03:12 paultcochrane + + * trunk/xmds-devel/README.Windows: Made mention of the fact that + fftw must be installed after cygwin is installed. Also added a + description of the steps required to build and install fftw. + Fixed up the step numbering as necessary. Added + --with-fftw-path=/usr/local to the configure option to the xmds + build procedure, as this *should* be where fftw is installed, + assuming that the user followed the instructions higher up in the + file. Removed some comments reminding me to do stuff. + +2004-07-16 01:27 paultcochrane + + * trunk/xmds-devel/admin/cvs2cl.pl: Initial import to repository. + This is the cvs to ChangeLog script that generates the ChangeLog. + +2004-07-15 07:27 joehope + + * trunk/xmds-devel/source/xmdsoutput.cc: Moved tags down + above the data to make the XSIL file valid XML. This fixed a + parsing error from xsil2graphics. + +2004-07-14 11:48 paultcochrane + + * trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmdsoutput.cc: Finally got grabbing and + splitting up and escaping quote issues in the script code + grabbing code. This is quite a big change, and means that xmds + produced scripts now compile ok on linux and the APAC sc. I + haven't tested anything else, but it's 10pm, and I've finally + fixed the damned thing, and I'm going home (yay). + +2004-07-14 06:37 joehope + + * trunk/xmds-devel/ChangeLog, + trunk/xmds-devel/examples/atomlaser.xmds, + trunk/xmds-devel/examples/fibre.xmds, + trunk/xmds-devel/examples/fisher_reaction_diffusion.xmds, + trunk/xmds-devel/examples/fullpos3D.xmds, + trunk/xmds-devel/examples/gaugeatomlaser.xmds, + trunk/xmds-devel/examples/highdim.xmds, + trunk/xmds-devel/examples/hires.xmds, + trunk/xmds-devel/examples/kubo.xmds, + trunk/xmds-devel/examples/lorenz.xmds, + trunk/xmds-devel/examples/ndparamp.xmds, + trunk/xmds-devel/examples/nlse.xmds, + trunk/xmds-devel/examples/pendulum.xmds, + trunk/xmds-devel/examples/ring_modulator.xmds, + trunk/xmds-devel/examples/sine.xmds, + trunk/xmds-devel/examples/soliton.xmds, + trunk/xmds-devel/examples/tla.xmds, + trunk/xmds-devel/examples/vibstring.xmds, + trunk/xmds-devel/source/main.cc: Changed the examples and + template to ascii output until binary output is robust. + +2004-07-14 04:27 joehope + + * trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc: Fixed bug where nested + subsequences could count moment samples incorrectly. + The field moment samples were being counted at the start of each + sequence + rather than at the start of the simulation. + +2004-07-14 01:32 joehope + + * trunk/xmds-devel/source/xmdsmomentgroup.cc: Verbose mode now + mentions the addition of samples to the moment groups. + +2004-07-13 08:46 paultcochrane + + * trunk/xmds-devel/source/xmdsargelement.cc: Removed a trigraph. + Added a test to see if a short option was actually found, and if + no short option could be worked out, then xmds barfs with a + reasonably helpful error message. Also fixed a typo in one of the + comments. + +2004-07-13 07:52 paultcochrane + + * trunk/xmds-devel/configure.in: Added the threads checking stuff + back in. However, to enable this option, one needs to use + --enable-threads at the configuration step. I put this back in so + that if someone does want to use threads, then at least the + checking and configuration is built in. The code that was + originally there is now wrapped in an if loop, and is only + executed if --enable-threads is set. + +2004-07-13 07:25 paultcochrane + + * trunk/xmds-devel/configure.in: added -pedantic flag to CFLAGS and + CXXFLAGS variables for building of xmds and the -ansi flag to the + CXXFLAGS variable. + +2004-07-13 07:24 paultcochrane + + * trunk/xmds-devel/source/kissdom.h, + trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmlbasics.h: Removed fake trigraphs + (obsolecent feature of C) that were in the comments. + +2004-07-13 06:16 paultcochrane + + * trunk/xmds-devel/source/xmdsutils.h: Fixed problem with trailing + comma in enumeration. This was found by using the -pedantic flag + to gcc. + +2004-07-13 05:29 paultcochrane + + * trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmdsarg.cc, + trunk/xmds-devel/source/xmdsargelement.cc, + trunk/xmds-devel/source/xmdsargv.cc, + trunk/xmds-devel/source/xmdsbreakpoint.cc, + trunk/xmds-devel/source/xmdselement.cc, + trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsglobals.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateex.cc, + trunk/xmds-devel/source/xmdsintegrateip.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegraterk4ex.cc, + trunk/xmds-devel/source/xmdsintegraterk4ip.cc, + trunk/xmds-devel/source/xmdsintegratesi.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdsoutput.cc, + trunk/xmds-devel/source/xmdssegment.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc, + trunk/xmds-devel/source/xmdsutils.cc, + trunk/xmds-devel/source/xmdsvector.cc, + trunk/xmds-devel/source/xmdsvectorelement.cc, + trunk/xmds-devel/source/xmlbasics.cc, + trunk/xmds-devel/source/xmlparser.cc, + trunk/xmds-devel/source/xsil2graphics.cc, + trunk/xmds-devel/source/xsilfield.cc: Added braces to if, while + and for statements. They weren't necessary, however, it does make + the code a bit nicer, in terms of style, it might save a few bugs + in the future, and it really should be used when the if, while or + for has nested if, while or for statements. I hope this reduces + someone's pain in the future. + +2004-07-09 06:47 joehope + + * trunk/xmds-devel/source/xmdsfield.cc: cstr() should be c_str() + +2004-07-09 06:35 joehope + + * trunk/xmds-devel/source/xmdsfield.cc: Attempt to stop a very rare + crash when a deterministic MPI script is written + without any Fourier space elements anywhere. Forces plans to + always be written. + This could be done with slightly greater finesse by testing for + the existence + of "main_forward_plan" and setting the appropriate variables + manually if it + doesn't exist. + +2004-07-09 05:29 joehope + + * trunk/xmds-devel/source/xmdsvectorelement.cc: Forcing abort when + input file is misread. + +2004-07-01 05:26 paultcochrane + + * trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/main.cc: Added braces to if, while and + for statements. They weren't necessary, however, it does make the + code a bit nicer, in terms of style, it might save a few bugs in + the future, and it really should be used when the if, while or + for has nested if, while or for statements. This exercise fixed + two possible bugs where there was a trailing semicolon on the + statement. I hope this reduces someone's pain in the future. + +2004-06-30 10:23 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Commented out some + legacy code that's not doing anything anymore. I'm keeping it + around for a while before I delete it (doesn't hurt). + +2004-06-30 10:22 paultcochrane + + * trunk/xmds-devel/source/main.cc: Updated the documentation + version numbering output from xmds-1.3-4 to xmds-1.3-5. + +2004-06-30 10:20 paultcochrane + + * trunk/xmds-devel/source/getopt_xmds_init.c: Added a dummy + statement to avoid a warning that some compilers throw up when + the ifdef isn't executed, and hence there aren't any executable + statements in the file. Also added some comments explaining this. + +2004-06-30 10:18 paultcochrane + + * trunk/xmds-devel/configure.in: Changed the release number from 4 + to 5. Added a check for the Tru64 compiler and then set the + __USE_STD_IOSTREAM appropriately if it is. Added a check for if + mpicc is *not* set, but mpi is enabled and then if so, setting + MPICC to the system C++ compiler. Fixed bug whereby LIBS variable + should have been XMDS_LIBS, and CFLAGS should have been + XMDS_CFLAGS. Hopefully this stuff gets xmds configuring and + compiling better on Tru64 machines. + +2004-06-30 10:15 paultcochrane + + * trunk/xmds-devel/README.Windows: Added some more helpful comments + about how to use the configure script, where to look for more + information, and how to solve the common fftw path problem. + +2004-06-30 10:14 paultcochrane + + * trunk/xmds-devel/README: Tidied up the formatting of the text + somewhat. Hopefully made a bit clearer that the switches are + directly to do with the configure command. + +2004-06-30 07:26 paultcochrane + + * trunk/xmds-devel/man, trunk/xmds-devel/man/loadxsil.1, + trunk/xmds-devel/man/xmds.1, + trunk/xmds-devel/man/xsil2graphics.1: Initial import to + repository. These are the automatically generated man pages from + the pod in the xmds-doc project. + +2004-06-30 07:20 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Removed some + whitespace. + +2004-06-30 07:19 paultcochrane + + * trunk/xmds-devel/source/xmdsoutput.cc: Implemented breakup of + simulation text into header, body and footer. I reconstruct this + text here. A lot of the changes in this commit are commenting out + lines of code in the generated code (ie the stuff that is + generated isn't actually executed and is in fact ignored by the + compiler). I left the code in at this stage as this is still an + experimental process and it will be easier to back out the + changes by leaving the legacy stuff in there. This change has + removed the need for xmds simulations to use the system() call + and the split system command to be able to write the output. I + also put some info text into the output xml/xsil which tells + which version of xmds produced the file. + +2004-06-30 07:15 paultcochrane + + * trunk/xmds-devel/source/xmdsmomentgroup.cc: Fixed error whereby + the Metalink xml tag should have had a /> at the end instead of + just >. + +2004-06-30 07:14 paultcochrane + + * trunk/xmds-devel/source/main.cc: Implemented the splitting up of + the xmds simulation text before the parsing starts. I split the + text into a header, body and footer, and then recombine these + later when getting the simulation to write the xsil file. This + removes the need to use the split system command, and removes + some more of the system() calls in the xmds engine. Added heaps + of comments of how I'm going about stuff, and added some verbose + output to make sure it's doing what it should be doing. At + present I'm implementing this as global variables; perhaps this + really should be done through and object interface, however, this + is easy and it works, we just have to be careful. Also updated + the documentation version number to xmds-1.3-4. + +2004-06-29 07:21 joehope + + * trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc: Fix for problem in + if statements. + +2004-06-29 07:13 joehope + + * trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc: Allows number of + samples in an integrate block to be zero without trouble. + +2004-06-26 05:29 paultcochrane + + * trunk/xmds-devel/source/main.cc: Grabbing the simulation text for + splitting up the xmds script for later use at the output stage. + +2004-06-25 05:28 joehope + + * trunk/xmds-devel/configure.in, + trunk/xmds-devel/examples/atomlaser.xmds: Removed redundant code + to do with choosing thread-compliant compilers + for the code generator. + +2004-06-24 08:12 joehope + + * trunk/xmds-devel/source/getopt_xmds.c, + trunk/xmds-devel/source/getopt_xmds.h, + trunk/xmds-devel/source/getopt_xmds1.c, + trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xsil2graphics.cc: Changing names of + extern variables in getopt functions. Removes further conflicts. + +2004-06-24 07:19 joehope + + * trunk/xmds-devel/source/xmdscomplex.h: Forcing the operator + overloads to be C++. This was not automatic for all compilers. + +2004-06-24 06:42 joehope + + * trunk/xmds-devel/ChangeLog, trunk/xmds-devel/MANIFEST, + trunk/xmds-devel/admin/xmds.spec, + trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/getopt_xmds.c, + trunk/xmds-devel/source/getopt_xmds.h, + trunk/xmds-devel/source/getopt_xmds1.c, + trunk/xmds-devel/source/getopt_xmds_init.c, + trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc, + trunk/xmds-devel/source/xsil2graphics.cc: Adjusted getopt to + getopt_xmds to remove conflicts with + predefined functions in the standard libraries of some systems + +2004-06-23 08:21 paultcochrane + + * trunk/xmds-devel/admin/xmdsReleaseProcedure.pod: Removed + newsgroup posting instruction, because this is not a good thing + to do, and I got a bit stung from doing it this time. + +2004-06-22 10:44 paultcochrane + + * trunk/xmds-devel/Makefile.am: Added new examples to be added at + make dist time. + +2004-06-22 10:18 paultcochrane + + * trunk/xmds-devel/examples/duffing.xmds: Intitial import to + repository. This is an example simulation of Duffing's equations. + +2004-06-22 10:18 paultcochrane + + * trunk/xmds-devel/examples/krebs.xmds: Initial import to + repository. This is an example simulation of a simplified Krebs + cycle of biochemical reations. + +2004-06-22 10:17 paultcochrane + + * trunk/xmds-devel/examples/chemkin.xmds: Initial import to + repository. This is an example simulation of a chemical kinetic + reation in chemistry. + +2004-06-22 10:16 paultcochrane + + * trunk/xmds-devel/examples/catcycle.xmds: Initial import to + repository. This is an example simulation of a catalytical cycle + reation in chemistry. + +2004-06-22 10:16 paultcochrane + + * trunk/xmds-devel/examples/branch.xmds: Initial import to + repository. This is an example simulation of a branching reaction + in chemistry. + +2004-06-21 09:28 paultcochrane + + * trunk/xmds-devel/admin/xmds.spec: Still trying to get the .spec + file to work. Tried changing the prefix sent to configure. I + think I need to rework the configuration step of xmds to iron out + these wrinkles. + +2004-06-20 23:48 paultcochrane + + * trunk/xmds-devel/admin/xmdsNewsPost.pl: Removed sci.math.research + as this is a moderated group, and posting xmds announcements + isn't appropriate. + +2004-06-18 06:51 paultcochrane + + * trunk/xmds-devel/admin/xmds.spec: Initial import to repository. + This is the rpm .spec file that Greg Collecutt used to use to + build xmds. I'm now trying to hack it to build the current + version(s). + +2004-06-18 06:28 paultcochrane + + * trunk/xmds-devel/admin/xmdsReleaseProcedure.pod: Added comment + that the source files should be tagged appropriately. That + xmds.org needs updating. That an email to xmds-announce is a good + idea. And that sending a post to the relevant newsgroups, by + using the xmdsNewsPost.pl script would be a (possibly) good idea. + +2004-06-18 06:25 paultcochrane + + * trunk/xmds-devel/admin/xmdsNewsPost.pl: Fixed a bug whereby the + subject and newsgroup kept getting prepended to the message text, + so eventually everyone in the last newsgroup to be posted to, + could tell where else I'd posted the message. Not happy that this + happened. Really not happy. + +2004-06-18 06:09 paultcochrane + + * trunk/xmds-devel/admin/xmdsNewsPost.txt: Initial import to + repository. This file is the news post sent as a result of + running the xmdsNewsPost.pl script. This file needs to be updated + whenever a new xmds version is released, and posted + appropriately. + +2004-06-18 06:08 paultcochrane + + * trunk/xmds-devel/admin/xmdsNewsPost.pl: Initial import to + repository. This is a perl script to automatically post the xmds + release announcement to a list of possibly interested newsgroups. + +2004-06-18 01:58 paultcochrane + + * trunk/xmds-devel/admin/xmdsReleaseProcedure.pod: Initial import + to repository. This is the procedure one should perform to + properly release xmds onto the sourceforge site (and the world in + general). + +2004-06-18 01:31 paultcochrane + + * trunk/xmds-devel/README.Windows: Converted from dos format to + unix format. Updated to xmds-1.3-4, and to new syntax for + xsil2graphics. + +2004-06-18 01:26 paultcochrane + + * trunk/xmds-devel/README: Updated to current version of xmds + (1.3-4). Added a comment on how to access the man pages that are + now installed as part of xmds. Updated the xsil2graphics syntax + in the example given. Expanded the description of what xmds is at + the top of the file. + +2004-06-17 07:18 paultcochrane + + * trunk/xmds-devel/ChangeLog: Updated changelog to current version + of xmds, highlighting the current set of major changes to the + code base. + +2004-06-17 06:00 paultcochrane + + * trunk/xmds-devel/MANIFEST: Updated to current version of xmds + (1.3-4). + +2004-06-17 05:45 paultcochrane + + * trunk/xmds-devel/source/xsil2graphics.cc: Added a mention of the + xmds web site in the usage output. Also tidied some of the text + in the display_usage function. + +2004-06-16 03:49 paultcochrane + + * trunk/xmds-devel/source/xsil2graphics.cc: Changed display usage + to use less printf calls. Also makes the code look better + +2004-06-16 02:04 paultcochrane + + * trunk/xmds-devel/source/main.cc: Changed an exit statement to a + return 0 to be more consistent with the other returning + conventions. Don't know if the current convention is that great + as it reports that everything went ok, as opposed to if something + went wrong. Again, this is something to chuck into the todo list. + +2004-06-16 02:02 paultcochrane + + * trunk/xmds-devel/source/xsil2graphics.cc: converted xsil2graphics + argument parsing to the gnu getopt form. It therefore changes the + old style arguments of -matlab and -scilab to --matlab and + --scilab respectively. Also, it requires -o or --outfile if one + wants to specify and alternative output filename, so one can't do + xsil2graphics blah.xsil moo.m anymore, it must be xsil2graphics + blah.xsil --output moo.m. Also added some more helpful output + information. + +2004-06-15 12:22 paultcochrane + + * trunk/xmds-devel/source/main.cc: Converted the command line + argument parsing code to use the getopt library. Now we have long + and short options and a mix if we so desire. Also changed some of + the formatting of the template code, and changed the + display_usage() output so that it is a bit more accurate, + informative and a little better looking. One big thing to note + here is the change of the compilation flag, this is now either -n + or --nocompile, note that previously this was -c, although I + don't think that many people actually used it. + +2004-06-15 12:19 paultcochrane + + * trunk/xmds-devel/configure.in: Added -lxmds and -L. to the LIBS + variable, so that xmds gets built with libxmds and so it can see + the getopt libraries within libxmds. + +2004-06-15 09:18 paultcochrane + + * trunk/xmds-devel/source/xmdsmomentgroup.cc: Tidied up a problem I + found with the xsil output when using binary. I'd just changed + the output filename of binary files for more consistent naming + wrt moment group output, and hadn't set the correct filename in + the .xsil output. + +2004-06-15 09:08 paultcochrane + + * trunk/xmds-devel/source/xmdsmomentgroup.cc: Made the output + moment group number for binary output data files agree with what + the moment group number actually is. + +2004-06-15 09:06 paultcochrane + + * trunk/xmds-devel/source/Makefile.am: Added a target for + loadxsil.m to be automatically installed at make install time for + xmds. It goes in the bindir at this stage, so will get installed + in the user's bin directory (if --with-users is set) or in the + /usr/local/bin directory if root is doing the installing. + +2004-06-15 09:05 paultcochrane + + * trunk/xmds-devel/Makefile.am: Moved position of loadxsil.m entry. + The only reason I did this was so that I could comment it out + when testing some code. + +2004-06-15 06:46 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Fixed bug with + incorrect parsing of noises tag. I'd used a suite of if + statements instead of an if-else if-else loop construction. Added + some debugging code as well, for when xmds -d is used. + +2004-06-15 01:30 paultcochrane + + * trunk/xmds-devel/examples/diffusion.xmds: Made the lattice size + of the transverse dimension a multiple of two so that the + numerics are faster + +2004-06-15 01:29 paultcochrane + + * trunk/xmds-devel/examples/atomlaser.xmds, + trunk/xmds-devel/examples/fibre.xmds, + trunk/xmds-devel/examples/ndparamp.xmds, + trunk/xmds-devel/examples/nlse.xmds: Removed text about + deprecated feature of binary_output and use_double tags. This is + actually now an obsolete syntax + +2004-06-15 01:16 paultcochrane + + * trunk/xmds-devel/source/loadxsil.m: Tidied up the text that is + printed to screen. Some of output enclosed in an if loop + controlled by the new debug variable. More informative output as + to whether data is single or double precision. + +2004-06-14 10:22 paultcochrane + + * trunk/xmds-devel/configure.in: Added mandir assignments so that + the man pages are installed in the correct locations depending + upon whether the defaults are given, a prefix, or xmds is being + user installed + +2004-06-14 10:21 paultcochrane + + * trunk/xmds-devel/Makefile.am: Added + fisher_reaction_diffusion.xmds to list of examples to distribute. + Added a manfiles variable with the man pages to be installed. + Added the manfiles variable to the EXTRA_DIST variable so that + the files are added to the distro and installed with make install + +2004-06-14 10:07 paultcochrane + + * trunk/xmds-devel/examples/fisher_reaction_diffusion.xmds: Initial + import to repository. This is an example simulation of the Fisher + reaction diffusion equation for use in theoretical population + genetics. + +2004-06-14 06:41 paultcochrane + + * trunk/xmds-devel/source/xmdssequence.cc: Added code to print an + audible bell character at the end of a simulation if the + tag is set to yes. This is a tag to optionally add a noise + letting the user know when the simulation is complete. + +2004-06-14 06:40 paultcochrane + + * trunk/xmds-devel/source/xmdsclasses.h: Added boolean variable + holding value of whether or not the tag is set to yes or + no. This is a tag to optionally add a noise letting the user know + when the simulation is complete. + +2004-06-14 06:39 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Added parsing code for + the tag. This is a tag to optionally add a noise letting + the user know when the simulation is complete. + +2004-06-14 06:37 paultcochrane + + * trunk/xmds-devel/MANIFEST: Updated to current list of files in + xmds-1.3-3 release + +2004-06-14 06:37 paultcochrane + + * trunk/xmds-devel/configure.in: Updated release number to current + (pre) release number of 1.3-4 + +2004-06-14 06:36 paultcochrane + + * trunk/xmds-devel/Makefile.am: Added hires, lane_emden, + paraxial_wave, ring_modulator and van_der_pol examples to list of + examples to add to distribution. Removed dependence of latexdocs + and apifiles for EXTRA_DIST variable since they are in separate + parts of the overall xmds project now + +2004-06-14 06:32 paultcochrane + + * trunk/xmds-devel/examples/hires.xmds: Initial import to + repository. This is the high irradiance response in + photomorphogenesis example simulation. + +2004-06-14 05:57 paultcochrane + + * trunk/xmds-devel/examples/ring_modulator.xmds: Initial import to + repository. This is an example simulation of the ring modulator + circuit of electronics. + +2004-06-12 09:42 paultcochrane + + * trunk/xmds-devel/source/xmdsoutput.cc: Added a comment so that + users know when output is being generated. This can be handy to + know when large files are being output, so that one can wait and + not think that the process has hung. + +2004-06-12 09:41 paultcochrane + + * trunk/xmds-devel/source/main.cc: Fixed error whereby the CC + variable was used as the C compiler that xmds uses, whereas + should have been XMDS_CC. The MPICC variable being printf-ed + separately caused a warning message to come up in compilation of + xmds. I moved this into one of the other statements so that when + MPICC was a null variable, no warning is printed. + +2004-06-05 05:40 paultcochrane + + * trunk/xmds-devel/examples/paraxial_wave.xmds: Fixed up some of + the numbers and the equations defining the slits etc. + +2004-06-04 03:35 paultcochrane + + * trunk/xmds-devel/examples/paraxial_wave.xmds: Fixed minor bug. I + had a superfluous y variable floating around. + +2004-06-04 03:33 paultcochrane + + * trunk/xmds-devel/examples/paraxial_wave.xmds: Initial import to + repository. This is an example simulation of the paraxial wave + equation for double slit interference. + +2004-05-31 06:01 paultcochrane + + * trunk/xmds-devel/ChangeLog: Updated to current version of xmds; + namely 1.3-3. Described new features in this version. + +2004-05-31 04:08 paultcochrane + + * trunk/xmds-devel/source/loadxsil.m: Fixed problem with loadxsil + associated with change made a few versions of xmds ago to + deprecate the use of and which are + now implemented as attributes of the tag. + +2004-05-31 03:26 paultcochrane + + * trunk/xmds-devel/examples/van_der_pol.xmds: Initial import to + repository. This is an example simulation of the Van der Pol + oscillator. + +2004-05-31 03:15 paultcochrane + + * trunk/xmds-devel/examples/lane_emden.xmds: Initial import to + repository. This is an example simulation of the Lane-Emden + equation in astrophysics. + +2004-05-19 10:07 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Now barfing when xmds + finds the binary_output and/or use_double tags and prints a + message telling the user how to fix the problem (basically to use + the new/right syntax). Thanks to Joe Hope for the idea. + +2004-05-18 10:25 paultcochrane + + * trunk/xmds-devel/source/xmdsutils.cc: Implemented throwing an + exception when the poissonian attribute is given but no mean + attribute given. Also noticed that the implementation of + getAttributeStrings is suboptimal in that it borrows far too much + from getAssignmentStrings and doesn't actually check everything + properly. This needs to be tidied. The code works atm, but it is + ugly and needs to be improved. This issue has been added to the + todo list for output into doxygen + +2004-05-18 10:22 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Implemented a + Poissonian noise distribution based on that in chapter 7 of + Numerical Recipes. The output looks good at this stage, but more + testing is necessary. Added the correct prototype declarations + for each of the noise options as well, and made sure that when + the poissonian noise is called, that the mean attribute is also + specified. + +2004-05-18 10:19 paultcochrane + + * trunk/xmds-devel/source/xmdsclasses.h: Added a declaration for + the mean of a poissonian noise distribution + +2004-05-18 10:18 paultcochrane + + * trunk/xmds-devel/examples/kubo.xmds: Switched off mpi, and + implemented the kind attribute of the noises tag. + +2004-05-18 10:02 paultcochrane + + * trunk/xmds-devel/configure.in: Updated the version and release + numbers to their current values (1.3-3). + +2004-05-18 07:46 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Implemented parsing + code for having a kind attribute to the noises tag. This at + present accepts gaussian, poissonian (not yet implemented), + gaussFast (a slightly faster version of the gaussian generation + routines) and uniform. Gaussian, gaussFast and uniform have been + implemented and tested and seem to go alright. Tests show between + 7 and 20 percent increase in speed if gaussFast is used. + +2004-05-18 07:42 paultcochrane + + * trunk/xmds-devel/source/xmdsclasses.h: Added declaration for the + XMLString holding the variable that defines the kind of noise to + generate + +2004-05-12 06:18 paultcochrane + + * trunk/xmds-devel/MANIFEST: Updated manifest to current release + version (1.3-2). + +2004-05-12 06:16 paultcochrane + + * trunk/xmds-devel/NEWS: Updated to current version of xmds, ready + for release + +2004-05-12 06:11 paultcochrane + + * trunk/xmds-devel/ChangeLog: Trivial change + +2004-05-12 06:08 paultcochrane + + * trunk/xmds-devel/ChangeLog: Added changes to xmds since last + release + +2004-05-12 05:31 paultcochrane + + * trunk/xmds-devel/Makefile.am: Made an explicit list of the + example xmds files to include in the distribution. Previously all + of my test xmds scripts were added, and that just didn't look + good + +2004-04-29 03:23 paultcochrane + + * trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/kissdom.h, + trunk/xmds-devel/source/xmdsarg.cc, + trunk/xmds-devel/source/xmdsargelement.cc, + trunk/xmds-devel/source/xmdsbreakpoint.cc, + trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdselement.cc, + trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsglobals.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateex.cc, + trunk/xmds-devel/source/xmdsintegrateip.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegraterk4ex.cc, + trunk/xmds-devel/source/xmdsintegraterk4ip.cc, + trunk/xmds-devel/source/xmdsintegratesi.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdsoutput.cc, + trunk/xmds-devel/source/xmdssegment.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc, + trunk/xmds-devel/source/xmdsutils.cc, + trunk/xmds-devel/source/xmdsutils.h, + trunk/xmds-devel/source/xmdsvector.cc, + trunk/xmds-devel/source/xmdsvectorelement.cc, + trunk/xmds-devel/source/xmlbasics.cc, + trunk/xmds-devel/source/xmlbasics.h, + trunk/xmds-devel/source/xmlparser.cc, + trunk/xmds-devel/source/xmlparser.h, + trunk/xmds-devel/source/xsil2graphics.cc, + trunk/xmds-devel/source/xsilfield.cc, + trunk/xmds-devel/source/xsilfield.h: More completely documented + the code using doxygen. Still lots of stuff that needs doing, + some stuff isn't documented at all, just marked as Undocumented + and a todo command left also signifying that this needs work. + Most of the functions and variables, however, have at least a + brief description of what they are (or what they look like the + could be, as it is quite often *not* obvious as to what a + function or variable does or means. + +2004-04-29 03:19 paultcochrane + + * trunk/xmds-devel/source/main.cc: Documented the code using + doxygen. Fixed up some of the spacing in the template output + code. + +2004-04-28 05:31 paultcochrane + + * trunk/xmds-devel/source/main.cc: Moved the comment regarding + global system parameters and system functionality (for generation + of a template code) to just below the name and description + elements + +2004-04-28 05:12 paultcochrane + + * trunk/xmds-devel/examples/lotka_volterra.xmds: Initial import to + repository. This is an example simulation of the Lotka-Volterra + system used as a model of undamped oscillations in autocatalytic + chemical reactions. From initial reading of (mathematical + chemistry) paper to completed xmds script was about 10 minutes! + Wow. Ok, now I'm impressed. + +2004-04-28 01:04 paultcochrane + + * trunk/xmds-devel/examples/atomlaser.xmds, + trunk/xmds-devel/examples/diffusion.xmds, + trunk/xmds-devel/examples/fibre.xmds, + trunk/xmds-devel/examples/fullpos3D.xmds, + trunk/xmds-devel/examples/gaugeatomlaser.xmds, + trunk/xmds-devel/examples/highdim.xmds, + trunk/xmds-devel/examples/kubo.xmds, + trunk/xmds-devel/examples/lorenz.xmds, + trunk/xmds-devel/examples/ndparamp.xmds, + trunk/xmds-devel/examples/nlse.xmds, + trunk/xmds-devel/examples/pendulum.xmds, + trunk/xmds-devel/examples/sine.xmds, + trunk/xmds-devel/examples/soliton.xmds, + trunk/xmds-devel/examples/tla.xmds, + trunk/xmds-devel/examples/vibstring.xmds: Fixed up author and + description tags so that is a bit more uniform over all of the + examples + +2004-04-28 00:58 paultcochrane + + * trunk/xmds-devel/examples/atomlaser.xmds, + trunk/xmds-devel/examples/diffusion.xmds, + trunk/xmds-devel/examples/fibre.xmds, + trunk/xmds-devel/examples/fullpos3D.xmds, + trunk/xmds-devel/examples/gaugeatomlaser.xmds, + trunk/xmds-devel/examples/highdim.xmds, + trunk/xmds-devel/examples/kubo.xmds, + trunk/xmds-devel/examples/lorenz.xmds, + trunk/xmds-devel/examples/ndparamp.xmds, + trunk/xmds-devel/examples/nlse.xmds, + trunk/xmds-devel/examples/pendulum.xmds, + trunk/xmds-devel/examples/sine.xmds, + trunk/xmds-devel/examples/soliton.xmds, + trunk/xmds-devel/examples/tla.xmds, + trunk/xmds-devel/examples/vibstring.xmds: Added CVS Id tag. + +2004-04-28 00:56 paultcochrane + + * trunk/xmds-devel/examples/atomlaser.xmds, + trunk/xmds-devel/examples/diffusion.xmds, + trunk/xmds-devel/examples/fibre.xmds, + trunk/xmds-devel/examples/fullpos3D.xmds, + trunk/xmds-devel/examples/gaugeatomlaser.xmds, + trunk/xmds-devel/examples/highdim.xmds, + trunk/xmds-devel/examples/kubo.xmds, + trunk/xmds-devel/examples/lorenz.xmds, + trunk/xmds-devel/examples/ndparamp.xmds, + trunk/xmds-devel/examples/nlse.xmds, + trunk/xmds-devel/examples/pendulum.xmds, + trunk/xmds-devel/examples/sine.xmds, + trunk/xmds-devel/examples/soliton.xmds, + trunk/xmds-devel/examples/tla.xmds, + trunk/xmds-devel/examples/vibstring.xmds: Added copyright + statement to example files + +2004-04-28 00:43 paultcochrane + + * trunk/xmds-devel/configure.in: Added copyright statement. + +2004-04-28 00:29 paultcochrane + + * trunk/xmds-devel/source/dom3.h, + trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/kissdom.h, + trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmdsarg.cc, + trunk/xmds-devel/source/xmdsargelement.cc, + trunk/xmds-devel/source/xmdsargv.cc, + trunk/xmds-devel/source/xmdsbreakpoint.cc, + trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdscomplex.h, + trunk/xmds-devel/source/xmdselement.cc, + trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsglobals.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateex.cc, + trunk/xmds-devel/source/xmdsintegrateip.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegraterk4ex.cc, + trunk/xmds-devel/source/xmdsintegraterk4ip.cc, + trunk/xmds-devel/source/xmdsintegratesi.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdsoutput.cc, + trunk/xmds-devel/source/xmdssegment.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc, + trunk/xmds-devel/source/xmdsutils.cc, + trunk/xmds-devel/source/xmdsutils.h, + trunk/xmds-devel/source/xmdsvector.cc, + trunk/xmds-devel/source/xmdsvectorelement.cc, + trunk/xmds-devel/source/xmlbasics.cc, + trunk/xmds-devel/source/xmlbasics.h, + trunk/xmds-devel/source/xmlparser.cc, + trunk/xmds-devel/source/xmlparser.h, + trunk/xmds-devel/source/xsil2graphics.cc, + trunk/xmds-devel/source/xsilfield.cc, + trunk/xmds-devel/source/xsilfield.h: Updated copyright statement + to current year + +2004-04-28 00:01 paultcochrane + + * trunk/xmds-devel/benchmark/runbenchmarks: Fixed format of + procTime output. Moved masterData assignment into file test if + loop. Removed use warnings pragma as not supported in older + versions of perl, and the warnings aren't really needed atm. Also + added a variable for the progInfoFname. + +2004-04-27 23:56 paultcochrane + + * trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmdsarg.cc, + trunk/xmds-devel/source/xmdsargelement.cc, + trunk/xmds-devel/source/xmdsargv.cc, + trunk/xmds-devel/source/xmdsbreakpoint.cc, + trunk/xmds-devel/source/xmdselement.cc, + trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsglobals.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateex.cc, + trunk/xmds-devel/source/xmdsintegrateip.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegraterk4ex.cc, + trunk/xmds-devel/source/xmdsintegraterk4ip.cc, + trunk/xmds-devel/source/xmdsintegratesi.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdsoutput.cc, + trunk/xmds-devel/source/xmdssegment.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc, + trunk/xmds-devel/source/xmdsutils.cc, + trunk/xmds-devel/source/xmdsvector.cc, + trunk/xmds-devel/source/xmdsvectorelement.cc, + trunk/xmds-devel/source/xmlbasics.cc, + trunk/xmds-devel/source/xmlparser.cc, + trunk/xmds-devel/source/xsil2graphics.cc, + trunk/xmds-devel/source/xsilfield.cc: Added an @file command so + that doxygen finds and documents the stuff in the file + +2004-04-27 23:55 paultcochrane + + * trunk/xmds-devel/source/Doxyfile: Changed some of the + functionality of the Doxyfile. Added more explicit warnings and + more in-depth documentation of the code (including private bits, + which I don't know if that's a good idea or not). + +2004-04-20 03:51 paultcochrane + + * trunk/xmds-devel/source/main.cc: Added some nice intro text so + that one knows that one has just executed xmds, and that a + template is being output and what the filename is. + +2004-04-20 03:44 paultcochrane + + * trunk/xmds-devel/source/main.cc: Implemented the use of a + template output option of xmds. One merely has to use the -t flag + at the command line for a template xmds script to be output to + stdout. If a filename is given, then the script is sent to that + file, and xmds returns. This is to help those who want to write a + script basically from scratch, but don't want to have to remember + where everything goes and the exact set of tags that are + necessary. The template is currently the one in the + tutTemplateStart.tex file of the latex documentation, and has + more tags than necessary to make a simulation. + +2004-04-19 09:22 paultcochrane + + * trunk/xmds-devel/configure.in: Updated version and release + numbers + +2004-04-19 09:14 paultcochrane + + * trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdsoutput.cc, + trunk/xmds-devel/source/xmdssequence.cc: I finally got sick of + seeing 042's everywhere, and replaced them with double quotes. It + does make things easier to read. + +2004-04-19 08:59 paultcochrane + + * trunk/xmds-devel/source/xmdsoutput.cc: Stuff it, I might as well + chuck in an info footer as well as a header, it doesn't increase + the file size that much. So, I did. + +2004-04-19 08:51 paultcochrane + + * trunk/xmds-devel/source/xmdsoutput.cc: Moved nice version + information stuff that is to be put into the .xsil file here as + opposed to in xmdsmomentgroup.cc. This way it's only mentioned + the once, as opposed to each time a moment group is written out + to file. Also moved where the tag is written, and + added some comments (my God! comments!) to the code. + +2004-04-19 08:48 paultcochrane + + * trunk/xmds-devel/source/xmdsmomentgroup.cc: Moved nice version + information stuff into a better location (namely xmdsoutput.cc) + +2004-04-19 08:40 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Added the version and + release numbers to the list of simulation parameters. Can now + pass these bits of info around so that can generate xmds version + information at parsing and compiling, and in the output .xsil + file. + +2004-04-19 08:37 paultcochrane + + * trunk/xmds-devel/source/xmdsmomentgroup.cc: Added an information + section using tags in the moment group output. This is so + that it is documented which version of xmds generated the output + .xsil file, and so that xmds and its web page get another plug. + +2004-04-19 08:32 paultcochrane + + * trunk/xmds-devel/source/xmdsclasses.h: Added the version and + release numbers to the list of simulation parameters so that can + use these values in the output at the start of parsing and + compiling a simulation, and at the end in the output of the + simulations. + +2004-04-19 08:31 paultcochrane + + * trunk/xmds-devel/source/main.cc: Printing out some info about + xmds at the start of parsing and compiling a simulation. Also + tidied some of the output when parsing and compiling a + simulation. + +2004-04-19 08:28 paultcochrane + + * trunk/xmds-devel/depcomp, trunk/xmds-devel/ltmain.sh: Updated. + +2004-04-06 11:10 paultcochrane + + * trunk/xmds-devel/benchmark/gaugeatomlaser_128.xmds: Initial + import to repository. This is now the correct file to use instead + of gaugeatomlaser.xmds, as the benchmarking code is now much more + general. + +2004-04-06 11:09 paultcochrane + + * trunk/xmds-devel/benchmark/runbenchmarks: I think I've got it all + working now. The masterData variable is being updated + properly, and output to file properly, and then reread properly, + so all good + there. Tested on G3, AMD, and P4. Have now changed the test bench + subroutine + to bench_test and the bench2 subroutine is now bench, so have to + do a proper + run now... + +2004-04-06 10:45 paultcochrane + + * trunk/xmds-devel/benchmark/runbenchmarks: The last message was a + stuff up, however, this one is ok. Now printing all cpus listed + in masterData hash + +2004-04-06 10:42 paultcochrane + + * trunk/xmds-devel/benchmark/runbenchmarks: Added cpu information + to master data hash table + +2004-04-06 10:40 paultcochrane + + * trunk/xmds-devel/benchmark/runbenchmarks: Added cpu information + to master data hash table + +2004-04-06 10:29 paultcochrane + + * trunk/xmds-devel/benchmark/runbenchmarks: Implemented output of + html of benchmark data. Implemented dumping of data + using Data::Dumper, and reading the data back in (hopefully). + Implemented + html output of the verbose cpu information, which is linked to + the main + benchmarks html file. + +2004-04-06 08:26 paultcochrane + + * trunk/xmds-devel/benchmark/runbenchmarks: Added some comments and + removed some superfluous code. + +2004-04-06 08:20 paultcochrane + + * trunk/xmds-devel/benchmark/runbenchmarks: Added the code of bench + as a subroutine to runbenchmarks. Also added a testing + subroutine so that I don't have to wait for all of the sims to + finish before + I can make sure that the code works. Implemented the use of the + bench + subroutine and collection of the average time into the benchData + hash. + +2004-04-06 07:51 paultcochrane + + * trunk/xmds-devel/benchmark/runbenchmarks: Added a check for + linux, if so, then cpuinfo is obtained (which is slightly + different for LinuxPPC and for LinuxX86) and then a shorter + version of this + information is kept. If not linux, then the system info is + determined by + using the Config module of Perl and the info that configured Perl + on that + system. + +2004-04-06 06:58 paultcochrane + + * trunk/xmds-devel/benchmark/bench: Implemented shorter version of + previous code using timeit instead of the Benchmark objects + +2004-04-06 06:53 paultcochrane + + * trunk/xmds-devel/benchmark/runbenchmarks: Initial import to + repository. This is the wrapper script that runs the + bench script on all of the various xmds scripts. + +2004-04-06 06:52 paultcochrane + + * trunk/xmds-devel/benchmark/nlse_100.xmds, + trunk/xmds-devel/benchmark/nlse_1000.xmds, + trunk/xmds-devel/benchmark/nlse_10000.xmds, + trunk/xmds-devel/benchmark/nlse_500.xmds, + trunk/xmds-devel/benchmark/nlse_5000.xmds: Initial import to + repository. This is the nonlinear Schroedinger equation + simulation for various lattice sizes. + +2004-04-06 06:51 paultcochrane + + * trunk/xmds-devel/benchmark/ndparamp_100.xmds, + trunk/xmds-devel/benchmark/ndparamp_200.xmds, + trunk/xmds-devel/benchmark/ndparamp_50.xmds, + trunk/xmds-devel/benchmark/ndparamp_500.xmds: Initial import to + repository. This is the N-dimensional parametric oscillator + simulation for various lattice sizes. + +2004-04-06 06:50 paultcochrane + + * trunk/xmds-devel/benchmark/gaugeatomlaser.xmds: Initial import to + repository. This is the gaugeatomlaser simulation which + is used to really test how hard the cpu can go (sims take about + three hours on + new 64 bit AMD machines). + +2004-04-06 06:49 paultcochrane + + * trunk/xmds-devel/benchmark/fullpos3D_16.xmds, + trunk/xmds-devel/benchmark/fullpos3D_32.xmds, + trunk/xmds-devel/benchmark/fullpos3D_64.xmds: Initial import to + repository. This is the fullpos3D simulation for various + lattice sizes. + +2004-04-06 06:45 paultcochrane + + * trunk/xmds-devel/benchmark, trunk/xmds-devel/benchmark/bench: + Initial import to repository. This is the basic script that + compiles, runs + a first go of a simulation and then runs the simulation a few + times (at + present three) giving an output of the average time for the + simulation. + +2004-03-08 10:14 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Added a check for the + author and description tags. If they aren't found, then a warning + is issued to the effect that adding such a tag would be a good + idea. This is just to get users to document their code better. We + might have to back this out someday... + +2004-03-08 10:12 paultcochrane + + * trunk/xmds-devel/source/xmdsclasses.h: Added authorName and + description to the list of simulation parameters. Not exactly + necessary, since they are likely never to be used in a simulation + as such, but they do help document the simulation source code + better. Whether or not actually storing them in xmds is a good + question... + +2004-03-05 05:06 paultcochrane + + * trunk/xmds-devel/source/loadxsil.m: Added copyright statement. + +2004-03-05 05:05 paultcochrane + + * trunk/xmds-devel/source/Doxyfile: Updated file to current version + of Doxygen (some stuff was obsolete etc). + +2004-03-05 05:04 paultcochrane + + * trunk/xmds-devel/source/xsilfield.cc: Fixed bug whereby the + output from xsil2graphics didn't include the correct variable + name when calling fscanfMat in the generated scilab script file. + +2004-01-30 04:31 paultcochrane + + * trunk/xmds-devel/examples/fibre.xmds, + trunk/xmds-devel/examples/fullpos3D.xmds: Fixed spelling error. + +2004-01-30 04:21 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Fixed bug whereby + attributes were parsed incorrectly. + +2004-01-30 03:48 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Now reports errors in + parsing element correctly. + +2004-01-30 02:10 paultcochrane + + * trunk/xmds-devel/testsuite/fibre.xmds, + trunk/xmds-devel/testsuite/fullpos3D.xmds, + trunk/xmds-devel/testsuite/gaugeatomlaser.xmds, + trunk/xmds-devel/testsuite/ndparamp.xmds, + trunk/xmds-devel/testsuite/nlse.xmds, + trunk/xmds-devel/testsuite/soliton.xmds: Fixed problems + concerning gcc 3.x needing floats inside such functions as log + and sqrt instead of ints. Just a problem of adding .0 ad the end + of what was + previously an integer. + +2004-01-30 02:04 paultcochrane + + * trunk/xmds-devel/testsuite/atomlaser.xmds, + trunk/xmds-devel/testsuite/fibre.xmds, + trunk/xmds-devel/testsuite/fullpos3D.xmds, + trunk/xmds-devel/testsuite/gaugeatomlaser.xmds, + trunk/xmds-devel/testsuite/kubo.xmds, + trunk/xmds-devel/testsuite/ndparamp.xmds, + trunk/xmds-devel/testsuite/nlse.xmds, + trunk/xmds-devel/testsuite/sine.xmds, + trunk/xmds-devel/testsuite/soliton.xmds, + trunk/xmds-devel/testsuite/tla.xmds: Fixed up formatting of files + using HTML tidy. + Command used: tidy -im -xml .xmds + Then some hand-tidying of the files. + +2004-01-30 01:38 paultcochrane + + * trunk/xmds-devel/AUTHORS, trunk/xmds-devel/INSTALL, + trunk/xmds-devel/Makefile.am, trunk/xmds-devel/NEWS, + trunk/xmds-devel/README, trunk/xmds-devel/README.Windows, + trunk/xmds-devel/acinclude.m4, trunk/xmds-devel/configure.in, + trunk/xmds-devel/testsuite/atomlaser.xmds, + trunk/xmds-devel/testsuite/fibre.xmds, + trunk/xmds-devel/testsuite/fullpos3D.xmds, + trunk/xmds-devel/testsuite/gaugeatomlaser.xmds, + trunk/xmds-devel/testsuite/kubo.xmds, + trunk/xmds-devel/testsuite/ndparamp.xmds, + trunk/xmds-devel/testsuite/nlse.xmds, + trunk/xmds-devel/testsuite/sine.xmds, + trunk/xmds-devel/testsuite/soliton.xmds, + trunk/xmds-devel/testsuite/tla.xmds: Added CVS Id keyword. + +2004-01-30 01:25 paultcochrane + + * trunk/xmds-devel/source/loadxsil.m: Added CVS Id keyword. + +2004-01-28 04:44 paultcochrane + + * trunk/xmds-devel/source/Doxyfile, + trunk/xmds-devel/source/Makefile.am, + trunk/xmds-devel/source/dom3.h, + trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/kissdom.h, + trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmdsarg.cc, + trunk/xmds-devel/source/xmdsargelement.cc, + trunk/xmds-devel/source/xmdsargv.cc, + trunk/xmds-devel/source/xmdsbreakpoint.cc, + trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdscomplex.h, + trunk/xmds-devel/source/xmdselement.cc, + trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsglobals.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateex.cc, + trunk/xmds-devel/source/xmdsintegrateip.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegraterk4ex.cc, + trunk/xmds-devel/source/xmdsintegraterk4ip.cc, + trunk/xmds-devel/source/xmdsintegratesi.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdsoutput.cc, + trunk/xmds-devel/source/xmdssegment.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdsutils.cc, + trunk/xmds-devel/source/xmdsutils.h, + trunk/xmds-devel/source/xmdsvector.cc, + trunk/xmds-devel/source/xmdsvectorelement.cc, + trunk/xmds-devel/source/xmlbasics.cc, + trunk/xmds-devel/source/xmlbasics.h, + trunk/xmds-devel/source/xmlparser.cc, + trunk/xmds-devel/source/xmlparser.h, + trunk/xmds-devel/source/xsil2graphics.cc, + trunk/xmds-devel/source/xsilfield.cc, + trunk/xmds-devel/source/xsilfield.h: Added CVS Id keyword. + +2004-01-28 04:37 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Still testing the CVS + Id keyword expansion. + +2004-01-28 04:35 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Testing adding the CVS + Id keyword. + +2004-01-27 07:02 paultcochrane + + * trunk/xmds-devel/examples/atomlaser.xmds: Updated to new + element syntax: output format and output precision now being + given as attributes of element rather than in simulation + options section. Also added syntax for the break point feature to + come. + +2004-01-27 07:00 paultcochrane + + * trunk/xmds-devel/examples/diffusion.xmds, + trunk/xmds-devel/examples/fibre.xmds, + trunk/xmds-devel/examples/fullpos3D.xmds, + trunk/xmds-devel/examples/gaugeatomlaser.xmds, + trunk/xmds-devel/examples/highdim.xmds, + trunk/xmds-devel/examples/kubo.xmds, + trunk/xmds-devel/examples/lorenz.xmds, + trunk/xmds-devel/examples/ndparamp.xmds, + trunk/xmds-devel/examples/nlse.xmds, + trunk/xmds-devel/examples/pendulum.xmds, + trunk/xmds-devel/examples/sine.xmds, + trunk/xmds-devel/examples/soliton.xmds, + trunk/xmds-devel/examples/tla.xmds, + trunk/xmds-devel/examples/vibstring.xmds: Updated to new + element syntax: output format and output precision now being + given as attributes of element rather than in simulation + options section. + +2004-01-27 06:29 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Added attributes to + element to control whether output format is binary or + ascii (ascii still default), and whether the output precision is + double or single (double is still default). These are to replace + the and tags. The new syntax is + , which + is a lot more logical. + +2004-01-27 06:26 paultcochrane + + * trunk/xmds-devel/source/Doxyfile: Changed option so that man + pages are now generated. + +2004-01-14 08:34 paultcochrane + + * trunk/xmds-devel/examples/fullpos3D.xmds: Fixed problem whereby + gcc/g++ see sqrt(2) as the sqrt of an integer which doesn't work + in C++, these have been changed to sqrt(2.0) so that the input is + float/double. + +2004-01-13 10:16 paultcochrane + + * trunk/xmds-devel/source/xmdsutils.h: Trivial change made during + code testing. + +2004-01-13 10:15 paultcochrane + + * trunk/xmds-devel/source/xmdsutils.cc: Fixed bug in + getAttributeBools where the string comparison was being performed + incorrectly. + +2004-01-13 10:14 paultcochrane + + * trunk/xmds-devel/source/xmdsoutput.cc: Implemented parsing of + enabled attribute of breakpoint element correctly. + +2004-01-13 10:13 paultcochrane + + * trunk/xmds-devel/source/xmdsclasses.h: Changed some formatting. + +2004-01-13 10:11 paultcochrane + + * trunk/xmds-devel/source/xmdsbreakpoint.cc: Removed some legacy + code that was commented out anyway. Polished and tested the + breakpoint parsing code. Now do a test to see if a file exists at + the parsing stage when the file status is set to "old", and barf + with an error message if not found. + +2004-01-13 02:03 paultcochrane + + * trunk/xmds-devel/source/xmdsutils.h: Corrected one of the + documentation strings. + +2004-01-13 01:28 paultcochrane + + * trunk/xmds-devel/source/main.cc: Added a debug option to + parsePrefs(), and changed the output generated so that stuff that + should be in the debugging output is not in the verbose output. + +2004-01-12 09:10 paultcochrane + + * trunk/xmds-devel/source/xmdsutils.h: Added the DEEP and NOT_DEEP + variables to the global anonymous enum. + +2004-01-12 09:09 paultcochrane + + * trunk/xmds-devel/source/xmdsoutput.cc: Added stuff to find and + process the tag. Started to implement the use of + DEEP and NOT_DEEP variables in getElementsByTagName() and friends + as opposed to just 1 and 0 respectively (it makes the code more + readable). + +2004-01-12 09:07 paultcochrane + + * trunk/xmds-devel/source/xmdsbreakpoint.cc: Initial import to + repository. Basic stuff at this stage, actually does nothing + other than report what the settings are as found in the .xmds + script. + +2004-01-12 09:06 paultcochrane + + * trunk/xmds-devel/source/xmdsclasses.h: Added xmdsBreakPoint + object declarations (just basic stuff at this stage). Added (to + xmdsOutput) a bpEnabledFlag variable to note if breakpoints are + enabled, and declaration of a function to create an + xmdsBreakPoint object. + +2004-01-12 09:03 paultcochrane + + * trunk/xmds-devel/source/Makefile.am: Added xmdsbreakpoint.cc + +2003-12-30 10:38 paultcochrane + + * trunk/xmds-devel/examples/fibre.xmds, + trunk/xmds-devel/examples/fullpos3D.xmds, + trunk/xmds-devel/examples/gaugeatomlaser.xmds, + trunk/xmds-devel/examples/highdim.xmds, + trunk/xmds-devel/examples/kubo.xmds, + trunk/xmds-devel/examples/lorenz.xmds, + trunk/xmds-devel/examples/ndparamp.xmds, + trunk/xmds-devel/examples/nlse.xmds, + trunk/xmds-devel/examples/pendulum.xmds, + trunk/xmds-devel/examples/sine.xmds, + trunk/xmds-devel/examples/soliton.xmds, + trunk/xmds-devel/examples/tla.xmds, + trunk/xmds-devel/examples/vibstring.xmds: Updated , + and tags where appropriate. + +2003-12-23 04:01 paultcochrane + + * trunk/xmds-devel/ChangeLog, trunk/xmds-devel/MANIFEST, + trunk/xmds-devel/NEWS, trunk/xmds-devel/README: Updated to + reflect changes in current release (1.3-1) + +2003-12-23 03:47 paultcochrane + + * trunk/xmds-devel/examples/atomlaser.xmds, + trunk/xmds-devel/examples/diffusion.xmds, + trunk/xmds-devel/examples/fibre.xmds, + trunk/xmds-devel/examples/fullpos3D.xmds, + trunk/xmds-devel/examples/gaugeatomlaser.xmds, + trunk/xmds-devel/examples/highdim.xmds, + trunk/xmds-devel/examples/kubo.xmds, + trunk/xmds-devel/examples/lorenz.xmds, + trunk/xmds-devel/examples/ndparamp.xmds, + trunk/xmds-devel/examples/nlse.xmds, + trunk/xmds-devel/examples/pendulum.xmds, + trunk/xmds-devel/examples/sine.xmds, + trunk/xmds-devel/examples/soliton.xmds, + trunk/xmds-devel/examples/tla.xmds, + trunk/xmds-devel/examples/vibstring.xmds: Tidied formatting, + added some comments. + +2003-12-23 01:15 paultcochrane + + * trunk/xmds-devel/examples/atomlaser.xmds: Commented out using of + binary input file. Now is back to being initialised by code. + Better this way since it's an example file. + +2003-12-23 01:13 paultcochrane + + * trunk/xmds-devel/source/main.cc: Put preferences parsing code + into a function. It's a bit neater, and only one section of code + to modify instead of two. Also changed a couple of warnings to + only be printed out when verbose flag is set. + +2003-12-22 06:56 paultcochrane + + * trunk/xmds-devel/Makefile.am: Updated to include the + README.Windows file in the distribution. + +2003-12-22 06:55 paultcochrane + + * trunk/xmds-devel/README.Windows: Initial import to repository. + +2003-12-22 06:01 paultcochrane + + * trunk/xmds-devel/examples/tla.xmds: Minor formatting improvement. + +2003-12-22 06:00 paultcochrane + + * trunk/xmds-devel/examples/nlse.xmds: Added test code for output + arguments. This needs to be fixed up, not a good example file + really. + +2003-12-22 05:59 paultcochrane + + * trunk/xmds-devel/examples/ndparamp.xmds: Added binary output and + benchmark tags. + +2003-12-22 05:58 paultcochrane + + * trunk/xmds-devel/examples/highdim.xmds: Fixed integer where float + should be problem. + +2003-12-22 05:57 paultcochrane + + * trunk/xmds-devel/examples/gaugeatomlaser.xmds: Renamed simulation + and .xsil file to reflect name of "gaugeatomlaser". + +2003-12-22 05:56 paultcochrane + + * trunk/xmds-devel/examples/fullpos3D.xmds: Some minor + reformatting. + +2003-12-22 05:55 paultcochrane + + * trunk/xmds-devel/examples/fibre.xmds: Fixed a divide by integer + problem which has only really become evident since gcc3. Added + and tags. + +2003-12-22 05:52 paultcochrane + + * trunk/xmds-devel/examples/atomlaser.xmds: Tidied the code + slightly. Added an and element (may be + used in the future. Added some comments to the file. Removed test + code, and now acually use variables in the simulation as command + line arguments. Also added some new syntax to work in xmds-1.3-1. + +2003-12-22 05:49 paultcochrane + + * trunk/xmds-devel/testsuite/atomlaser_reference.xsil, + trunk/xmds-devel/testsuite/ndparamp_reference.xsil, + trunk/xmds-devel/testsuite/nlse_reference.xsil, + trunk/xmds-devel/testsuite/soliton_reference.xsil, + trunk/xmds-devel/testsuite/tla_reference.xsil: Updated the + _reference.xsil files. + +2003-12-22 05:40 paultcochrane + + * trunk/xmds-devel/source/main.cc: Added some documentation as + introduction to xmds for output to api documentation. Also added + some installation instructions as well. + +2003-12-22 04:42 paultcochrane + + * trunk/xmds-devel/source/Doxyfile: Updated to refelect the current + project number. Also removed some obsolete Doxygen commands. + +2003-12-22 04:39 paultcochrane + + * trunk/xmds-devel/source/dom3.h: Completed documenting the DOM + functions and classes as they are outlined in the W3C Working + Draft of 05 June 2001. No functional changes, although the big + difference is that the api documentation is now significantly + better than it was before. + +2003-12-19 07:17 paultcochrane + + * trunk/xmds-devel/source/dom3.h: Started documenting the DOM + functions and classes as they are outlined in the W3C Working + Draft of 05 June 2001. No functional changes, although the big + difference is that the api documentation is now significantly + better than it was before (and I haven't finished yet!). + +2003-12-17 09:35 paultcochrane + + * trunk/xmds-devel/source/xmdsvectorelement.cc: Implemented binary + input for use in the tag of the element. + +2003-12-17 09:33 paultcochrane + + * trunk/xmds-devel/source/xmdsutils.h: Added an enum to specify two + booleans, REQD and NOT_REQD. I will eventually implement this + further so that some of the calls used of getAssignmentStrings() + etc are a little more understandable. Also added declarations for + getAttributeStrings() and getAttributeBools(). + +2003-12-17 09:31 paultcochrane + + * trunk/xmds-devel/source/xmdsutils.cc: Added two new functions: + getAttributeStrings() and getAttributeBools(). This was in order + to implement binary and ascii input of data files (in + tag of element). However, this is a more general + addition, the two functions being used to get strings and + booleans out of attributes of element tags respectively. + +2003-12-17 09:29 paultcochrane + + * trunk/xmds-devel/source/xmdsclasses.h: Minor change to the + xmdsVectorElement class to implement binary and ascii input + files. + +2003-12-17 06:18 paultcochrane + + * trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc, + trunk/xmds-devel/source/xmdsvectorelement.cc, + trunk/xmds-devel/source/xsilfield.cc: Fixed bug whereby + temp.dat was still being used instead of + x.dat for input data to matlab/scilab. + +2003-12-17 06:17 paultcochrane + + * trunk/xmds-devel/source/xmdsvector.cc: Fixed formatting a bit. No + real changes to code. + +2003-12-17 06:16 paultcochrane + + * trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdsoutput.cc: Tidied some fprintf + statements. + +2003-12-17 06:15 paultcochrane + + * trunk/xmds-devel/source/xmdsutils.cc: Fixed some spelling errors + and debugging reporting information. + +2003-12-17 06:12 paultcochrane + + * trunk/xmds-devel/source/xmdsfield.cc: Tidied some fprintf + statements by combining most of the text (and hence removing + heaps of fprintf statements and making the code easier to read). + +2003-12-17 06:09 paultcochrane + + * trunk/xmds-devel/source/xmdsclasses.h: Added a usePrefs variable + to the simulationParamtersStruct in order to implement + preferences. + +2003-12-17 06:08 paultcochrane + + * trunk/xmds-devel/source/main.cc: Implemented a first go at + preferences for xmds. It can be tidied a lot, but it works at + present. One needs a ~/.xmds/xmds.prefs file or an xmds.prefs + file in the local directory to the script one is trying to + compile. The prefs file format is = + , e.g. XMDS_CC = gcc. One can also use + comments. All text after (and including) a hash character (#) is + ignored. + +2003-12-17 06:03 paultcochrane + + * trunk/xmds-devel/configure.in: Updated to show version + information as 1.3-1. + +2003-12-07 03:25 paultcochrane + + * trunk/xmds-devel/ChangeLog: Added comments about current changes + to xmds. + +2003-12-07 03:24 paultcochrane + + * trunk/xmds-devel/configure.in: Altered release number to current + release: 1.2-2 + +2003-11-27 05:50 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Added the inclusion of + the sstream (string streams) header. + +2003-11-27 05:49 paultcochrane + + * trunk/xmds-devel/source/xmdsfield.cc: Fixed segfaulting of mpi + programs using wisdom. Now have more C++ type code to implement + creation of the host_rank_%i.stuff etc files and for their + deletion. Writing and reading from these files was causing the + segfault. + +2003-11-27 01:33 paultcochrane + + * trunk/xmds-devel/source/xmdssequence.cc: Fixed bug whereby the + useWisdom option wasn't passed through to writePlanCreationCalls + properly. + +2003-11-27 01:14 paultcochrane + + * trunk/xmds-devel/configure.in: Changed way that mpiccTest was + checked for the compiler running mpicc. + +2003-11-25 08:19 paultcochrane + + * trunk/xmds-devel/ChangeLog: Added comments advising of changes up + to current version of xmds. + +2003-11-25 08:18 paultcochrane + + * trunk/xmds-devel/configure.in: Corrected version numbers to agree + with current release. + +2003-11-25 08:17 paultcochrane + + * trunk/xmds-devel/source/xmdsfield.cc: Fixed host.stuff and + home.stuff file writing with mpi, I'd fixed this before in one + place in the code but missed this extra place. + +2003-11-25 01:37 paultcochrane + + * trunk/xmds-devel/source/xmdsmomentgroup.cc: Modified moment group + number reporting at the terminal, so matches what is given in + xsil2graphics and output files. + +2003-11-24 10:10 paultcochrane + + * trunk/xmds-devel/configure.in: Fixed problem with optimisation + settings not flowing through for script compilation when using + gcc. Now check if $ac_compiler_gnu is "yes" instead of if XMDS_CC + is gcc (can be g++, for example). + +2003-11-24 10:07 paultcochrane + + * trunk/xmds-devel/source/xmdsmomentgroup.cc: Fixed binary output + bug where k-space variables weren't ordered correctly before + output. + +2003-11-20 06:00 paultcochrane + + * trunk/xmds-devel/source/xmdsmomentgroup.cc: Fixed misreporting of + filename if unable to open the output file for binary output. + +2003-11-07 00:28 paultcochrane + + * trunk/xmds-devel/configure.in: Changed release number to pre1, + ready for the pre1 release. (funnily enough...) + +2003-11-06 10:18 paultcochrane + + * trunk/xmds-devel/source/loadxsil.m: Hopefully fixed problem with + loading data in more than one moment group by appending + _[momentGroupNumber] to variable names as is done in + xsil2graphics. + +2003-11-06 09:59 paultcochrane + + * trunk/xmds-devel/configure.in: Now pointing XMDS_CC to CXX if + necessary. + +2003-11-06 06:02 paultcochrane + + * trunk/xmds-devel/configure.in: Fixed bug where a test for null + should have been non-null. + +2003-11-06 01:47 paultcochrane + + * trunk/xmds-devel/source/xsilfield.h: Altered call to + writeAsFormat so can implement writing data files as xsil + filename_momentGroup.dat as opposed to temp_momentGroup.dat as + before. + +2003-11-06 01:46 paultcochrane + + * trunk/xmds-devel/source/xsilfield.cc: The output filename is the + xsil base filename (the bit without the .xsil on the end) with + the moment group number plus .dat, instead of just temp1.dat, + temp2.dat. Not a great comment, but I implemented this idea + anyway... + +2003-11-06 01:44 paultcochrane + + * trunk/xmds-devel/source/xsil2graphics.cc: Some reformatting of + code. Main change being the altering of the + xsilField::writeAsFormat call, by passing through the xsil + filename's base name (ie that bit without the .xsil on the end). + +2003-11-06 01:42 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Removed the output of + the (commented out in the final code anyway) unistd.h statement. + +2003-11-06 01:41 paultcochrane + + * trunk/xmds-devel/source/xmdsfield.cc: (Hopefully) fixed problem + with writing, reading and deleting host.stuff and home.stuff + files when using mpi. The files now append the rank to the file + name, so this problem should be fixed. + +2003-11-06 01:38 paultcochrane + + * trunk/xmds-devel/source/main.cc: Removed XMDS_CXX stuff. Removed + clibs being added to one of mpicc compile strings. This produced + inconsistent compilation flags when mpicc uses a different + compiler to XMDS_CC. + +2003-11-06 01:16 paultcochrane + + * trunk/xmds-devel/admin/manifestGen.pl: Documented a far simpler + way of generating the manifest. + +2003-11-06 01:15 paultcochrane + + * trunk/xmds-devel/configure.in: Removed references to XMDS_CXX* + variables, they were superfluous and caused confusion. Made some + tests more stringent, so that user supplied arguments at the + command line to configure can be passed through properly. If the + user has specified command line options to xmds, the script now + also checks if some required flags are missing from these options + and appends them if necessary. + +2003-11-06 01:11 paultcochrane + + * trunk/xmds-devel/README: Added description of configuration + options that are now available in xmds-1.2, and tidied up the + text a bit. Also fixed a couple of bugs with the scilab execution + of the xsil file. + +2003-11-06 01:09 paultcochrane + + * trunk/xmds-devel/Makefile.am: Removed latexdocs from being + included in distribution temporarily. Will probably add back in + when docs catch up to current version of xmds. + +2003-11-06 01:08 paultcochrane + + * trunk/xmds-devel/MANIFEST: Updated to reflect current list of + files for distribution. + +2003-11-04 08:27 paultcochrane + + * trunk/xmds-devel/Makefile.am: No change, just added something and + took it away, but it wants to be updated nevertheless. + +2003-11-04 08:22 paultcochrane + + * trunk/xmds-devel/MANIFEST: Initial import to repository. + +2003-11-04 08:18 paultcochrane + + * trunk/xmds-devel/ChangeLog: Updated to reflect changes that have + happened so far since xmds-1.1. + +2003-11-04 07:54 paultcochrane + + * trunk/xmds-devel/README: Updated to agree with current + configuration options. + +2003-11-04 07:53 paultcochrane + + * trunk/xmds-devel/AUTHORS: Updated email addresses of authors. + +2003-11-04 06:59 paultcochrane + + * trunk/xmds-devel/configure.in: MPICCFLAGS needs $PTHREADS_CFLAGS + as well. Tidied XMDS_CFLAGS and XMDS_CXXFLAGS by putting + AGGRESSIVE_* instead of the explicit declaration. Removed the + check for enable_mpicc_aggressive. Removed --enable-*-aggressive + options. + +2003-11-04 06:32 paultcochrane + + * trunk/xmds-devel/configure.in: Fixed bug where one actually needs + the $PTHREAD_CFLAGS variable inserted into XMDS_CFLAGS. + +2003-11-04 05:20 paultcochrane + + * trunk/xmds-devel/configure.in: Removed explicit check for + MPI_Init in -lmpi since -lmpi must work if passed -llam test, AND + the library arguments be in the right order. This simplifies the + checking slightly. + +2003-11-03 04:46 paultcochrane + + * trunk/xmds-devel/configure.in: The flags for gcc, icc, g++ etc + all now default to the aggressive version. If the user wants + other flags, they should set them at the command line at build + time. + +2003-11-03 04:03 paultcochrane + + * trunk/xmds-devel/configure.in: Changed implementation of how + xmdsconfig.h is made. It's now a cp from config.h. + +2003-11-03 04:01 paultcochrane + + * trunk/xmds-devel/Makefile.am: Added the m4 files acx_mpi.m4 and + acx_pthread.m4 so that will be added to distribution output. + +2003-11-03 03:58 paultcochrane + + * trunk/xmds-devel/examples/diffusion.xmds, + trunk/xmds-devel/examples/lorenz.xmds, + trunk/xmds-devel/examples/pendulum.xmds, + trunk/xmds-devel/examples/vibstring.xmds: Initial import to + repository. + +2003-10-31 07:04 joehope + + * trunk/xmds-devel/configure.in, + trunk/xmds-devel/examples/fibre.xmds: Making stable autoconf on + MacOSX + +2003-10-30 07:07 paultcochrane + + * trunk/xmds-devel/source/Doxyfile: Now set to produce pdf + documentation as well. + +2003-10-30 07:05 paultcochrane + + * trunk/xmds-devel/configure.in: Fixed problem with not finding lam + properly. Fixed bug whereby forgot to add -lxmds to XMDS_LIBS + variable. + +2003-10-30 03:40 paultcochrane + + * trunk/xmds-devel/configure.in: No longer assuming lam, nor does + one need to put --with-mpi-libs="-llam" on the command line for + the script to find either the lam or mpich implementations of + mpi. Fixed minor big with -I in wrong place. Now determines how + mpicc is run, which in itself is dependent upon the mpi + implementation, but the script detects the differences between + lam and mpi and is still able to check what CC is used for mpicc. + +2003-10-30 03:35 paultcochrane + + * trunk/xmds-devel/source/dom3.h, + trunk/xmds-devel/source/kissdom.h, + trunk/xmds-devel/source/xmdsclasses.h: Did some reformatting and + updated docstrings. + +2003-10-28 01:42 paultcochrane + + * trunk/xmds-devel/configure.in: Added a check for how mpicc is + run, and then alter MPICCFLAGS accordingly. Also added a check + for mpicc-aggressive and if on, then uses the icc-aggressive or + gcc-aggressive flags if mpicc is run by icc or gcc. + +2003-10-28 00:48 paultcochrane + + * trunk/xmds-devel/admin, trunk/xmds-devel/admin/manifestGen.pl: + Initial import to repository. + +2003-10-27 10:50 paultcochrane + + * trunk/xmds-devel/configure.in: Implemented the --with-mpi-path + option better. Used the MPI_LIB_PATH to help configure look for + fftw_mpi. Added the MPI_LIB_PATH to the MPICCFLAGS. + +2003-10-27 10:47 paultcochrane + + * trunk/xmds-devel/Makefile.am: Added loadxsil.m to EXTRA_DIST + files. + +2003-10-27 08:13 paultcochrane + + * trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/kissdom.h, + trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmdsarg.cc, + trunk/xmds-devel/source/xmdsargelement.cc, + trunk/xmds-devel/source/xmdsargv.cc, + trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdscomplex.h, + trunk/xmds-devel/source/xmdselement.cc, + trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsglobals.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateex.cc, + trunk/xmds-devel/source/xmdsintegrateip.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegraterk4ex.cc, + trunk/xmds-devel/source/xmdsintegraterk4ip.cc, + trunk/xmds-devel/source/xmdsintegratesi.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdsoutput.cc, + trunk/xmds-devel/source/xmdssegment.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc, + trunk/xmds-devel/source/xmdsutils.cc, + trunk/xmds-devel/source/xmdsutils.h, + trunk/xmds-devel/source/xmdsvector.cc, + trunk/xmds-devel/source/xmdsvectorelement.cc, + trunk/xmds-devel/source/xmlbasics.cc, + trunk/xmds-devel/source/xmlbasics.h, + trunk/xmds-devel/source/xmlparser.cc, + trunk/xmds-devel/source/xmlparser.h, + trunk/xmds-devel/source/xsil2graphics.cc, + trunk/xmds-devel/source/xsilfield.cc, + trunk/xmds-devel/source/xsilfield.h: Added GPL statement. + +2003-10-27 08:01 paultcochrane + + * trunk/xmds-devel/source/dom3.h: Changed some docstrings. Added + GPL statement. + +2003-10-27 07:52 paultcochrane + + * trunk/xmds-devel/configure.in: Hopefully fixed bloody headers + problem this time!! Fixed other problems wrt getting mpi to get + the correct options. Seems to go on the SC now, so that's good. + +2003-10-24 01:50 paultcochrane + + * trunk/xmds-devel/source/xmdssequence.cc: Added more helpful (ie + usage) output for when arguments to simulation binary are + incorrect. + +2003-10-24 01:46 paultcochrane + + * trunk/xmds-devel/source/main.cc: Fixed bug where insufficient + number of format specifiers in a string for number of arguments + to sprintf. This caused a problem with mpi not seeing the fftw + libraries. + +2003-10-23 10:36 paultcochrane + + * trunk/xmds-devel/configure.in: Now handling the case when someone + uses --prefix better now. Basically I just make the USER_* and + *dir variables point to the directory pointed to by the $prefix. + +2003-10-23 10:11 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Minor terminal output + touch up. + +2003-10-23 10:11 paultcochrane + + * trunk/xmds-devel/source/main.cc: Now using XMDS_CC, XMDS_CXX, and + XMDS_CFLAGS instead of the non-XMDS_* versions. + +2003-10-23 10:07 paultcochrane + + * trunk/xmds-devel/configure.in: Hopefully now fixed the config + headers not recreating themselves problem. Did some reformatting + of help output. Added --with-mpi-compiler so that the user can + choose what compiler to use for mpi, --enable-mpi (not default + option) so that mpi is checked for and added to variables, + --enable-icc-aggressive, so that aggressive optimisation settings + are chosen when using icc, --enable-gcc-aggressive so that both + gcc and g++ use aggressive optimisation settings, + --enable-mpicc-aggressive so that mpicc will use the + gcc-aggressive compiler settings. Fixed a bug where CXXFLAGS + lacked an S. Needed to add the PTHREAD_CFLAGS variable to + XMDS_CFLAGS and XMDS_CXXFLAGS. Removed old (and commented anyway) + mpi checking code. Put mpi stuff into an if loop, and is + processed only when --enable-mpi is used. Am now actually using + XMDS_CFLAGS and XMDS_CXXFLAGS. Now configure script outputs + nicely formatted option and variable information once + configuration is complete. + +2003-10-22 06:13 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Minor change to + terminal output. + +2003-10-22 06:12 paultcochrane + + * trunk/xmds-devel/source/main.cc: Changed INCLUDES and LIBS to be + XMDS_INCLUDES and XMDS_LIBS, so is specific to the xmds + simulations rather than xmds itself. + +2003-10-22 06:10 paultcochrane + + * trunk/xmds-devel/configure.in: Corrected some *config.h errors. + Relabelled some of the variables to be specific to the xmds + simulations as opposed to xmds itself. Removed some superfluous + function checks. Got MPI running cleaner and better. + +2003-10-22 03:25 paultcochrane + + * trunk/xmds-devel/acx_mpi.m4: Initial import to repository. + +2003-10-22 00:39 paultcochrane + + * trunk/xmds-devel/source/Makefile.am: Changed config.h to + xmdsconfig.h + +2003-10-22 00:39 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Changed inclusion of + config.h to inclusion of xmdsconfig.h to stop possible name + clashes when installing on the system instead of in the user's + directory. + +2003-10-22 00:38 paultcochrane + + * trunk/xmds-devel/source/xmdsmomentgroup.cc: Fixed minor error + with incorrect format in printf statement. + +2003-10-22 00:23 paultcochrane + + * trunk/xmds-devel/source/main.cc: Improved mpi flag handling, and + added a FFTW_MPI_LIBS variable. + +2003-10-22 00:22 paultcochrane + + * trunk/xmds-devel/configure.in: Removed some superfluous + variables, and some superfluous output at configure time. + Improved the ordering and determination of flags for use with + mpi. + +2003-10-21 23:27 paultcochrane + + * trunk/xmds-devel/configure.in: Now generating source/xmdsconfig.h + as well as source/config.h so that simulation binaries can have + more benefit from configuration headers. Added -lxmds to LIBS + variable (this isn't the right thing to do, and will be fixed + shortly). + +2003-10-20 01:14 joehope + + * trunk/xmds-devel/examples/highdim.xmds: Trivial fix for + occasional, minor compiler confusion: sqrt(int) + +2003-10-18 10:55 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Removed inclusion of + endian.h for binaryOutput. Now including config.h when + binaryOutput is true. + +2003-10-18 10:54 paultcochrane + + * trunk/xmds-devel/source/xmdssequence.cc: Changed checks for + FLOAT_WORD_ORDER etc to CPU_IS_BIG_ENDIAN etc. + +2003-10-18 10:53 paultcochrane + + * trunk/xmds-devel/source/xmdsmomentgroup.cc: Now determining + endian-ness by the variables CPU_IS_BIG_ENDIAN and + CPU_IS_LITTLE_ENDIAN. + +2003-10-18 10:51 paultcochrane + + * trunk/xmds-devel/source/Makefile.am: Now adding the config.h + generated in the configuration of xmds. This adds the variables + CPU_IS_BIG_ENDIAN and CPU_IS_LITTLE_ENDIAN to check for + endian-ness of the processor. + +2003-10-18 10:48 paultcochrane + + * trunk/xmds-devel/configure.in: Removed check for endian.h and + added code to search for endian-ness of processor copied from + configure.ac in libsndfile. Also am now including the + acinclude.m4 of libsndfile. + +2003-10-18 10:07 paultcochrane + + * trunk/xmds-devel/acinclude.m4: Initial import to repository. + +2003-10-17 04:53 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Instead of adding + "#include getopt.h" every time a simulation code is written, it + is only added now when the .xmds script contains an argv tag set, + and therefore the simulation can take arguments at the command + line. + +2003-10-17 04:50 paultcochrane + + * trunk/xmds-devel/source/xmdssequence.cc: Changed getopt_long_only + to getopt_long. + +2003-10-17 04:49 paultcochrane + + * trunk/xmds-devel/source/main.cc: Removed FFTWMPILIBS variable + (now superfluous). Removed superfluous %s formatting string. + +2003-10-17 04:48 paultcochrane + + * trunk/xmds-devel/source/Makefile.am: Added the getopt sources and + headers to make the libxmds library. + +2003-10-17 04:36 paultcochrane + + * trunk/xmds-devel/config.guess, trunk/xmds-devel/depcomp, + trunk/xmds-devel/ltmain.sh: Updated to current version. + +2003-10-17 04:32 paultcochrane + + * trunk/xmds-devel/configure.in: Added underscores to some + variables to improve readability. Made sure that the directory + libxmds.a is put in is the same as xmdscomplex.h (on + installation). Made sure that script doesn't write over + previously defined (eg in the user's shell) any environment + variables used (eg CFLAGS). Made sure that gcc gets the -Wall + option (don't really know why... historical I guess). Changed + FFTW_THREADS_* to XMDS_THREADS_*. These may be deleted in the + future. Cleaned up the flags that mpi gets eventually. Further + cleaning will ensue however. icc currently only used if set as CC + and or CXX flags in the shell. Moved the AC_SUBSTs at the end of + the script to before all of the AC_DEFINES. Made sure that -lxmds + is added to LIBS. Some echos added for testing purposes. + +2003-10-17 04:24 paultcochrane + + * trunk/xmds-devel/Makefile.am: Commented out the inclusion of xmds + api documentation. + +2003-10-10 05:02 joehope + + * trunk/xmds-devel/source/dom3.h, + trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/kissdom.h, + trunk/xmds-devel/source/xmdsarg.cc, + trunk/xmds-devel/source/xmdsargelement.cc, + trunk/xmds-devel/source/xmdsargv.cc, + trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdselement.cc, + trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsglobals.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateex.cc, + trunk/xmds-devel/source/xmdsintegrateip.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegraterk4ex.cc, + trunk/xmds-devel/source/xmdsintegraterk4ip.cc, + trunk/xmds-devel/source/xmdsintegratesi.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdsoutput.cc, + trunk/xmds-devel/source/xmdssegment.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc, + trunk/xmds-devel/source/xmdsutils.cc, + trunk/xmds-devel/source/xmdsutils.h, + trunk/xmds-devel/source/xmdsvector.cc, + trunk/xmds-devel/source/xmdsvectorelement.cc, + trunk/xmds-devel/source/xmlbasics.cc, + trunk/xmds-devel/source/xmlbasics.h, + trunk/xmds-devel/source/xmlparser.cc, + trunk/xmds-devel/source/xmlparser.h, + trunk/xmds-devel/source/xsil2graphics.cc, + trunk/xmds-devel/source/xsilfield.cc, + trunk/xmds-devel/source/xsilfield.h: Replace //** with // ** + (often allows proper syntax colouring) + +2003-10-09 06:29 paultcochrane + + * trunk/xmds-devel/testsuite, + trunk/xmds-devel/testsuite/atomlaser.xmds, + trunk/xmds-devel/testsuite/atomlaser_reference.xsil, + trunk/xmds-devel/testsuite/fibre.xmds, + trunk/xmds-devel/testsuite/fibre_reference.xsil, + trunk/xmds-devel/testsuite/fullpos3D.xmds, + trunk/xmds-devel/testsuite/fullpos3D_reference.xsil, + trunk/xmds-devel/testsuite/gaugeatomlaser.xmds, + trunk/xmds-devel/testsuite/gaugeatomlaser_reference.xsil, + trunk/xmds-devel/testsuite/genRefData.pl, + trunk/xmds-devel/testsuite/kubo.xmds, + trunk/xmds-devel/testsuite/kubo_reference.xsil, + trunk/xmds-devel/testsuite/ndparamp.xmds, + trunk/xmds-devel/testsuite/ndparamp_reference.xsil, + trunk/xmds-devel/testsuite/nlse.xmds, + trunk/xmds-devel/testsuite/nlse_reference.xsil, + trunk/xmds-devel/testsuite/sine.xmds, + trunk/xmds-devel/testsuite/sine_reference.xsil, + trunk/xmds-devel/testsuite/soliton.xmds, + trunk/xmds-devel/testsuite/soliton_reference.xsil, + trunk/xmds-devel/testsuite/test_xmds.pl, + trunk/xmds-devel/testsuite/tla.xmds, + trunk/xmds-devel/testsuite/tla_reference.xsil: Initial import to + repository. + +2003-10-09 02:18 offaxis + + * trunk/xmds-devel/source/xmdsglobals.cc: Globals from + elements now read in _before_ those from the element. + +2003-10-07 05:28 paultcochrane + + * trunk/xmds-devel/depcomp: Initial import to repository. + +2003-10-07 05:01 paultcochrane + + * trunk/xmds-devel/acx_pthread.m4: Initial import to repository. + Copied from the fftw distribution (many thanks). + +2003-10-07 04:59 paultcochrane + + * trunk/xmds-devel/configure.in: Many, many changes. Updated to + call xmds version 1.2. Added a path to one's mpi distribution if + different from /usr or /usr/local. Added a check for vendor's cc + and c++ compiler, and using them to compile both xmds and the + simulation binaries. If the compiler is gcc then adds the -Wall + compiler flag. Checks for getopt and getopt_long. Checks for the + various thread libraries (code copied and modified from the fftw + configure.in). Added a FFTW_LIBS variable. This may be used a bit + better in the future. Checks for the Intel c compiler and if so + then uses that compiler for xmds and the simulation binaries. + Removed some superfluous definitions and subst's. + +2003-10-07 04:52 paultcochrane + + * trunk/xmds-devel/examples/nlse.xmds: Removed tag, + just for testing purposes. Fixed problem with log(2) being + incorrect for more recent versions of c++: one must now use + log(2.0). + +2003-10-07 04:50 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Added config.h to + headers list. Using the HAVE_ENDIAN_H variable defined therein to + specify what the __BYTE_ORDER and __FLOAT_WORD_ORDER macros + should be equal to. Hopefully this fixes the endian issues xmds + could have, although I'm not sure yet. + +2003-10-07 04:48 paultcochrane + + * trunk/xmds-devel/source/main.cc: Added cxx variable set equal to + the CXX variable found by the configure script. This is then used + for compilation of the simulation binary. Also specifying the + FFTW_LIBS variable as well. Added the fftwlibs variable to the + compilation of the simulation binary. + +2003-10-07 04:45 paultcochrane + + * trunk/xmds-devel/source/loadxsil.m: Fixed a line that was missing + a + . + +2003-10-06 04:21 paultcochrane + + * trunk/xmds-devel/source/xmdsmomentgroup.cc: Removed multiline + string literals by adding heaps of fprintf statements. This + caused problems with some compilers. + +2003-10-06 04:20 paultcochrane + + * trunk/xmds-devel/source/xmdsfield.cc: Removed multiline string + literals by adding heaps of fprintf statements. + +2003-09-30 11:50 paultcochrane + + * trunk/xmds-devel/examples/atomlaser.xmds: Now contains more + tags test code. Doesn't actually do anything... + +2003-09-30 11:48 paultcochrane + + * trunk/xmds-devel/source/xmdsutils.h: Reformatted the text. + +2003-09-30 11:47 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Removed test code. + Fixed code to implement the gnu getopt library for command line + options for the simulation binary. + +2003-09-30 11:46 paultcochrane + + * trunk/xmds-devel/source/xmdssequence.cc: Completed code to + implement gnu getopt command line options for the simulation + binary. + +2003-09-30 11:44 paultcochrane + + * trunk/xmds-devel/source/xmdsglobals.cc: Added global variables + code to be output for when command line arguments are specified + in the .xmds file. + +2003-09-30 11:42 paultcochrane + + * trunk/xmds-devel/source/xmdscomplex.h: Reformatted text. + +2003-09-30 11:42 paultcochrane + + * trunk/xmds-devel/source/xmdsclasses.h: Deleted some superfluous + code (eg writeArgvIntialisationCode, writeArgvFinalisationCode). + Removed test object: argvList. Fixed header so that can use an + argvStruct to store information about the command line arguments + specified in tags. + +2003-09-30 11:39 paultcochrane + + * trunk/xmds-devel/source/xmdsargv.cc: Deleted some superfluous + code (eg writeArgvIntialisationCode, writeArgvFinalisationCode). + +2003-09-30 11:38 paultcochrane + + * trunk/xmds-devel/source/xmdsargelement.cc: Finally worked out how + to get the argument names, short options, types, default_values + etc into the simulation object. Deleted some superfluous code (eg + writeArgDeclaration, writeArgCode). + +2003-09-30 11:36 paultcochrane + + * trunk/xmds-devel/source/xmdsarg.cc: Removed some superfluous + function definitions. Namely type(), setType(), default_value() + and setDefaultValue() + +2003-09-30 11:34 paultcochrane + + * trunk/xmds-devel/source/dom3.h, + trunk/xmds-devel/source/kissdom.h: Reformatted text nicely. + +2003-09-29 09:57 paultcochrane + + * trunk/xmds-devel/Makefile.am: Removed superfluous files from + being added when performing a make dist. Needs to be improved + further. + +2003-09-29 09:56 paultcochrane + + * trunk/xmds-devel/configure.in: Better checking, and some testing + done on platforms other than linux. + +2003-09-29 08:00 paultcochrane + + * trunk/xmds-devel/configure.in: Actually fixed the checks now, + instead of not (aarrgghh). + +2003-09-29 03:28 paultcochrane + + * trunk/xmds-devel/configure.in: Fixed some more checks and added a + check for fftw_mpi. + +2003-09-29 02:02 paultcochrane + + * trunk/xmds-devel/configure.in: Fixed bug with incorrectly using + alternative paths to fftw. + +2003-09-15 10:16 paultcochrane + + * trunk/xmds-devel/source/xmdsarg.cc, + trunk/xmds-devel/source/xmdsargelement.cc, + trunk/xmds-devel/source/xmdsargv.cc, + trunk/xmds-devel/source/xmdselement.cc, + trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsglobals.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateex.cc, + trunk/xmds-devel/source/xmdsintegrateip.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegraterk4ex.cc, + trunk/xmds-devel/source/xmdsintegraterk4ip.cc, + trunk/xmds-devel/source/xmdsintegratesi.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdsoutput.cc, + trunk/xmds-devel/source/xmdssegment.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc, + trunk/xmds-devel/source/xmdsutils.cc, + trunk/xmds-devel/source/xmdsvector.cc, + trunk/xmds-devel/source/xmdsvectorelement.cc: Implemented the use + of a command line flag to xmds for toggling debugging information + output (-d). + +2003-09-15 10:14 paultcochrane + + * trunk/xmds-devel/source/xsil2graphics.cc: Modified to implement + the -d xmds debugging flag and -x the xml debugging flag. + +2003-09-15 10:13 paultcochrane + + * trunk/xmds-devel/source/xmlbasics.cc: Removed DEBUG macro. This + is now implemented as a command line switch to xmds. Specifically + -x, for xml debugging information. This change is really only + useful for developers. + +2003-09-15 10:12 paultcochrane + + * trunk/xmds-devel/source/xmdsclasses.h: Removed DEBUG macro. This + is now implemented as a command line switch to xmds. + +2003-09-15 10:10 paultcochrane + + * trunk/xmds-devel/source/main.cc: Implemented some new command + line options to xmds the program. -c switches compilation of the + output binary OFF. This is useful for checking is xmds outputs + the correct code, or if one wants to hack the output source and + not have to worry about compilation, or even if the output code + is not to be used on a unix system and therefore needs some + hacking to work on another system. -d switches debugging output + on excluding xml parsing debugging output (same as setting the + DEBUG macro in the code, except that xmds doesn't have to be + recompiled every time one wants to change that). -x switches + debugging output of just the xml parsing on. + +2003-09-15 09:57 paultcochrane + + * trunk/xmds-devel/examples/atomlaser.xmds: Improved indentation of + xml. Added code to test the tag set. + +2003-09-15 06:56 paultcochrane + + * trunk/xmds-devel/ChangeLog: Initial import to repository. + +2003-09-15 06:49 paultcochrane + + * trunk/xmds-devel/source/xmdsarg.cc, + trunk/xmds-devel/source/xmdsargelement.cc, + trunk/xmds-devel/source/xmdsargv.cc: Initial import to + repository. + +2003-09-15 06:48 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Improved indentation + of source code. Added some code for the parsing of the + element. + +2003-09-15 06:45 paultcochrane + + * trunk/xmds-devel/source/xmdssequence.cc: Improved indentation of + source code, no functional changes. + +2003-09-15 06:43 paultcochrane + + * trunk/xmds-devel/source/xmdsclasses.h: Added declarations for + xmdsArgv, xmdsArg, and xmdsArgElement classes. Also added an + argvStruct structure to store the relevant information found by + parsing the new etc syntax. This may or may not be used at + this stage, so consider this commit as strictly temporary. + +2003-09-15 06:38 paultcochrane + + * trunk/xmds-devel/source/dom3.h, + trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/kissdom.h, + trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmdscomplex.h, + trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsglobals.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateex.cc, + trunk/xmds-devel/source/xmdsintegrateip.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegraterk4ex.cc, + trunk/xmds-devel/source/xmdsintegraterk4ip.cc, + trunk/xmds-devel/source/xmdsintegratesi.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdsoutput.cc, + trunk/xmds-devel/source/xmdssegment.cc, + trunk/xmds-devel/source/xmdsutils.cc, + trunk/xmds-devel/source/xmdsutils.h, + trunk/xmds-devel/source/xmdsvector.cc, + trunk/xmds-devel/source/xmdsvectorelement.cc, + trunk/xmds-devel/source/xmlbasics.cc, + trunk/xmds-devel/source/xmlbasics.h, + trunk/xmds-devel/source/xmlparser.cc, + trunk/xmds-devel/source/xmlparser.h: No functional changes, just + indented the source code nicely + +2003-09-15 06:31 paultcochrane + + * trunk/xmds-devel/source/Makefile.am: Added xmdsargv.cc xmdsarg.cc + and xmdsargelement.cc to the list of xmds sources + +2003-09-09 04:30 paultcochrane + + * trunk/xmds-devel/config.guess, trunk/xmds-devel/config.sub: + Initial import to repository + +2003-08-06 05:38 paultcochrane + + * trunk/xmds-devel/configure.in: Added a check for the endian.h + header file. + +2003-08-06 04:42 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: If binary output is + specified, then include the header. + +2003-08-06 04:41 paultcochrane + + * trunk/xmds-devel/source/xmdssequence.cc: Added code to output C + code to check for the definitions of __FLOAT_WORD_ORDER and + __BYTE_WORD order. If the first doesn't exist, then it uses the + next, if that doesn't exist, then the program exits. + +2003-08-06 04:38 paultcochrane + + * trunk/xmds-devel/source/xmdsmomentgroup.cc: Added code to output + C code that checks for littleendian or bigendian binary format, + and assigns the string encodingStr accordingly, for then use in + the .xsil output file of the simulation. + +2003-08-06 04:35 paultcochrane + + * trunk/xmds-devel/source/loadxsil.m: Modified to allow for reading + of bigendian or littleendian binary, as specified in the .xsil + file. + +2003-08-05 07:54 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Added argvList to + myParameters assignment block in xmdsSimulation constructor. + Added code to process the argv element and put the command line + arguments into the argvList for use in xmdsglobals.cc. + +2003-08-05 07:51 paultcochrane + + * trunk/xmds-devel/source/xmdssequence.cc: Added code to accept + arguments on the command line for the xmds executable, only if + the argvList defined via the tag is non-zero. If the + incorrect number of arguments, the program gives a usage output + and exits. + +2003-08-05 07:49 paultcochrane + + * trunk/xmds-devel/source/xmdsglobals.cc: Added code to look for + tag in section and append the relevant code to + the myGlobalCode variable, to be output in the globals definition + section of the .cc file. This implements part of allowing + arguments to be passed to the executable at the command line. + +2003-08-05 07:47 paultcochrane + + * trunk/xmds-devel/source/xmdsclasses.h: Included header. + Added argvList string list to parametersStruct to implement the + passing of arguments to the output binary at the command line. + +2003-08-04 10:27 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Included the vector + header. Now "using namespace std" by default. + +2003-08-04 10:26 paultcochrane + + * trunk/xmds-devel/source/xmdsoutput.cc: Fixed a spelling error in + console output. + +2003-08-04 10:24 paultcochrane + + * trunk/xmds-devel/source/xmdsmomentgroup.cc: Output binary files + now have the moment group field name appended. This stops output + binary files writing all over one another. Implemented a better + technique of binary output: redundancy inherent in ascii output + format has been removed. + +2003-08-04 10:20 paultcochrane + + * trunk/xmds-devel/source/xmdsfield.cc: The std:: namespace is now + "used". The temporary files host.stuff and home.stuff are removed + after being used. + +2003-08-04 10:18 paultcochrane + + * trunk/xmds-devel/source/loadxsil.m: Modified to allow for changes + in binary output format. + +2003-07-28 09:42 paultcochrane + + * trunk/xmds-devel/Makefile.am: examples directory is now included + in EXTRA_DIST instead of SUBDIRS. This stops examples from being + compiled at build time. + +2003-07-28 09:41 paultcochrane + + * trunk/xmds-devel/configure.in: No longer produces Makefile in + examples directory. + +2003-07-28 09:13 paultcochrane + + * trunk/xmds-devel/source/Doxyfile: Initial import to repository + +2003-07-28 09:12 paultcochrane + + * trunk/xmds-devel/source/dom3.h, + trunk/xmds-devel/source/kissdom.h, + trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdscomplex.h, + trunk/xmds-devel/source/xmdsutils.h, + trunk/xmds-devel/source/xmlbasics.h, + trunk/xmds-devel/source/xmlparser.h, + trunk/xmds-devel/source/xsilfield.h: Documented for use with + Doxygen. Quite basic and incomplete, but with placeholders where + necessary for further addition and improvement of the api + documentation. + +2003-07-28 09:08 paultcochrane + + * trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmdssequence.cc: Added some documentation + to the file. Mainly just to test out Doxygen, automatic api + documentation generator. + +2003-07-23 04:24 paultcochrane + + * trunk/xmds-devel/examples/atomlaser.xmds, + trunk/xmds-devel/examples/fibre.xmds: Added tag + +2003-07-23 04:23 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Implemented code to + process tag properly. Added header so that + can actually do the benchmarking. + +2003-07-23 04:21 paultcochrane + + * trunk/xmds-devel/source/xmdssequence.cc: Added output code to + implement boolean + +2003-07-23 04:20 paultcochrane + + * trunk/xmds-devel/source/xmdsfield.cc: Fixed issues with gcc 3+ + not finding ifstream, ofstream, string etc. Need to prepend with + std:: to use the correct namespace. + +2003-07-23 04:19 paultcochrane + + * trunk/xmds-devel/source/xmdsclasses.h: Added benchmark boolean to + simulationParametersStruct + +2003-07-23 04:17 paultcochrane + + * trunk/xmds-devel/configure.in: Fixed problems with not getting + flags passed to mpicc right. Still not perfect though... + +2003-07-23 04:16 paultcochrane + + * trunk/xmds-devel/Makefile.am: Altered to allow building of + example binaries in the examples subdirectory + +2003-07-12 05:19 paultcochrane + + * trunk/xmds-devel/source/loadxsil.m: Loads binary data, and ascii + data. Is now callable as a function and returns variables into + calling script or functions variable space. Handles multiple + moment groups. + +2003-07-11 05:03 paultcochrane + + * trunk/xmds-devel/source/loadxsil.m: Initial import to repository. + Is able to parse .xsil files and automatically generate the code + to load binary data in from file. This is still under heavy + development, need to be able to load ascii data from .xsil files + and need to actually implement as a function as opposed to a + script. Nevertheless, the checkin was necessary/ + +2003-07-09 04:44 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Added useDouble + boolean to myParameters. Implemented finding use_double element + in xmds file, and setting accordingly if found. + +2003-07-09 04:43 paultcochrane + + * trunk/xmds-devel/source/xmdsmomentgroup.cc: Added C++ + header. Added a check for the value of the useDouble boolean, if + so, set output precison and cast (if necessary) accordingly. + Implemented single or double precision for output of binary data + depending on value of useDouble boolean. Default is to use + double. + +2003-07-09 04:40 paultcochrane + + * trunk/xmds-devel/source/xmdsclasses.h: Added useDouble boolean to + simulationParametersStruct (to implement the choice of using + double or single precision in binary output. + +2003-07-09 03:57 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Implemented + binaryOutput boolean. Implemented checking for + element in xmds code. Added some more headers to xmds generated + cc file so that can use more C++ features. + +2003-07-09 03:55 paultcochrane + + * trunk/xmds-devel/source/xmdsoutput.cc: Addition of myBoolList + variable in order to implement binary output + +2003-07-09 03:54 paultcochrane + + * trunk/xmds-devel/source/xmdsmomentgroup.cc: Implemented binary + output of data if boolean set to yes. + +2003-07-09 03:53 paultcochrane + + * trunk/xmds-devel/source/xmdsfield.cc: Added some informative + messages to output concerning what program is doing. Changed + dodgy C-like implementation of wisdom and hostName/homeDir to a + more robust C++ implementation. + +2003-07-09 03:50 paultcochrane + + * trunk/xmds-devel/source/xmdsclasses.h: Modified to turn debugging + on. Modified to add binaryOutput boolean to myParameters. + +2003-07-09 03:49 paultcochrane + + * trunk/xmds-devel/examples/atomlaser.xmds: Added and + flags to file. + +2003-07-07 06:02 paultcochrane + + * trunk/xmds-devel/examples/atomlaser.xmds: Made minor changes to + formatting of file. + +2003-07-07 06:01 paultcochrane + + * trunk/xmds-devel/source/xmdssimulation.cc: Added code to look for + tag in .xmds file, and implement if necessary. + +2003-07-07 05:59 paultcochrane + + * trunk/xmds-devel/source/xmdssequence.cc: Updated + writePlanCreationCalls() call so that includes new arguments due + to inclusion of wisdom + +2003-07-07 05:57 paultcochrane + + * trunk/xmds-devel/source/xmdsoutput.cc: Changed + writePlanCreationCalls() to allow for wisdom implementation + +2003-07-07 05:56 paultcochrane + + * trunk/xmds-devel/source/xmdsfield.cc: Implemented the use of + wisdom via the tag. xmds simulation binary now + outputs more progress information: when building forward and + backward plans for fftw; when importing wisdom; when exporting + wisdom; when using current directory instead of ~/.xmds/wisdom + for .wisdom files. Simulation binary now checks for the existence + of ~/.xmds/wisdom directory for storage of .wisdom files. + +2003-07-07 05:52 paultcochrane + + * trunk/xmds-devel/source/xmdsclasses.h: Changed + simulationParametersStruct to include useWisdom boolean. Updated + writePlanCreationCalls to include useWisdom in function call. + +2003-07-07 05:49 paultcochrane + + * trunk/xmds-devel/configure.in: Added checking for icc. Removed + superfluous AC_SUBST calls. Fixed some issues with building and + running xmds on machines with icc, the only problem being that + configure script is now becoming a bit ugly. + +2003-07-03 04:15 paultcochrane + + * trunk/xmds-devel/source/xmlparser.cc, + trunk/xmds-devel/source/xmlparser.h: Fixed xml parsing so + compiles and works on LinuxPPC. Problem was to do with different + implementations of char for different compilers. Basically, the + PPC gcc was setting some comparisons to always true or always + false, because the char data type was really unsigned char. What + was actually desired (and I believe used by Linux_x86 gcc) was + signed char, but this only affected a few cases. XML files are + now parsed properly and produce correct output (although there + are subtle differences in numerical output at the e-12 level + between LinuxPPC and LinuxI386, and I haven't checked that in + depth as yet). + +2003-07-03 04:11 paultcochrane + + * trunk/xmds-devel/source/Makefile.am: Initial import to repository + +2003-07-01 08:56 paultcochrane + + * trunk/xmds-devel/AUTHORS, trunk/xmds-devel/COPYING, + trunk/xmds-devel/INSTALL, trunk/xmds-devel/Makefile.am, + trunk/xmds-devel/NEWS, trunk/xmds-devel/README, + trunk/xmds-devel/configure.in, trunk/xmds-devel/install-sh, + trunk/xmds-devel/ltmain.sh, trunk/xmds-devel/missing, + trunk/xmds-devel/mkinstalldirs: Added initial version to + repository + +2003-07-01 08:55 paultcochrane + + * trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xsil2graphics.cc: Minor alterations to + standardise the naming conventions (e.g. VER is now VERSION) + +2003-06-25 02:30 joehope + + * trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc: Making (MPI) size a + global variable. Good for debugging. + +2003-06-03 02:30 joehope + + * trunk/xmds-devel/source/xmdsintegrate.cc: Fixing case sensitive + TRUE and FALSE + +2003-05-31 08:21 joehope + + * trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc: Added + element in . Places code before the integration loop. + This is good for time dependent functions. + +2003-05-31 05:53 joehope + + * trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdssequence.cc: Fixing two bugs for 0D + systems with post-propagation output in fourier space. + Allowing FFTWPLANS all the time, and fixing a verbose range + check. + +2003-04-17 06:22 joehope + + * trunk/xmds-devel/source/xmdsmomentgroup.cc: Fix range on if + statement for x-space moment group with a cross-section in + the first transverse dimension (deterministic MPI only) + +2003-04-17 04:52 joehope + + * trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc: Made rank a global + variable. Good for debugging. + +2003-04-17 01:55 joehope + + * trunk/xmds-devel/source/xmdsmomentgroup.cc: Fixed pointer + initialisation in moment groups for a deterministic MPI + simulation with a cross section in normal space for the first + transverse + dimension. + +2003-04-16 07:05 joehope + + * trunk/xmds-devel/source/xmdsvector.cc: Fixed a compiler warning + in renormalisation for deterministic MPI. + +2003-04-16 05:43 joehope + + * trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsvector.cc: Two range fixes for + deterministic MPI. + +2003-04-16 02:49 joehope + + * trunk/xmds-devel/source/xmdscomplex.h: Made the promotion of + complex to fftw_complex non-explicit. + Less warnings, and it should be safe. + +2003-04-16 02:46 joehope + + * trunk/xmds-devel/source/xmdscomplex.h: Fixed three errors in the + algebra for the complex overload operators. + Specifically: - (z), z*=double and z/=double were all broken! + +2003-04-04 00:23 joehope + + * trunk/xmds-devel/examples/highdim.xmds: Making highdim.xmds an + MPI-enabled script with fewer outputs. + +2003-04-04 00:22 joehope + + * trunk/xmds-devel/examples/gaugeatomlaser.xmds: Reverted + stochastic Fourier-space output to local-in-x form. + +2003-04-04 00:01 joehope + + * trunk/xmds-devel/examples/ndparamp.xmds: Pre-version 1.0 cruft + removal from examples + +2003-03-28 03:03 joehope + + * trunk/xmds-devel/source/xmdsvector.cc: Extra print variable cruft + removed + +2003-03-27 07:43 joehope + + * trunk/xmds-devel/examples/highdim.xmds, + trunk/xmds-devel/source/xmdssequence.cc: Nested subsequences now + call their initialisation functions. + +2003-03-27 07:29 joehope + + * trunk/xmds-devel/examples/highdim.xmds, + trunk/xmds-devel/source/xmdsvector.cc: Mixed space transforms + added for deterministic MPI. + +2003-03-27 02:45 joehope + + * trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdsvector.cc: Put TRUE and FALSE into + lowercase. Needed for linux (for icc, at least). + +2003-03-26 06:07 joehope + + * trunk/xmds-devel/examples/highdim.xmds, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegraterk4ex.cc, + trunk/xmds-devel/source/xmdsintegraterk4ip.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc: Passed cycle number + right through to the integrate loops + +2003-03-26 05:37 joehope + + * trunk/xmds-devel/examples/highdim.xmds, + trunk/xmds-devel/source/xmdsmomentgroup.cc: Deterministic MPI + nows works with all moment groups. Mixed space transforms still + broken. + +2003-03-25 04:26 joehope + + * trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdssequence.cc: Fixed cycles. Made all + segments have access to the cycle number. + Partial implementation of k-space output groups for deterministic + MPI. + +2003-03-24 23:38 joehope + + * trunk/xmds-devel/examples/atomlaser.xmds, + trunk/xmds-devel/examples/kubo.xmds, + trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xsil2graphics.cc: Fixed xsil2graphics bug + 708629. Added MPI changes to class definitions. + +2003-03-24 09:13 joehope + + * trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateex.cc, + trunk/xmds-devel/source/xmdsintegrateip.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegraterk4ex.cc, + trunk/xmds-devel/source/xmdsintegraterk4ip.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc, + trunk/xmds-devel/source/xmdsvector.cc: Reversion to local-in-x + tag with addition of the ability to use MPI on + deterministic problems with >1 transverse dimensions. k-space + moment groups + and mixed space transforms currently broken. Simply compile with + + element as for stochastic problems. + +2003-03-12 23:25 joehope + + * trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc: Memory reordering + now complete. Cross-propagation should now be fully operational. + +2003-03-11 06:23 joehope + + * trunk/xmds-devel/examples/fullpos3D.xmds, + trunk/xmds-devel/examples/gaugeatomlaser.xmds, + trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateex.cc, + trunk/xmds-devel/source/xmdsintegrateip.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdsvector.cc: Reordered all the fields + so that they are contiguous in memory when running + through the FFTs rather than when going through x-space loops. + This is in + preparation for parallelisation. x-space heavy algorithms are + slower and + k-space heavy algorithms are faster. I have tested all the + algorithms on + gaugeatomlaser.xmds, and they all work identically to the stable + branch. + Cross-propagation is definitely broken - but fixable with effort. + Mixed transforms should still work, but I haven't tested them on + anything. + Input files must now be reordered - components are now the + slowest changing + index rather than the fastest. + +2003-03-10 03:55 joehope + + * trunk/xmds-devel/examples/atomlaser.xmds, + trunk/xmds-devel/examples/gaugeatomlaser.xmds: Updating the + examples to make a tagged version. I want to have a + "pre-reordering" version, as I'm about to rearrange the memory + management of the main fields. + +2003-03-04 02:35 joehope + + * trunk/xmds-devel/source/xmdsintegrateex.cc: Fixed missing segment + name in xmdsintegrateex.cc (from previous speedup patch) + +2003-03-03 03:58 joehope + + * trunk/xmds-devel/examples/atomlaser.xmds, + trunk/xmds-devel/examples/gaugeatomlaser.xmds, + trunk/xmds-devel/source/xmdsintegrateex.cc, + trunk/xmds-devel/source/xmdsintegrateip.cc: Replaced various + operations in the K_operater routines with index pointers. + Provided detectable speedup. + Modified Files: + source/xmdsintegrateex.cc source/xmdsintegrateip.cc + +2003-02-23 23:53 joehope + + * trunk/xmds-devel/examples/fullpos3D.xmds, + trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc, + trunk/xmds-devel/source/xmdsvector.cc: Added partial support for + threading. Placement of a 15 element + in the simulation element will make the FFT use 15 threads. + Further threading to + follow. Default, and 1 is equivalent to the + non-threaded code. + + Note that fftw must be compiled with the --enable-threads option. + + Modified Files: + Configure examples/fullpos3D.xmds + source/main.cc source/xmdsclasses.h source/xmdssequence.cc + source/xmdssimulation.cc source/xmdsvector.cc + +2003-02-03 04:42 joehope + + * trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdsvector.cc, + trunk/xmds-devel/source/xmdsvectorelement.cc, + trunk/xmds-devel/source/xmlbasics.cc: Makefile has different + options for different systems (different option order required) + + Stack no longer used for main fields (Simon) + + logical and rather than bitwise and (Simon) + + Details in changes.log + +2003-02-03 01:23 joehope + + * trunk/xmds-devel, trunk/xmds-devel/examples, + trunk/xmds-devel/examples/atomlaser.xmds, + trunk/xmds-devel/examples/fibre.xmds, + trunk/xmds-devel/examples/fullpos3D.xmds, + trunk/xmds-devel/examples/gaugeatomlaser.xmds, + trunk/xmds-devel/examples/kubo.xmds, + trunk/xmds-devel/examples/ndparamp.xmds, + trunk/xmds-devel/examples/nlse.xmds, + trunk/xmds-devel/examples/sine.xmds, + trunk/xmds-devel/examples/soliton.xmds, + trunk/xmds-devel/examples/tla.xmds, trunk/xmds-devel/source, + trunk/xmds-devel/source/dom3.h, + trunk/xmds-devel/source/kissdom.cc, + trunk/xmds-devel/source/kissdom.h, + trunk/xmds-devel/source/main.cc, + trunk/xmds-devel/source/xmdsclasses.h, + trunk/xmds-devel/source/xmdscomplex.h, + trunk/xmds-devel/source/xmdselement.cc, + trunk/xmds-devel/source/xmdsfield.cc, + trunk/xmds-devel/source/xmdsfilter.cc, + trunk/xmds-devel/source/xmdsglobals.cc, + trunk/xmds-devel/source/xmdsintegrate.cc, + trunk/xmds-devel/source/xmdsintegrateex.cc, + trunk/xmds-devel/source/xmdsintegrateip.cc, + trunk/xmds-devel/source/xmdsintegraterk4.cc, + trunk/xmds-devel/source/xmdsintegraterk4ex.cc, + trunk/xmds-devel/source/xmdsintegraterk4ip.cc, + trunk/xmds-devel/source/xmdsintegratesi.cc, + trunk/xmds-devel/source/xmdsintegratesiex.cc, + trunk/xmds-devel/source/xmdsintegratesiip.cc, + trunk/xmds-devel/source/xmdsmomentgroup.cc, + trunk/xmds-devel/source/xmdsoutput.cc, + trunk/xmds-devel/source/xmdssegment.cc, + trunk/xmds-devel/source/xmdssequence.cc, + trunk/xmds-devel/source/xmdssimulation.cc, + trunk/xmds-devel/source/xmdsutils.cc, + trunk/xmds-devel/source/xmdsutils.h, + trunk/xmds-devel/source/xmdsvector.cc, + trunk/xmds-devel/source/xmdsvectorelement.cc, + trunk/xmds-devel/source/xmlbasics.cc, + trunk/xmds-devel/source/xmlbasics.h, + trunk/xmds-devel/source/xmlparser.cc, + trunk/xmds-devel/source/xmlparser.h, + trunk/xmds-devel/source/xsil2graphics.cc, + trunk/xmds-devel/source/xsilfield.cc, + trunk/xmds-devel/source/xsilfield.h: Initial revision -2003-02-02 xmds-1.0.2 - -This is a stable version of xmds. It is based on xmds-1.0-1, with one bugfix -and more configure options. diff -Nru xmds-1.6.5/configure xmds-1.6.6/configure --- xmds-1.6.5/configure 2008-02-25 21:32:55.000000000 -0600 +++ xmds-1.6.6/configure 2008-07-03 21:47:30.000000000 -0500 @@ -1,25 +1,54 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59. +# Generated by GNU Autoconf 2.61. # -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi -DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then @@ -29,8 +58,43 @@ fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + # Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done PS1='$ ' PS2='> ' PS4='+ ' @@ -44,18 +108,19 @@ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else - $as_unset $as_var + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var fi done # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then as_basename=basename else as_basename=false @@ -63,157 +128,388 @@ # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# CDPATH. +$as_unset CDPATH -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh +if test "x$CONFIG_SHELL" = x; then + if (eval ":") 2>/dev/null; then + as_have_required=yes +else + as_have_required=no +fi + + if test $as_have_required = yes && (eval ": +(as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. fi +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0) || { (exit 1); exit 1; } + +( + as_lineno_1=\$LINENO + as_lineno_2=\$LINENO + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && + test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +") 2> /dev/null; then + : +else + as_candidate_shells= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in + case $as_dir in /*) - if ("$as_dir/$as_base" -c ' + for as_base in sh bash ksh sh5; do + as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + done;; + esac +done +IFS=$as_save_IFS + + + for as_shell in $as_candidate_shells $SHELL; do + # Try only shells that exist, to save several forks. + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { ("$as_shell") 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + +: +_ASEOF +}; then + CONFIG_SHELL=$as_shell + as_have_required=yes + if { "$as_shell" 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + +: +(as_func_return () { + (exit $1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = "$1" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test $exitcode = 0) || { (exit 1); exit 1; } + +( as_lineno_1=$LINENO as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } + +_ASEOF +}; then + break +fi + +fi + + done + + if test "x$CONFIG_SHELL" != x; then + for as_var in BASH_ENV ENV + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + + if test $as_have_required = no; then + echo This script requires a shell more modern than all the + echo shells that I found on your system. Please install a + echo modern shell, or manually run the script under such a + echo shell if you do have one. + { (exit 1); exit 1; } +fi + + +fi + +fi + + + +(eval "as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0") || { + echo No shell found that supports shell functions. + echo Please tell autoconf@gnu.org about your system, + echo including any error possibly output before this + echo message +} + + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ t loop - s,-$,, - s,^['$as_cr_digits']*\n,, + s/-\n.*// ' >$as_me.lineno && - chmod +x $as_me.lineno || + chmod +x "$as_me.lineno" || { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" # Exit status is that of the last command. exit } -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi echo >conf$$.file if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then as_mkdir_p=: @@ -222,7 +518,28 @@ as_mkdir_p=false fi -as_executable_p="test -f" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -231,39 +548,27 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH +exec 7<&0 &1 # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -exec 6>&1 - # # Initializations. # ac_default_prefix=/usr/local +ac_clean_files= ac_config_libobj_dir=. +LIBOBJS= cross_compiling=no subdirs= MFLAGS= MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -# This variable seems obsolete. It should probably be removed, and -# only ac_max_sed_lines should be used. -: ${ac_max_here_lines=38} - # Identity of this package. PACKAGE_NAME= PACKAGE_TARNAME= @@ -275,42 +580,156 @@ # Factoring default headers for most tests. ac_includes_default="\ #include -#if HAVE_SYS_TYPES_H +#ifdef HAVE_SYS_TYPES_H # include #endif -#if HAVE_SYS_STAT_H +#ifdef HAVE_SYS_STAT_H # include #endif -#if STDC_HEADERS +#ifdef STDC_HEADERS # include # include #else -# if HAVE_STDLIB_H +# ifdef HAVE_STDLIB_H # include # endif #endif -#if HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H # include # endif # include #endif -#if HAVE_STRINGS_H +#ifdef HAVE_STRINGS_H # include #endif -#if HAVE_INTTYPES_H +#ifdef HAVE_INTTYPES_H # include -#else -# if HAVE_STDINT_H -# include -# endif #endif -#if HAVE_UNISTD_H +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_UNISTD_H # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE CFLAGS ac_ct_CC CCDEPMODE LN_S RANLIB ac_ct_RANLIB CPP EGREP ALLOCA build build_cpu build_vendor build_os host host_cpu host_vendor host_os PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS THREADLIBS MPICC MPILIBS LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL +PATH_SEPARATOR +PACKAGE_NAME +PACKAGE_TARNAME +PACKAGE_VERSION +PACKAGE_STRING +PACKAGE_BUGREPORT +exec_prefix +prefix +program_transform_name +bindir +sbindir +libexecdir +datarootdir +datadir +sysconfdir +sharedstatedir +localstatedir +includedir +oldincludedir +docdir +infodir +htmldir +dvidir +pdfdir +psdir +libdir +localedir +mandir +DEFS +ECHO_C +ECHO_N +ECHO_T +LIBS +build_alias +host_alias +target_alias +INSTALL_PROGRAM +INSTALL_SCRIPT +INSTALL_DATA +am__isrc +CYGPATH_W +PACKAGE +VERSION +ACLOCAL +AUTOCONF +AUTOMAKE +AUTOHEADER +MAKEINFO +install_sh +STRIP +INSTALL_STRIP_PROGRAM +mkdir_p +AWK +SET_MAKE +am__leading_dot +AMTAR +am__tar +am__untar +CC +CXX +CXXFLAGS +LDFLAGS +CPPFLAGS +ac_ct_CXX +EXEEXT +OBJEXT +DEPDIR +am__include +am__quote +AMDEP_TRUE +AMDEP_FALSE +AMDEPBACKSLASH +CXXDEPMODE +am__fastdepCXX_TRUE +am__fastdepCXX_FALSE +CFLAGS +ac_ct_CC +CCDEPMODE +am__fastdepCC_TRUE +am__fastdepCC_FALSE +LN_S +RANLIB +CPP +GREP +EGREP +ALLOCA +build +build_cpu +build_vendor +build_os +host +host_cpu +host_vendor +host_os +PTHREAD_CC +PTHREAD_LIBS +PTHREAD_CFLAGS +THREADLIBS +MPICC +MPILIBS +LIBOBJS +LTLIBOBJS' ac_subst_files='' + ac_precious_vars='build_alias +host_alias +target_alias +CXX +CXXFLAGS +LDFLAGS +LIBS +CPPFLAGS +CCC +CC +CFLAGS +CPP' + # Initialize some variables set by options. ac_init_help= @@ -337,34 +756,48 @@ # and all the variables that are supposed to be based on exec_prefix # by default will actually change. # Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' +datarootdir='${prefix}/share' +datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' +docdir='${datarootdir}/doc/${PACKAGE}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' ac_prev= +ac_dashdash= for ac_option do # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" + eval $ac_prev=\$ac_option ac_prev= continue fi - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` + case $ac_option in + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *) ac_optarg=yes ;; + esac # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_option in + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; @@ -386,33 +819,45 @@ --config-cache | -C) cache_file=config.cache ;; - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + -datadir | --datadir | --datadi | --datad) ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) + -datadir=* | --datadir=* | --datadi=* | --datad=*) datadir=$ac_optarg ;; + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + -disable-* | --disable-*) ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval "enable_$ac_feature=no" ;; + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; -enable-* | --enable-*) ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "enable_$ac_feature='$ac_optarg'" ;; + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -439,6 +884,12 @@ -host=* | --host=* | --hos=* | --ho=*) host_alias=$ac_optarg ;; + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; @@ -463,13 +914,16 @@ | --libexe=* | --libex=* | --libe=*) libexecdir=$ac_optarg ;; + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) + | --localstate | --localstat | --localsta | --localst | --locals) ac_prev=localstatedir ;; -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) localstatedir=$ac_optarg ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) @@ -534,6 +988,16 @@ | --progr-tra=* | --program-tr=* | --program-t=*) program_transform_name=$ac_optarg ;; + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; @@ -586,24 +1050,20 @@ -with-* | --with-*) ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "with_$ac_package='$ac_optarg'" ;; + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` - eval "with_$ac_package=no" ;; + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=no ;; --x) # Obsolete; use --with-x. @@ -634,8 +1094,7 @@ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 { (exit 1); exit 1; }; } - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` - eval "$ac_envvar='$ac_optarg'" + eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) @@ -655,27 +1114,19 @@ { (exit 1); exit 1; }; } fi -# Be sure to have absolute paths. -for ac_var in exec_prefix prefix -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac -done - -# Be sure to have absolute paths. -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir +# Be sure to have absolute directory names. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir do - eval ac_val=$`echo $ac_var` + eval ac_val=\$$ac_var case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac + { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; } done # There might be people who depend on the old broken behavior: `$host' @@ -702,82 +1153,76 @@ test "$silent" = yes && exec 6>/dev/null +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + { echo "$as_me: error: Working directory cannot be determined" >&2 + { (exit 1); exit 1; }; } +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + { echo "$as_me: error: pwd does not report name of working directory" >&2 + { (exit 1); exit 1; }; } + + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_confdir=`(dirname "$0") 2>/dev/null || + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$0" || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$0" : 'X\(//\)[^/]' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then + if test ! -r "$srcdir/$ac_unique_file"; then srcdir=.. fi else ac_srcdir_defaulted=no fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 - { (exit 1); exit 1; }; } - else - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } - fi -fi -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 - { (exit 1); exit 1; }; } -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` -ac_env_build_alias_set=${build_alias+set} -ac_env_build_alias_value=$build_alias -ac_cv_env_build_alias_set=${build_alias+set} -ac_cv_env_build_alias_value=$build_alias -ac_env_host_alias_set=${host_alias+set} -ac_env_host_alias_value=$host_alias -ac_cv_env_host_alias_set=${host_alias+set} -ac_cv_env_host_alias_value=$host_alias -ac_env_target_alias_set=${target_alias+set} -ac_env_target_alias_value=$target_alias -ac_cv_env_target_alias_set=${target_alias+set} -ac_cv_env_target_alias_value=$target_alias -ac_env_CXX_set=${CXX+set} -ac_env_CXX_value=$CXX -ac_cv_env_CXX_set=${CXX+set} -ac_cv_env_CXX_value=$CXX -ac_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_env_CXXFLAGS_value=$CXXFLAGS -ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_cv_env_CXXFLAGS_value=$CXXFLAGS -ac_env_LDFLAGS_set=${LDFLAGS+set} -ac_env_LDFLAGS_value=$LDFLAGS -ac_cv_env_LDFLAGS_set=${LDFLAGS+set} -ac_cv_env_LDFLAGS_value=$LDFLAGS -ac_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_env_CPPFLAGS_value=$CPPFLAGS -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_cv_env_CPPFLAGS_value=$CPPFLAGS -ac_env_CC_set=${CC+set} -ac_env_CC_value=$CC -ac_cv_env_CC_set=${CC+set} -ac_cv_env_CC_value=$CC -ac_env_CFLAGS_set=${CFLAGS+set} -ac_env_CFLAGS_value=$CFLAGS -ac_cv_env_CFLAGS_set=${CFLAGS+set} -ac_cv_env_CFLAGS_value=$CFLAGS -ac_env_CPP_set=${CPP+set} -ac_env_CPP_value=$CPP -ac_cv_env_CPP_set=${CPP+set} -ac_cv_env_CPP_value=$CPP +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { (exit 1); exit 1; }; } +fi +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 + { (exit 1); exit 1; }; } + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done # # Report the --help message. @@ -806,9 +1251,6 @@ -n, --no-create do not create output files --srcdir=DIR find the sources in DIR [configure dir or \`..'] -_ACEOF - - cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX [$ac_default_prefix] @@ -826,15 +1268,22 @@ --bindir=DIR user executables [EPREFIX/bin] --sbindir=DIR system admin executables [EPREFIX/sbin] --libexecdir=DIR program executables [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data [PREFIX/share] --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] - --infodir=DIR info documentation [PREFIX/info] - --mandir=DIR man documentation [PREFIX/man] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -860,8 +1309,8 @@ --enable-mpi If you want to use mpi, then set this flag --enable-threads If you want to use threads, then set this flag --enable-fftw3 If you want to use fftw3, then set this flag - --disable-dependency-tracking Speeds up one-time builds - --enable-dependency-tracking Do not reject slow dependency extractors + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -878,8 +1327,9 @@ CXXFLAGS C++ compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory - CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have - headers in a nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + you have headers in a nonstandard directory CC C compiler command CFLAGS C compiler flags CPP C preprocessor @@ -888,118 +1338,86 @@ it to find libraries and programs with nonstandard names/locations. _ACEOF +ac_status=$? fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. - ac_popdir=`pwd` for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d $ac_dir || continue + test -d "$ac_dir" || continue ac_builddir=. -if test "$ac_dir" != .; then +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix case $srcdir in - .) # No --srcdir option. We are building in place. + .) # We are building in place. ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - cd $ac_dir - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_srcdir/configure.gnu; then - echo - $SHELL $ac_srcdir/configure.gnu --help=recursive - elif test -f $ac_srcdir/configure; then - echo - $SHELL $ac_srcdir/configure --help=recursive - elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then - echo - $ac_configure --help + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi - cd $ac_popdir + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } done fi -test -n "$ac_init_help" && exit 0 +test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF +configure +generated by GNU Autoconf 2.61 -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF - exit 0 + exit fi -exec 5>config.log -cat >&5 <<_ACEOF +cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ _ACEOF +exec 5>>config.log { cat <<_ASUNAME ## --------- ## @@ -1018,7 +1436,7 @@ /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -hostinfo = `(hostinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` @@ -1032,6 +1450,7 @@ test -z "$as_dir" && as_dir=. echo "PATH: $as_dir" done +IFS=$as_save_IFS } >&5 @@ -1053,7 +1472,6 @@ ac_configure_args= ac_configure_args0= ac_configure_args1= -ac_sep= ac_must_keep_next=false for ac_pass in 1 2 do @@ -1064,7 +1482,7 @@ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) continue ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in @@ -1086,9 +1504,7 @@ -* ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - # Get rid of the leading space. - ac_sep=" " + ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac done @@ -1099,8 +1515,8 @@ # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. -# WARNING: Be sure not to use single quotes in there, as some shells, -# such as our DU 5.0 friend, will then `close' the trap. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? # Save into config.log some information that might help in debugging. { @@ -1113,20 +1529,34 @@ _ASBOX echo # The following way of writing the cache mishandles newlines in values, -{ +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done (set) 2>&1 | - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in - *ac_space=\ *) + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" - ;; + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( *) - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} + esac | + sort +) echo cat <<\_ASBOX @@ -1137,22 +1567,28 @@ echo for ac_var in $ac_subst_vars do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then cat <<\_ASBOX -## ------------- ## -## Output files. ## -## ------------- ## +## ------------------- ## +## File substitutions. ## +## ------------------- ## _ASBOX echo for ac_var in $ac_subst_files do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" done | sort echo fi @@ -1164,26 +1600,24 @@ ## ----------- ## _ASBOX echo - sed "/^$/d" confdefs.h | sort + cat confdefs.h echo fi test "$ac_signal" != 0 && echo "$as_me: caught signal $ac_signal" echo "$as_me: exit $exit_status" } >&5 - rm -f core *.core && - rm -rf conftest* confdefs* conf$$* $ac_clean_files && + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status - ' 0 +' 0 for ac_signal in 1 2 13 15; do trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo >confdefs.h +rm -f -r conftest* confdefs.h # Predefined preprocessor variables. @@ -1214,14 +1648,17 @@ # Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +if test -n "$CONFIG_SITE"; then + set x "$CONFIG_SITE" +elif test "x$prefix" != xNONE; then + set x "$prefix/share/config.site" "$prefix/etc/config.site" +else + set x "$ac_default_prefix/share/config.site" \ + "$ac_default_prefix/etc/config.site" fi -for ac_site_file in $CONFIG_SITE; do +shift +for ac_site_file +do if test -r "$ac_site_file"; then { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} @@ -1237,8 +1674,8 @@ { echo "$as_me:$LINENO: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in - [\\/]* | ?:[\\/]* ) . $cache_file;; - *) . ./$cache_file;; + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; esac fi else @@ -1250,12 +1687,11 @@ # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false -for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do +for ac_var in $ac_precious_vars; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val="\$ac_cv_env_${ac_var}_value" - eval ac_new_val="\$ac_env_${ac_var}_value" + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 @@ -1280,8 +1716,7 @@ # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -1298,11 +1733,6 @@ { (exit 1); exit 1; }; } fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -1319,36 +1749,47 @@ +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +XMDS_VERSION="1.6.6" +am__api_version='1.10' -XMDS_VERSION="1.6.5" -am__api_version="1.6" ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" break - elif test -f $ac_dir/install.sh; then + elif test -f "$ac_dir/install.sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install.sh -c" break - elif test -f $ac_dir/shtool; then + elif test -f "$ac_dir/shtool"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/shtool install -c" break fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 -echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} { (exit 1); exit 1; }; } fi -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -1363,8 +1804,8 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1386,7 +1827,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -1405,21 +1846,22 @@ ;; esac done +IFS=$as_save_IFS fi if test "${ac_cv_path_install+set}" = set; then INSTALL=$ac_cv_path_install else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will # break other packages using the cache if that directory is - # removed, or if the path is relative. + # removed, or if the value is a relative name. INSTALL=$ac_install_sh fi fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 +{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -1429,8 +1871,8 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } # Just in case sleep 1 echo timestamp > conftest.file @@ -1472,21 +1914,20 @@ Check your system clock" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } test "$program_prefix" != NONE && - program_transform_name="s,^,$program_prefix,;$program_transform_name" + program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. test "$program_suffix" != NONE && - program_transform_name="s,\$,$program_suffix,;$program_transform_name" + program_transform_name="s&\$&$program_suffix&;$program_transform_name" # Double any \ or $. echo might interpret backslashes. # By default was `s,x,x', remove it if useless. cat <<\_ACEOF >conftest.sed s/[\\$]/&&/g;s/;s,x,x,$// _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm conftest.sed - +rm -f conftest.sed # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` @@ -1501,12 +1942,60 @@ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi +{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } +if test -z "$MKDIR_P"; then + if test "${ac_cv_path_mkdir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done +done +IFS=$as_save_IFS + +fi + + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + test -d ./--version && rmdir ./--version + MKDIR_P="$ac_install_sh -d" + fi +fi +{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +echo "${ECHO_T}$MKDIR_P" >&6; } + +mkdir_p="$MKDIR_P" +case $mkdir_p in + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac + for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1519,65 +2008,91 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6 + { echo "$as_me:$LINENO: result: $AWK" >&5 +echo "${ECHO_T}$AWK" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$AWK" && break done -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } +set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.make <<\_ACEOF +SHELL = /bin/sh all: - @echo 'ac_maketemp="$(MAKE)"' + @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` -if test -n "$ac_maketemp"; then - eval ac_cv_prog_make_${ac_make}_set=yes -else - eval ac_cv_prog_make_${ac_make}_set=no -fi +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac rm -f conftest.make fi -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } SET_MAKE= else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi - # test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null + +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi fi + # Define the identity of the package. PACKAGE=xmds VERSION="$XMDS_VERSION" @@ -1608,10 +2123,7 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -AMTAR=${AMTAR-"${am_missing_run}tar"} - -install_sh=${install_sh-"$am_aux_dir/install-sh"} +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} # Installed binaries are usually stripped using `strip' when the user # run `make install-strip'. However `strip' might not be the right @@ -1621,8 +2133,8 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1635,32 +2147,34 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6 + { echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1673,44 +2187,61 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - STRIP=$ac_ct_STRIP + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi else STRIP="$ac_cv_prog_STRIP" fi fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" # We need awk for the "check" target. The system "awk" is bad on # some platforms. +# Always define AMTAR for backward compatibility. + +AMTAR=${AMTAR-"${am_missing_run}tar"} + +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' -# Add the stamp file to the list of files AC keeps track of, -# along with our hook. - ac_config_headers="$ac_config_headers source/config.h" +ac_config_headers="$ac_config_headers source/config.h" PACKAGE=xmds @@ -1721,91 +2252,92 @@ -# Check whether --with-fftw-path or --without-fftw-path was given. +# Check whether --with-fftw-path was given. if test "${with_fftw_path+set}" = set; then - withval="$with_fftw_path" - FFTW_PATH="$withval" + withval=$with_fftw_path; FFTW_PATH="$withval" else FFTW_PATH="" -fi; +fi + -# Check whether --with-fftw3-path or --without-fftw3-path was given. +# Check whether --with-fftw3-path was given. if test "${with_fftw3_path+set}" = set; then - withval="$with_fftw3_path" - FFTW3_PATH="$withval" + withval=$with_fftw3_path; FFTW3_PATH="$withval" else FFTW3_PATH="$FFTW_PATH" -fi; +fi + -# Check whether --with-user or --without-user was given. +# Check whether --with-user was given. if test "${with_user+set}" = set; then - withval="$with_user" - bindir="$HOME"/bin - includedir="$HOME"/bin + withval=$with_user; bindir="$HOME"/bin + includedir="$HOME"/bin libdir="$HOME"/bin mandir="$HOME"/man + docdir="$HOME"/doc/xmds USER_LIB="$HOME"/bin - USER_INCLUDE="$HOME"/bin - echo "XMDS will be installed into $bindir" + USER_INCLUDE="$HOME"/bin + echo "XMDS will be installed into $bindir" else USER_INCLUDE="." USER_LIB="." -fi; +fi + -# Check whether --with-mpi-libs or --without-mpi-libs was given. +# Check whether --with-mpi-libs was given. if test "${with_mpi_libs+set}" = set; then - withval="$with_mpi_libs" - MPI_LIBS="$withval" + withval=$with_mpi_libs; MPI_LIBS="$withval" else MPI_LIBS="$MPI_LIBS" -fi; +fi + -# Check whether --with-mpi-path or --without-mpi-path was given. +# Check whether --with-mpi-path was given. if test "${with_mpi_path+set}" = set; then - withval="$with_mpi_path" - MPI_PATH="$withval" PATH="$PATH:$withval/bin" + withval=$with_mpi_path; MPI_PATH="$withval" PATH="$PATH:$withval/bin" else MPI_PATH="$MPI_PATH" -fi; +fi + -# Check whether --with-mpi-compiler or --without-mpi-compiler was given. +# Check whether --with-mpi-compiler was given. if test "${with_mpi_compiler+set}" = set; then - withval="$with_mpi_compiler" + withval=$with_mpi_compiler; +fi -fi; -# Check whether --enable-mpi or --disable-mpi was given. +# Check whether --enable-mpi was given. if test "${enable_mpi+set}" = set; then - enableval="$enable_mpi" + enableval=$enable_mpi; +fi -fi; -# Check whether --enable-threads or --disable-threads was given. +# Check whether --enable-threads was given. if test "${enable_threads+set}" = set; then - enableval="$enable_threads" + enableval=$enable_threads; +fi -fi; -# Check whether --enable-fftw3 or --disable-fftw3 was given. +# Check whether --enable-fftw3 was given. if test "${enable_fftw3+set}" = set; then - enableval="$enable_fftw3" + enableval=$enable_fftw3; +fi -fi; AGGRESSIVE_GCC_CFLAGS=" -O3 -ffast-math -funroll-all-loops -fomit-frame-pointer" AGGRESSIVE_ICC_CFLAGS=" -O3 -tpp7 -ipo -ipo_obj" -echo "$as_me:$LINENO: checking for vendor's cc to be used instead of gcc" >&5 -echo $ECHO_N "checking for vendor's cc to be used instead of gcc... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for vendor's cc to be used instead of gcc" >&5 +echo $ECHO_N "checking for vendor's cc to be used instead of gcc... $ECHO_C" >&6; } # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1818,32 +2350,34 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="cc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -echo "$as_me:$LINENO: checking for vendor's cxx to be used instead of gcc" >&5 -echo $ECHO_N "checking for vendor's cxx to be used instead of gcc... $ECHO_C" >&6 + +{ echo "$as_me:$LINENO: checking for vendor's cxx to be used instead of gcc" >&5 +echo $ECHO_N "checking for vendor's cxx to be used instead of gcc... $ECHO_C" >&6; } # Extract the first word of "cxx", so it can be a program name with args. set dummy cxx; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1856,38 +2390,44 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="cxx" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6 + { echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -ac_ext=cc + +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -n "$ac_tool_prefix"; then - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1900,36 +2440,38 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6 + { echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$CXX" && break done fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1942,49 +2484,79 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_CXX" && break done -test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - CXX=$ac_ct_CXX + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi fi - + fi +fi # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C++ compiler version" >&5 +echo "$as_me:$LINENO: checking for C++ compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } @@ -2009,47 +2581,77 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5 -echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5 +echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6; } ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 - (eval $ac_link_default) 2>&5 +# +# List of possible output files, starting from the most likely. +# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) +# only as a last resort. b.out is created by i960 compilers. +ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' +# +# The IRIX 6 linker writes into existing files which may not be +# executable, retaining their permissions. Remove them first so a +# subsequent execution test works. +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { (ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link_default") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - # Find the output, starting from the most likely. This scheme is -# not robust to junk in `.', hence go to wildcards (a.*) only as a last -# resort. - -# Be careful to initialize this variable, since it used to be cached. -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. -ac_cv_exeext= -# b.out is created by i960 compilers. -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; - conftest.$ac_ext ) - # This is the source file. + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; [ab].out ) # We found the default executable, but exeext='' is most # certainly right. break;; *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. break;; * ) break;; esac done +test "$ac_cv_exeext" = no && ac_cv_exeext= + else + ac_file='' +fi + +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } +if test -z "$ac_file"; then echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -2061,19 +2663,21 @@ fi ac_exeext=$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6 -# Check the compiler produces executables we can run. If not, either +# Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5 -echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5 +echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6; } # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -2092,22 +2696,27 @@ fi fi fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check the compiler produces executables we can run. If not, either +# Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6 - -echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 +echo "${ECHO_T}$cross_compiling" >&6; } + +{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then @@ -2118,9 +2727,8 @@ for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext break;; * ) break;; esac @@ -2134,14 +2742,14 @@ fi rm -f conftest$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +echo "${ECHO_T}$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2161,14 +2769,20 @@ } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac @@ -2186,12 +2800,12 @@ rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +echo "${ECHO_T}$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } if test "${ac_cv_cxx_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2214,50 +2828,49 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } GXX=`test $ac_compiler_gnu = yes && echo yes` ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -CXXFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_cxx_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2273,186 +2886,152 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cxx_g=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF + CXXFLAGS="" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_declaration -#include + int main () { -exit (42); + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_declaration + int main () { -exit (42); + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -rm -f .deps 2>/dev/null -mkdir .deps 2>/dev/null -if test -d .deps; then - DEPDIR=.deps -else - # MS-DOS does not allow filenames that begin with a dot. - DEPDIR=_deps -fi -rmdir .deps 2>/dev/null - +DEPDIR="${am__leading_dot}deps" - ac_config_commands="$ac_config_commands depfiles" +ac_config_commands="$ac_config_commands depfiles" am_make=${MAKE-make} cat > confinc << 'END' -doit: +am__doit: @echo done +.PHONY: am__doit END # If we don't find an include directive, just comment out the code. -echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } am__include="#" am__quote= _am_result=none @@ -2463,7 +3042,7 @@ # In particular we don't look at `^make:' because GNU make might # be invoked under some other name (usually "gmake"), in which # case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then am__include=include am__quote= _am_result=GNU @@ -2479,22 +3058,20 @@ fi -echo "$as_me:$LINENO: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6 +{ echo "$as_me:$LINENO: result: $_am_result" >&5 +echo "${ECHO_T}$_am_result" >&6; } rm -f confinc confmf -# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. +# Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then - enableval="$enable_dependency_tracking" + enableval=$enable_dependency_tracking; +fi -fi; if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' fi - - -if test "x$enable_dependency_tracking" != xno; then + if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= AMDEP_FALSE='#' else @@ -2504,11 +3081,10 @@ - depcc="$CXX" am_compiler_list= -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2523,18 +3099,34 @@ # using a relative directory. cp "$am_depcomp" conftest.dir cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub am_cv_CXX_dependencies_compiler_type=none if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # # We need to recreate these files for each test, as the compiler may # overwrite some of them when testing with obscure command lines. # This happens at least with the AIX C compiler. - echo '#include "conftest.h"' > conftest.c - echo 'int i;' > conftest.h - echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf case $depmode in nosideeffect) @@ -2552,13 +3144,26 @@ # mode. It turns out that the SunPro C++ compiler does not properly # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=conftest.c object=conftest.o \ - depfile=conftest.Po tmpdepfile=conftest.TPo \ - $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && - grep conftest.h conftest.Po > /dev/null 2>&1 && + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - am_cv_CXX_dependencies_compiler_type=$depmode - break + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CXX_dependencies_compiler_type=$depmode + break + fi fi done @@ -2569,10 +3174,20 @@ fi fi -echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 +{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then + am__fastdepCXX_TRUE= + am__fastdepCXX_FALSE='#' +else + am__fastdepCXX_TRUE='#' + am__fastdepCXX_FALSE= +fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -2582,8 +3197,8 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2596,32 +3211,34 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2634,36 +3251,51 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi else CC="$ac_cv_prog_CC" fi if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2676,98 +3308,59 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + + fi fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC +if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. else + ac_prog_rejected=no as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi - -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. @@ -2785,22 +3378,23 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$CC"; then if test -n "$ac_tool_prefix"; then - for ac_prog in cl + for ac_prog in cl.exe do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2813,36 +3407,38 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$CC" && break done fi if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in cl + for ac_prog in cl.exe do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2855,29 +3451,45 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_CC" && break done - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi fi fi @@ -2890,27 +3502,41 @@ { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C compiler version" >&5 +echo "$as_me:$LINENO: checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2933,50 +3559,49 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -CFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2992,38 +3617,118 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + CFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cc_g=no + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -3039,12 +3744,12 @@ CFLAGS= fi fi -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_prog_cc_stdc=no + ac_cv_prog_cc_c89=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -3078,12 +3783,17 @@ /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not '\xHH' hex character constants. These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std1 is added to get + as 'x'. The following induces an error, until -std is added to get proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std1. */ + that's true only with -std. */ int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; @@ -3098,205 +3808,57 @@ return 0; } _ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cc_stdc=$ac_arg -break + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c89=$ac_arg else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext + +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break done -rm -f conftest.$ac_ext conftest.$ac_objext +rm -f conftest.$ac_ext CC=$ac_save_CC fi - -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6; } ;; + xno) + { echo "$as_me:$LINENO: result: unsupported" >&5 +echo "${ECHO_T}unsupported" >&6; } ;; *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; + CC="$CC $ac_cv_prog_cc_c89" + { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; esac -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#endif -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -#include -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3305,8 +3867,8 @@ depcc="$CC" am_compiler_list= -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3321,18 +3883,34 @@ # using a relative directory. cp "$am_depcomp" conftest.dir cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub am_cv_CC_dependencies_compiler_type=none if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # # We need to recreate these files for each test, as the compiler may # overwrite some of them when testing with obscure command lines. # This happens at least with the AIX C compiler. - echo '#include "conftest.h"' > conftest.c - echo 'int i;' > conftest.h - echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf case $depmode in nosideeffect) @@ -3350,13 +3928,26 @@ # mode. It turns out that the SunPro C++ compiler does not properly # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=conftest.c object=conftest.o \ - depfile=conftest.Po tmpdepfile=conftest.TPo \ - $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && - grep conftest.h conftest.Po > /dev/null 2>&1 && + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - am_cv_CC_dependencies_compiler_type=$depmode - break + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi fi done @@ -3367,19 +3958,28 @@ fi fi -echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 +{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= +fi -echo "$as_me:$LINENO: checking for library containing strerror" >&5 -echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6 + +{ echo "$as_me:$LINENO: checking for library containing strerror" >&5 +echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; } if test "${ac_cv_search_strerror+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_func_search_save_LIBS=$LIBS -ac_cv_search_strerror=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -3387,115 +3987,73 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char strerror (); int main () { -strerror (); +return strerror (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +for ac_lib in '' cposix; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_strerror="none required" + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_search_strerror=$ac_res else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test "$ac_cv_search_strerror" = no; then - for ac_lib in cposix; do - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char strerror (); -int -main () -{ -strerror (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_strerror="-l$ac_lib" -break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_strerror+set}" = set; then + break fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done +done +if test "${ac_cv_search_strerror+set}" = set; then + : +else + ac_cv_search_strerror=no fi +rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 -echo "${ECHO_T}$ac_cv_search_strerror" >&6 -if test "$ac_cv_search_strerror" != no; then - test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS" +{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 +echo "${ECHO_T}$ac_cv_search_strerror" >&6; } +ac_res=$ac_cv_search_strerror +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi @@ -3513,8 +4071,8 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3536,7 +4094,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -3555,21 +4113,22 @@ ;; esac done +IFS=$as_save_IFS fi if test "${ac_cv_path_install+set}" = set; then INSTALL=$ac_cv_path_install else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will # break other packages using the cache if that directory is - # removed, or if the path is relative. + # removed, or if the value is a relative name. INSTALL=$ac_install_sh fi fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 +{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -3579,22 +4138,22 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6 + { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +echo "${ECHO_T}no, using $LN_S" >&6; } fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3607,32 +4166,34 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6 + { echo "$as_me:$LINENO: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3645,27 +4206,41 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +echo "${ECHO_T}$ac_ct_RANLIB" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - RANLIB=$ac_ct_RANLIB + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi else RANLIB="$ac_cv_prog_RANLIB" fi @@ -3694,8 +4269,8 @@ fi -echo "$as_me:$LINENO: checking for sqrt in -lm" >&5 -echo $ECHO_N "checking for sqrt in -lm... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for sqrt in -lm" >&5 +echo $ECHO_N "checking for sqrt in -lm... $ECHO_C" >&6; } if test "${ac_cv_lib_m_sqrt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3708,56 +4283,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqrt (); int main () { -sqrt (); +return sqrt (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_m_sqrt=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_m_sqrt=no + ac_cv_lib_m_sqrt=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_m_sqrt" >&5 -echo "${ECHO_T}$ac_cv_lib_m_sqrt" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_sqrt" >&5 +echo "${ECHO_T}$ac_cv_lib_m_sqrt" >&6; } if test $ac_cv_lib_m_sqrt = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBM 1 @@ -3768,8 +4340,8 @@ fi -echo "$as_me:$LINENO: checking for cout in -lstdc++" >&5 -echo $ECHO_N "checking for cout in -lstdc++... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for cout in -lstdc++" >&5 +echo $ECHO_N "checking for cout in -lstdc++... $ECHO_C" >&6; } if test "${ac_cv_lib_stdcpp_cout+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3782,56 +4354,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char cout (); int main () { -cout (); +return cout (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_stdcpp_cout=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_stdcpp_cout=no + ac_cv_lib_stdcpp_cout=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_stdcpp_cout" >&5 -echo "${ECHO_T}$ac_cv_lib_stdcpp_cout" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_stdcpp_cout" >&5 +echo "${ECHO_T}$ac_cv_lib_stdcpp_cout" >&6; } if test $ac_cv_lib_stdcpp_cout = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBSTDC__ 1 @@ -3847,8 +4416,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -3882,24 +4451,22 @@ #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -3908,9 +4475,10 @@ # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -3920,24 +4488,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -3948,6 +4514,7 @@ ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -3965,8 +4532,8 @@ else ac_cv_prog_CPP=$CPP fi -echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 +{ echo "$as_me:$LINENO: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -3989,24 +4556,22 @@ #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -4015,9 +4580,10 @@ # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -4027,24 +4593,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -4055,6 +4619,7 @@ ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -4077,23 +4642,170 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -if test "${ac_cv_prog_egrep+set}" = set; then +{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Extract the first word of "grep ggrep" to use in msg output +if test -z "$GREP"; then +set dummy grep ggrep; ac_prog_name=$2 +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_path_GREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + # Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + + $ac_path_GREP_found && break 3 + done +done + +done +IFS=$as_save_IFS + + +fi + +GREP="$ac_cv_path_GREP" +if test -z "$GREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi + +else + ac_cv_path_GREP=$GREP +fi + + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + # Extract the first word of "egrep" to use in msg output +if test -z "$EGREP"; then +set dummy egrep; ac_prog_name=$2 +if test "${ac_cv_path_EGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' + ac_path_EGREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + # Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + + $ac_path_EGREP_found && break 3 + done +done + +done +IFS=$as_save_IFS + + +fi + +EGREP="$ac_cv_path_EGREP" +if test -z "$EGREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi + +else + ac_cv_path_EGREP=$EGREP fi -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 + fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4117,35 +4829,31 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_stdc=no + ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. @@ -4201,6 +4909,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include +#include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) @@ -4220,18 +4929,27 @@ for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); + return 2; + return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -4244,12 +4962,14 @@ ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi fi -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF @@ -4262,8 +4982,8 @@ # Can't have this one when mpicc and cc are mixed non-gnu/gnu #if test "x$CC" = xgcc #then -# CFLAGS="$CFLAGS -Wall -pedantic" -# CXXFLAGS="$CXXFLAGS -Wall -pedantic -ansi" +# CFLAGS="$CFLAGS -Wall -pedantic" +# CXXFLAGS="$CXXFLAGS -Wall -pedantic -ansi" #fi # Add some warnings to the build @@ -4276,10 +4996,79 @@ CFLAGS="$CFLAGS $WARN_FLAGS" CXXFLAGS="$CXXFLAGS $WARN_FLAGS" +# On IRIX 5.3, sys/types and inttypes.h are conflicting. + + + + + + + + + +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Header=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! -echo "$as_me:$LINENO: checking for working alloca.h" >&5 -echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for working alloca.h" >&5 +echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; } if test "${ac_cv_working_alloca_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4294,44 +5083,42 @@ main () { char *p = (char *) alloca (2 * sizeof (int)); + if (p) return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_working_alloca_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_working_alloca_h=no + ac_cv_working_alloca_h=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 -echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 +echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; } if test $ac_cv_working_alloca_h = yes; then cat >>confdefs.h <<\_ACEOF @@ -4340,8 +5127,8 @@ fi -echo "$as_me:$LINENO: checking for alloca" >&5 -echo $ECHO_N "checking for alloca... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for alloca" >&5 +echo $ECHO_N "checking for alloca... $ECHO_C" >&6; } if test "${ac_cv_func_alloca_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4358,7 +5145,7 @@ # include # define alloca _alloca # else -# if HAVE_ALLOCA_H +# ifdef HAVE_ALLOCA_H # include # else # ifdef _AIX @@ -4376,44 +5163,42 @@ main () { char *p = (char *) alloca (1); + if (p) return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_alloca_works=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_alloca_works=no + ac_cv_func_alloca_works=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 -echo "${ECHO_T}$ac_cv_func_alloca_works" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 +echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; } if test $ac_cv_func_alloca_works = yes; then @@ -4427,15 +5212,15 @@ # contain a buggy version. If you still want to use their alloca, # use ar to extract alloca.o from them instead of compiling alloca.c. -ALLOCA=alloca.$ac_objext +ALLOCA=\${LIBOBJDIR}alloca.$ac_objext cat >>confdefs.h <<\_ACEOF #define C_ALLOCA 1 _ACEOF -echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 -echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 +echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; } if test "${ac_cv_os_cray+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4445,7 +5230,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#if defined(CRAY) && ! defined(CRAY2) +#if defined CRAY && ! defined CRAY2 webecray #else wenotbecray @@ -4461,14 +5246,14 @@ rm -f conftest* fi -echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 -echo "${ECHO_T}$ac_cv_os_cray" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 +echo "${ECHO_T}$ac_cv_os_cray" >&6; } if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -4494,68 +5279,60 @@ #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF @@ -4568,8 +5345,8 @@ done fi -echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 -echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 +echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; } if test "${ac_cv_c_stack_direction+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4582,6 +5359,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +$ac_includes_default int find_stack_direction () { @@ -4599,17 +5377,26 @@ int main () { - exit (find_stack_direction () < 0); + return find_stack_direction () < 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -4622,11 +5409,13 @@ ( exit $ac_status ) ac_cv_c_stack_direction=-1 fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi -echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 -echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 +echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; } cat >>confdefs.h <<_ACEOF #define STACK_DIRECTION $ac_cv_c_stack_direction @@ -4639,63 +5428,91 @@ if test "x$enable_threads" = "xyes" then - # POSIX threads, the default choice: - if test -z "$THREADLIBS"; then + # POSIX threads, the default choice: + if test -z "$THREADLIBS"; then # Make sure we can run config.sub. -$ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 -echo "$as_me: error: cannot run $ac_config_sub" >&2;} +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6; } if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_build_alias=$build_alias -test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` -test -z "$ac_cv_build_alias" && + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +echo "$as_me: error: invalid value of canonical build" >&2;} + { (exit 1); exit 1; }; };; +esac build=$ac_cv_build -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6; } if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_host_alias=$host_alias -test -z "$ac_cv_host_alias" && - ac_cv_host_alias=$ac_cv_build_alias -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} { (exit 1); exit 1; }; } +fi fi -echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +echo "$as_me: error: invalid value of canonical host" >&2;} + { (exit 1); exit 1; }; };; +esac host=$ac_cv_host -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac @@ -4721,8 +5538,8 @@ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" save_LIBS="$LIBS" LIBS="$PTHREAD_LIBS $LIBS" - echo "$as_me:$LINENO: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 -echo $ECHO_N "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 +echo $ECHO_N "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4730,53 +5547,51 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char pthread_join (); int main () { -pthread_join (); +return pthread_join (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then acx_pthread_ok=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext - echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5 -echo "${ECHO_T}$acx_pthread_ok" >&6 + { echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5 +echo "${ECHO_T}$acx_pthread_ok" >&6; } if test x"$acx_pthread_ok" = xno; then PTHREAD_LIBS="" PTHREAD_CFLAGS="" @@ -4834,19 +5649,19 @@ case $flag in none) - echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5 -echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5 +echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6; } ;; -*) - echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5 -echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5 +echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6; } PTHREAD_CFLAGS="$flag" ;; *) - echo "$as_me:$LINENO: checking for the pthreads library -l$flag" >&5 -echo $ECHO_N "checking for the pthreads library -l$flag... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for the pthreads library -l$flag" >&5 +echo $ECHO_N "checking for the pthreads library -l$flag... $ECHO_C" >&6; } PTHREAD_LIBS="-l$flag" ;; esac @@ -4883,41 +5698,39 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then acx_pthread_ok=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$save_LIBS" CFLAGS="$save_CFLAGS" - echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5 -echo "${ECHO_T}$acx_pthread_ok" >&6 + { echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5 +echo "${ECHO_T}$acx_pthread_ok" >&6; } if test "x$acx_pthread_ok" = xyes; then break; fi @@ -4936,8 +5749,8 @@ # Detect AIX lossage: threads are created detached by default # and the JOINABLE attribute has a nonstandard name (UNDETACHED). - echo "$as_me:$LINENO: checking for joinable pthread attribute" >&5 -echo $ECHO_N "checking for joinable pthread attribute... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for joinable pthread attribute" >&5 +echo $ECHO_N "checking for joinable pthread attribute... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4954,35 +5767,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ok=PTHREAD_CREATE_JOINABLE else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ok=unknown + ok=unknown fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test x"$ok" = xunknown; then cat >conftest.$ac_ext <<_ACEOF @@ -5001,35 +5811,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ok=PTHREAD_CREATE_UNDETACHED else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ok=unknown + ok=unknown fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi if test x"$ok" != xPTHREAD_CREATE_JOINABLE; then @@ -5039,22 +5846,22 @@ _ACEOF fi - echo "$as_me:$LINENO: result: ${ok}" >&5 -echo "${ECHO_T}${ok}" >&6 + { echo "$as_me:$LINENO: result: ${ok}" >&5 +echo "${ECHO_T}${ok}" >&6; } if test x"$ok" = xunknown; then { echo "$as_me:$LINENO: WARNING: we do not know how to create joinable pthreads" >&5 echo "$as_me: WARNING: we do not know how to create joinable pthreads" >&2;} fi - echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5 -echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5 +echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6; } flag=no case "${host_cpu}-${host_os}" in *-aix* | *-freebsd*) flag="-D_THREAD_SAFE";; *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; esac - echo "$as_me:$LINENO: result: ${flag}" >&5 -echo "${ECHO_T}${flag}" >&6 + { echo "$as_me:$LINENO: result: ${flag}" >&5 +echo "${ECHO_T}${flag}" >&6; } if test "x$flag" != xno; then PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" fi @@ -5065,8 +5872,8 @@ # More AIX lossage: must compile with cc_r # Extract the first word of "cc_r", so it can be a program name with args. set dummy cc_r; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5079,26 +5886,28 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_PTHREAD_CC="cc_r" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_prog_PTHREAD_CC" && ac_cv_prog_PTHREAD_CC="${CC}" fi fi PTHREAD_CC=$ac_cv_prog_PTHREAD_CC if test -n "$PTHREAD_CC"; then - echo "$as_me:$LINENO: result: $PTHREAD_CC" >&5 -echo "${ECHO_T}$PTHREAD_CC" >&6 + { echo "$as_me:$LINENO: result: $PTHREAD_CC" >&5 +echo "${ECHO_T}$PTHREAD_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + else PTHREAD_CC="$CC" fi @@ -5132,11 +5941,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - fi - # Solaris threads: - if test -z "$THREADLIBS"; then - echo "$as_me:$LINENO: checking for thr_create in -lthread" >&5 -echo $ECHO_N "checking for thr_create in -lthread... $ECHO_C" >&6 + fi + # Solaris threads: + if test -z "$THREADLIBS"; then + { echo "$as_me:$LINENO: checking for thr_create in -lthread" >&5 +echo $ECHO_N "checking for thr_create in -lthread... $ECHO_C" >&6; } if test "${ac_cv_lib_thread_thr_create+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5149,56 +5958,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char thr_create (); int main () { -thr_create (); +return thr_create (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_thread_thr_create=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_thread_thr_create=no + ac_cv_lib_thread_thr_create=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_thread_thr_create" >&5 -echo "${ECHO_T}$ac_cv_lib_thread_thr_create" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_thread_thr_create" >&5 +echo "${ECHO_T}$ac_cv_lib_thread_thr_create" >&6; } if test $ac_cv_lib_thread_thr_create = yes; then THREADLIBS="-lthread" @@ -5208,11 +6014,11 @@ fi - fi - # Mach C threads: - if test -z "$THREADLIBS"; then - echo "$as_me:$LINENO: checking for cthread_fork" >&5 -echo $ECHO_N "checking for cthread_fork... $ECHO_C" >&6 + fi + # Mach C threads: + if test -z "$THREADLIBS"; then + { echo "$as_me:$LINENO: checking for cthread_fork" >&5 +echo $ECHO_N "checking for cthread_fork... $ECHO_C" >&6; } if test "${ac_cv_func_cthread_fork+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5239,68 +6045,59 @@ #undef cthread_fork -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char cthread_fork (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_cthread_fork) || defined (__stub___cthread_fork) +#if defined __stub_cthread_fork || defined __stub___cthread_fork choke me -#else -char (*f) () = cthread_fork; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != cthread_fork; +return cthread_fork (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_cthread_fork=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_cthread_fork=no + ac_cv_func_cthread_fork=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_cthread_fork" >&5 -echo "${ECHO_T}$ac_cv_func_cthread_fork" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_cthread_fork" >&5 +echo "${ECHO_T}$ac_cv_func_cthread_fork" >&6; } if test $ac_cv_func_cthread_fork = yes; then THREADLIBS=" " @@ -5310,96 +6107,25 @@ fi - # On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_Header=no" -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - for ac_header in mach/cthreads.h cthreads.h cthread.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5410,41 +6136,37 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5453,24 +6175,22 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -5478,9 +6198,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -5504,25 +6225,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -5534,10 +6249,10 @@ done - fi - if test -z "$THREADLIBS"; then - echo "$as_me:$LINENO: checking for cthread_fork in -lcthread" >&5 -echo $ECHO_N "checking for cthread_fork in -lcthread... $ECHO_C" >&6 + fi + if test -z "$THREADLIBS"; then + { echo "$as_me:$LINENO: checking for cthread_fork in -lcthread" >&5 +echo $ECHO_N "checking for cthread_fork in -lcthread... $ECHO_C" >&6; } if test "${ac_cv_lib_cthread_cthread_fork+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5550,56 +6265,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char cthread_fork (); int main () { -cthread_fork (); +return cthread_fork (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_cthread_cthread_fork=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_cthread_cthread_fork=no + ac_cv_lib_cthread_cthread_fork=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_cthread_cthread_fork" >&5 -echo "${ECHO_T}$ac_cv_lib_cthread_cthread_fork" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_cthread_cthread_fork" >&5 +echo "${ECHO_T}$ac_cv_lib_cthread_cthread_fork" >&6; } if test $ac_cv_lib_cthread_cthread_fork = yes; then THREADLIBS="-lcthread" @@ -5615,18 +6327,19 @@ for ac_header in mach/cthreads.h cthreads.h cthread.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5637,41 +6350,37 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5680,24 +6389,22 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -5705,9 +6412,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -5731,25 +6439,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -5761,10 +6463,10 @@ done - fi - if test -z "$THREADLIBS"; then - echo "$as_me:$LINENO: checking for cthread_fork in -lcthreads" >&5 -echo $ECHO_N "checking for cthread_fork in -lcthreads... $ECHO_C" >&6 + fi + if test -z "$THREADLIBS"; then + { echo "$as_me:$LINENO: checking for cthread_fork in -lcthreads" >&5 +echo $ECHO_N "checking for cthread_fork in -lcthreads... $ECHO_C" >&6; } if test "${ac_cv_lib_cthreads_cthread_fork+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5777,56 +6479,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char cthread_fork (); int main () { -cthread_fork (); +return cthread_fork (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_cthreads_cthread_fork=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_cthreads_cthread_fork=no + ac_cv_lib_cthreads_cthread_fork=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_cthreads_cthread_fork" >&5 -echo "${ECHO_T}$ac_cv_lib_cthreads_cthread_fork" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_cthreads_cthread_fork" >&5 +echo "${ECHO_T}$ac_cv_lib_cthreads_cthread_fork" >&6; } if test $ac_cv_lib_cthreads_cthread_fork = yes; then THREADLIBS="-lcthreads" @@ -5842,18 +6541,19 @@ for ac_header in mach/cthreads.h cthreads.h cthread.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5864,41 +6564,37 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5907,24 +6603,22 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -5932,9 +6626,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -5958,25 +6653,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -5988,11 +6677,11 @@ done - fi - # BeOS threads: - if test -z "$THREADLIBS"; then - echo "$as_me:$LINENO: checking for spawn_thread" >&5 -echo $ECHO_N "checking for spawn_thread... $ECHO_C" >&6 + fi + # BeOS threads: + if test -z "$THREADLIBS"; then + { echo "$as_me:$LINENO: checking for spawn_thread" >&5 +echo $ECHO_N "checking for spawn_thread... $ECHO_C" >&6; } if test "${ac_cv_func_spawn_thread+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6019,68 +6708,59 @@ #undef spawn_thread -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char spawn_thread (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_spawn_thread) || defined (__stub___spawn_thread) +#if defined __stub_spawn_thread || defined __stub___spawn_thread choke me -#else -char (*f) () = spawn_thread; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != spawn_thread; +return spawn_thread (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_spawn_thread=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_spawn_thread=no + ac_cv_func_spawn_thread=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_spawn_thread" >&5 -echo "${ECHO_T}$ac_cv_func_spawn_thread" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_spawn_thread" >&5 +echo "${ECHO_T}$ac_cv_func_spawn_thread" >&6; } if test $ac_cv_func_spawn_thread = yes; then THREADLIBS=" " @@ -6090,22 +6770,22 @@ fi - fi - if test -z "$THREADLIBS"; then + fi + if test -z "$THREADLIBS"; then { { echo "$as_me:$LINENO: error: couldn't find threads library" >&5 echo "$as_me: error: couldn't find threads library" >&2;} { (exit 1); exit 1; }; } - fi + fi -# end enable_threads test + # end enable_threads test fi ### This code included from libsndfile configure.ac. # Determine endian-ness of target processor. -echo "$as_me:$LINENO: checking determining processor byte ordering" >&5 -echo $ECHO_N "checking determining processor byte ordering... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking determining processor byte ordering" >&5 +echo $ECHO_N "checking determining processor byte ordering... $ECHO_C" >&6; } if test "${ac_cv_c_byte_order+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6137,35 +6817,33 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_c_byte_order=little else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF @@ -6189,35 +6867,33 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_c_byte_order=big else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi @@ -6246,27 +6922,23 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -6289,35 +6961,33 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_c_byte_order=little else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF @@ -6342,35 +7012,33 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_c_byte_order=little else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext @@ -6378,8 +7046,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi @@ -6426,13 +7096,22 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -6445,9 +7124,11 @@ ( exit $ac_status ) ac_cv_c_byte_order=big fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + if test "$cross_compiling" = yes; then ac_cv_c_byte_order=unknown @@ -6469,13 +7150,22 @@ } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -6488,15 +7178,17 @@ ( exit $ac_status ) ac_cv_c_byte_order=little fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi fi fi -echo "$as_me:$LINENO: result: $ac_cv_c_byte_order" >&5 -echo "${ECHO_T}$ac_cv_c_byte_order" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_c_byte_order" >&5 +echo "${ECHO_T}$ac_cv_c_byte_order" >&6; } if test $ac_cv_c_byte_order = big ; then @@ -6529,8 +7221,8 @@ _ACEOF -echo "$as_me:$LINENO: checking for unsigned long" >&5 -echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for unsigned long" >&5 +echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6; } if test "${ac_cv_type_unsigned_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6541,61 +7233,57 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef unsigned long ac__type_new_; int main () { -if ((unsigned long *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (unsigned long)) +if (sizeof (ac__type_new_)) return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_unsigned_long=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_unsigned_long=no + ac_cv_type_unsigned_long=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5 -echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5 +echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; } -echo "$as_me:$LINENO: checking size of unsigned long" >&5 -echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6 +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of unsigned long" >&5 +echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; } if test "${ac_cv_sizeof_unsigned_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_unsigned_long" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects - # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF @@ -6605,10 +7293,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef unsigned long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -6616,27 +7305,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -6646,10 +7330,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef unsigned long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -6657,56 +7342,53 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef unsigned long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -6714,27 +7396,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -6744,10 +7421,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef unsigned long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -6755,50 +7433,48 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -6809,10 +7485,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef unsigned long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -6820,52 +7497,45 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_unsigned_long=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77 +'') if test "$ac_cv_type_unsigned_long" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (unsigned long), 77 +echo "$as_me: error: cannot compute sizeof (unsigned long) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_unsigned_long=0 + fi ;; esac else - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -6873,8 +7543,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -long longval () { return (long) (sizeof (unsigned long)); } -unsigned long ulongval () { return (long) (sizeof (unsigned long)); } + typedef unsigned long ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include #include int @@ -6883,35 +7554,44 @@ FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (unsigned long))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (unsigned long)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (unsigned long)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -6922,22 +7602,25 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77 +if test "$ac_cv_type_unsigned_long" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (unsigned long), 77 +echo "$as_me: error: cannot compute sizeof (unsigned long) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_unsigned_long=0 + fi fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val -else - ac_cv_sizeof_unsigned_long=0 fi -fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5 -echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5 +echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; } + + + cat >>confdefs.h <<_ACEOF #define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long _ACEOF @@ -6953,18 +7636,19 @@ for ac_header in "$FFTW_INCLUDE_PATH"fftw.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -6975,41 +7659,37 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -7018,24 +7698,22 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -7043,9 +7721,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -7069,25 +7748,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -7097,17 +7770,17 @@ else echo "Eeek! I can't find fftw.h!"; - echo "It doesn't look like you'll be able to use fftw"; - echo "Are you sure that --with-fftw-path is set correctly?" + echo "It doesn't look like you'll be able to use fftw"; + echo "Are you sure that --with-fftw-path is set correctly?" fi done else -as_ac_File=`echo "ac_cv_file_"$FFTW_INCLUDE_PATH"fftw.h" | $as_tr_sh` -echo "$as_me:$LINENO: checking for \"$FFTW_INCLUDE_PATH\"fftw.h" >&5 -echo $ECHO_N "checking for \"$FFTW_INCLUDE_PATH\"fftw.h... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then + as_ac_File=`echo "ac_cv_file_"$FFTW_INCLUDE_PATH"fftw.h" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for \"$FFTW_INCLUDE_PATH\"fftw.h" >&5 +echo $ECHO_N "checking for \"$FFTW_INCLUDE_PATH\"fftw.h... $ECHO_C" >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && @@ -7120,14 +7793,15 @@ eval "$as_ac_File=no" fi fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_File'}'` = yes; then : else echo "Eeek! I can't find fftw.h!"; - echo "It doesn't look like you'll be able to use fftw"; - echo "Are you sure that --with-fftw-path is set correctly?" + echo "It doesn't look like you'll be able to use fftw"; + echo "Are you sure that --with-fftw-path is set correctly?" fi fi @@ -7140,8 +7814,8 @@ LDFLAGS="$LDFLAGS -L$FFTW_LIB_PATH" fi -echo "$as_me:$LINENO: checking for fftw_create_plan in -lfftw" >&5 -echo $ECHO_N "checking for fftw_create_plan in -lfftw... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for fftw_create_plan in -lfftw" >&5 +echo $ECHO_N "checking for fftw_create_plan in -lfftw... $ECHO_C" >&6; } if test "${ac_cv_lib_fftw_fftw_create_plan+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7154,56 +7828,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char fftw_create_plan (); int main () { -fftw_create_plan (); +return fftw_create_plan (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_fftw_fftw_create_plan=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_fftw_fftw_create_plan=no + ac_cv_lib_fftw_fftw_create_plan=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_fftw_fftw_create_plan" >&5 -echo "${ECHO_T}$ac_cv_lib_fftw_fftw_create_plan" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_fftw_fftw_create_plan" >&5 +echo "${ECHO_T}$ac_cv_lib_fftw_fftw_create_plan" >&6; } if test $ac_cv_lib_fftw_fftw_create_plan = yes; then FFTW_LIBS="-lfftw" else @@ -7219,26 +7890,27 @@ # check for fftw3 if we enabled its use if test "x$enable_fftw3" = "xyes" then - FFTW_EXISTS="yes" - HAVE_FFTW_THREE="yes" - if test "x$FFTW3_PATH" = "x" - then + FFTW_EXISTS="yes" + HAVE_FFTW_THREE="yes" + if test "x$FFTW3_PATH" = "x" + then for ac_header in "$FFTW3_INCLUDE_PATH"fftw3.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -7249,41 +7921,37 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -7292,24 +7960,22 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -7317,9 +7983,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -7343,25 +8010,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -7377,11 +8038,11 @@ done - else - as_ac_File=`echo "ac_cv_file_"$FFTW3_INCLUDE_PATH"fftw3.h" | $as_tr_sh` -echo "$as_me:$LINENO: checking for \"$FFTW3_INCLUDE_PATH\"fftw3.h" >&5 -echo $ECHO_N "checking for \"$FFTW3_INCLUDE_PATH\"fftw3.h... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then + else + as_ac_File=`echo "ac_cv_file_"$FFTW3_INCLUDE_PATH"fftw3.h" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for \"$FFTW3_INCLUDE_PATH\"fftw3.h" >&5 +echo $ECHO_N "checking for \"$FFTW3_INCLUDE_PATH\"fftw3.h... $ECHO_C" >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && @@ -7394,8 +8055,9 @@ eval "$as_ac_File=no" fi fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_File'}'` = yes; then : else @@ -7404,16 +8066,16 @@ echo "Are you sure that --with-fftw3-path is set correctly?" fi - fi + fi - # only add FFTW3_LIB_PATH to LDFLAGS when it is defined - if test "x$FFTW3_LIB_PATH" != "x" - then - LDFLAGS="$LDFLAGS -L$FFTW3_LIB_PATH" - fi + # only add FFTW3_LIB_PATH to LDFLAGS when it is defined + if test -n "$FFTW3_LIB_PATH" + then + LDFLAGS="$LDFLAGS -L$FFTW3_LIB_PATH" + fi - echo "$as_me:$LINENO: checking for fftw_execute in -lfftw3" >&5 -echo $ECHO_N "checking for fftw_execute in -lfftw3... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for fftw_execute in -lfftw3" >&5 +echo $ECHO_N "checking for fftw_execute in -lfftw3... $ECHO_C" >&6; } if test "${ac_cv_lib_fftw3_fftw_execute+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7426,65 +8088,62 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char fftw_execute (); int main () { -fftw_execute (); +return fftw_execute (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_fftw3_fftw_execute=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_fftw3_fftw_execute=no + ac_cv_lib_fftw3_fftw_execute=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_fftw3_fftw_execute" >&5 -echo "${ECHO_T}$ac_cv_lib_fftw3_fftw_execute" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_fftw3_fftw_execute" >&5 +echo "${ECHO_T}$ac_cv_lib_fftw3_fftw_execute" >&6; } if test $ac_cv_lib_fftw3_fftw_execute = yes; then FFTW3_LIBS="-lfftw3" else echo "Bummer! fftw3 doesn't seem to work"; - echo "You asked for fftw3, but you will need to install it to use it"; - echo "If you have installed it, make sure you have passed the correct"; - echo "path to fftw3 with the --with-fftw3-path option"; - echo "fftw3 is available from http://www.fftw.org"; - exit + echo "You asked for fftw3, but you will need to install it to use it"; + echo "If you have installed it, make sure you have passed the correct"; + echo "path to fftw3 with the --with-fftw3-path option"; + echo "fftw3 is available from http://www.fftw.org"; + exit fi fi @@ -7506,24 +8165,25 @@ # if threads are enabled, check to see if fftw_threads is available if test "x$enable_threads" = "xyes" then - if test "x$FFTW_PATH" = "x" - then + if test "x$FFTW_PATH" = "x" + then for ac_header in "$FFTW_INCLUDE_PATH"fftw_threads.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -7534,41 +8194,37 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -7577,24 +8233,22 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -7602,9 +8256,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -7628,25 +8283,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -7656,17 +8305,17 @@ else echo "Eeek! I can't find fftw_threads.h!"; - echo "It doesn't look like you'll be able to use fftw_threads"; - echo "Continuing anyway" + echo "It doesn't look like you'll be able to use fftw_threads"; + echo "Continuing anyway" fi done - else - as_ac_File=`echo "ac_cv_file_"$FFTW_INCLUDE_PATH"fftw_threads.h" | $as_tr_sh` -echo "$as_me:$LINENO: checking for \"$FFTW_INCLUDE_PATH\"fftw_threads.h" >&5 -echo $ECHO_N "checking for \"$FFTW_INCLUDE_PATH\"fftw_threads.h... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then + else + as_ac_File=`echo "ac_cv_file_"$FFTW_INCLUDE_PATH"fftw_threads.h" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for \"$FFTW_INCLUDE_PATH\"fftw_threads.h" >&5 +echo $ECHO_N "checking for \"$FFTW_INCLUDE_PATH\"fftw_threads.h... $ECHO_C" >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && @@ -7679,20 +8328,21 @@ eval "$as_ac_File=no" fi fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_File'}'` = yes; then : else echo "Eeek! I can't find fftw_threads.h!"; - echo "It doesn't look like you'll be able to use fftw_threads"; - echo "Continuing anyway" + echo "It doesn't look like you'll be able to use fftw_threads"; + echo "Continuing anyway" fi - fi + fi - echo "$as_me:$LINENO: checking for fftw_threads_init in -lfftw_threads" >&5 -echo $ECHO_N "checking for fftw_threads_init in -lfftw_threads... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for fftw_threads_init in -lfftw_threads" >&5 +echo $ECHO_N "checking for fftw_threads_init in -lfftw_threads... $ECHO_C" >&6; } if test "${ac_cv_lib_fftw_threads_fftw_threads_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7705,71 +8355,68 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char fftw_threads_init (); int main () { -fftw_threads_init (); +return fftw_threads_init (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_fftw_threads_fftw_threads_init=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_fftw_threads_fftw_threads_init=no + ac_cv_lib_fftw_threads_fftw_threads_init=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_fftw_threads_fftw_threads_init" >&5 -echo "${ECHO_T}$ac_cv_lib_fftw_threads_fftw_threads_init" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_fftw_threads_fftw_threads_init" >&5 +echo "${ECHO_T}$ac_cv_lib_fftw_threads_fftw_threads_init" >&6; } if test $ac_cv_lib_fftw_threads_fftw_threads_init = yes; then THREADLIBS="-L$FFTW_LIB_PATH -lfftw_threads $THREADLIBS"; - FFTW_THREADS="-lfftw_threads" + FFTW_THREADS="-lfftw_threads" else echo "Eeek! fftw_threads doesn't seem to work"; - echo "It doesn't look like you'll be able to use fftw_threads"; - echo "Perhaps you need to use --enable-threads in fftw??"; - echo "Continuing anyway" + echo "It doesn't look like you'll be able to use fftw_threads"; + echo "Perhaps you need to use --enable-threads in fftw??"; + echo "Continuing anyway" fi - if test x"$enable_fftw3" = "xyes" - then - echo "$as_me:$LINENO: checking for fftw_init_threads in -lfftw3_threads" >&5 -echo $ECHO_N "checking for fftw_init_threads in -lfftw3_threads... $ECHO_C" >&6 + if test x"$enable_fftw3" = "xyes" + then + { echo "$as_me:$LINENO: checking for fftw_init_threads in -lfftw3_threads" >&5 +echo $ECHO_N "checking for fftw_init_threads in -lfftw3_threads... $ECHO_C" >&6; } if test "${ac_cv_lib_fftw3_threads_fftw_init_threads+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7782,56 +8429,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char fftw_init_threads (); int main () { -fftw_init_threads (); +return fftw_init_threads (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_fftw3_threads_fftw_init_threads=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_fftw3_threads_fftw_init_threads=no + ac_cv_lib_fftw3_threads_fftw_init_threads=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_fftw3_threads_fftw_init_threads" >&5 -echo "${ECHO_T}$ac_cv_lib_fftw3_threads_fftw_init_threads" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_fftw3_threads_fftw_init_threads" >&5 +echo "${ECHO_T}$ac_cv_lib_fftw3_threads_fftw_init_threads" >&6; } if test $ac_cv_lib_fftw3_threads_fftw_init_threads = yes; then FFTW3_THREADLIBS="$FFTW3_THREADLIBS -lfftw3_threads" else @@ -7841,13 +8485,12 @@ echo "Continuing anyway" fi - fi + fi # end enable_threads check fi if test "x$enable_mpi" = "xyes" then - if test -n "$with_mpi_compiler" then MPICC="$with_mpi_compiler" @@ -7863,8 +8506,8 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_MPICC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7877,25 +8520,27 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_MPICC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi MPICC=$ac_cv_prog_MPICC if test -n "$MPICC"; then - echo "$as_me:$LINENO: result: $MPICC" >&5 -echo "${ECHO_T}$MPICC" >&6 + { echo "$as_me:$LINENO: result: $MPICC" >&5 +echo "${ECHO_T}$MPICC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$MPICC" && break done test -n "$MPICC" || MPICC="$CC" @@ -7906,8 +8551,8 @@ if test x = x"$MPILIBS"; then - echo "$as_me:$LINENO: checking for MPI_Init" >&5 -echo $ECHO_N "checking for MPI_Init... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for MPI_Init" >&5 +echo $ECHO_N "checking for MPI_Init... $ECHO_C" >&6; } if test "${ac_cv_func_MPI_Init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7934,76 +8579,67 @@ #undef MPI_Init -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char MPI_Init (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_MPI_Init) || defined (__stub___MPI_Init) +#if defined __stub_MPI_Init || defined __stub___MPI_Init choke me -#else -char (*f) () = MPI_Init; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != MPI_Init; +return MPI_Init (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_MPI_Init=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_MPI_Init=no + ac_cv_func_MPI_Init=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_MPI_Init" >&5 -echo "${ECHO_T}$ac_cv_func_MPI_Init" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_MPI_Init" >&5 +echo "${ECHO_T}$ac_cv_func_MPI_Init" >&6; } if test $ac_cv_func_MPI_Init = yes; then MPILIBS=" " fi fi if test x = x"$MPILIBS"; then - echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5 -echo $ECHO_N "checking for MPI_Init in -lmpi... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5 +echo $ECHO_N "checking for MPI_Init in -lmpi... $ECHO_C" >&6; } if test "${ac_cv_lib_mpi_MPI_Init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8016,64 +8652,61 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char MPI_Init (); int main () { -MPI_Init (); +return MPI_Init (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_mpi_MPI_Init=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_mpi_MPI_Init=no + ac_cv_lib_mpi_MPI_Init=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_MPI_Init" >&5 -echo "${ECHO_T}$ac_cv_lib_mpi_MPI_Init" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_MPI_Init" >&5 +echo "${ECHO_T}$ac_cv_lib_mpi_MPI_Init" >&6; } if test $ac_cv_lib_mpi_MPI_Init = yes; then MPILIBS="-lmpi" fi fi if test x = x"$MPILIBS"; then - echo "$as_me:$LINENO: checking for MPI_Init in -lmpich" >&5 -echo $ECHO_N "checking for MPI_Init in -lmpich... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for MPI_Init in -lmpich" >&5 +echo $ECHO_N "checking for MPI_Init in -lmpich... $ECHO_C" >&6; } if test "${ac_cv_lib_mpich_MPI_Init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8086,56 +8719,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char MPI_Init (); int main () { -MPI_Init (); +return MPI_Init (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_mpich_MPI_Init=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_mpich_MPI_Init=no + ac_cv_lib_mpich_MPI_Init=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_mpich_MPI_Init" >&5 -echo "${ECHO_T}$ac_cv_lib_mpich_MPI_Init" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_mpich_MPI_Init" >&5 +echo "${ECHO_T}$ac_cv_lib_mpich_MPI_Init" >&6; } if test $ac_cv_lib_mpich_MPI_Init = yes; then MPILIBS="-lmpich" fi @@ -8143,8 +8773,8 @@ fi if test x != x"$MPILIBS"; then - echo "$as_me:$LINENO: checking for mpi.h" >&5 -echo $ECHO_N "checking for mpi.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for mpi.h" >&5 +echo $ECHO_N "checking for mpi.h... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -8161,38 +8791,34 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -MPILIBS="" - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + MPILIBS="" + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi CC="$acx_mpi_save_CC" @@ -8215,14 +8841,14 @@ fi - joempi_save_CC="$CC" + joempi_save_CC="$CC" joempi_save_CPP="$CPP" CC="$MPICC" CPP="$MPICC -E" - save_LIBS="$LIBS" - echo "$as_me:$LINENO: checking for lamlog in -llam" >&5 -echo $ECHO_N "checking for lamlog in -llam... $ECHO_C" >&6 + save_LIBS="$LIBS" + { echo "$as_me:$LINENO: checking for lamlog in -llam" >&5 +echo $ECHO_N "checking for lamlog in -llam... $ECHO_C" >&6; } if test "${ac_cv_lib_lam_lamlog+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8235,65 +8861,63 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char lamlog (); int main () { -lamlog (); +return lamlog (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_lam_lamlog=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_lam_lamlog=no + ac_cv_lib_lam_lamlog=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_lam_lamlog" >&5 -echo "${ECHO_T}$ac_cv_lib_lam_lamlog" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_lam_lamlog" >&5 +echo "${ECHO_T}$ac_cv_lib_lam_lamlog" >&6; } if test $ac_cv_lib_lam_lamlog = yes; then MPILIBS="-lmpi -llam $MPILIBS" fi - lamTest=`echo "$MPILIBS" | grep 'llam' | cut -f1 -d' '` - if test x"$lamTest" = x - then - echo "$as_me:$LINENO: checking for MPI_Init in -lmpich" >&5 -echo $ECHO_N "checking for MPI_Init in -lmpich... $ECHO_C" >&6 + lamTest=`echo "$MPILIBS" | grep 'llam' | cut -f1 -d' '` + + if test x"$lamTest" = x + then + { echo "$as_me:$LINENO: checking for MPI_Init in -lmpich" >&5 +echo $ECHO_N "checking for MPI_Init in -lmpich... $ECHO_C" >&6; } if test "${ac_cv_lib_mpich_MPI_Init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8306,89 +8930,89 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char MPI_Init (); int main () { -MPI_Init (); +return MPI_Init (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_mpich_MPI_Init=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_mpich_MPI_Init=no + ac_cv_lib_mpich_MPI_Init=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_mpich_MPI_Init" >&5 -echo "${ECHO_T}$ac_cv_lib_mpich_MPI_Init" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_mpich_MPI_Init" >&5 +echo "${ECHO_T}$ac_cv_lib_mpich_MPI_Init" >&6; } if test $ac_cv_lib_mpich_MPI_Init = yes; then MPILIBS="-lmpich $MPILIBS" fi - else - # test to see if lam has added in -llammpi++ - lammpiTest=`mpicc -showme | grep 'lammpi++'` - if test x"$lammpiTest" = x - then - # append -llammpi++ to $MPILIBS - MPILIBS="$MPILIBS -llammpi++" - fi - fi - LIBS="$save_LIBS" # we don't want to add -lmpi -llam or -lmpich to the LIBS variable + else + # test to see if lam has added in -llammpi++ + lammpiTest=`mpicc -showme | grep 'lammpi++'` + if test x"$lammpiTest" = x + then + # append -llammpi++ to $MPILIBS + MPILIBS="$MPILIBS -llammpi++" + fi + fi - if test "x$FFTW_PATH" = "x" - then + # we don't want to add -lmpi -llam or -lmpich to the LIBS variable + LIBS="$save_LIBS" + + if test "x$FFTW_PATH" = "x" + then for ac_header in "$FFTW_INCLUDE_PATH"fftw_mpi.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -8399,41 +9023,37 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -8442,24 +9062,22 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -8467,9 +9085,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -8493,25 +9112,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -8521,17 +9134,17 @@ else echo "Eeek! I can't find fftw_mpi.h!"; - echo "It doesn't look like you'll be able to use fftw_mpi"; - echo "Continuing anyway" + echo "It doesn't look like you'll be able to use fftw_mpi"; + echo "Continuing anyway" fi done - else - as_ac_File=`echo "ac_cv_file_"$FFTW_INCLUDE_PATH"fftw_mpi.h" | $as_tr_sh` -echo "$as_me:$LINENO: checking for \"$FFTW_INCLUDE_PATH\"fftw_mpi.h" >&5 -echo $ECHO_N "checking for \"$FFTW_INCLUDE_PATH\"fftw_mpi.h... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then + else + as_ac_File=`echo "ac_cv_file_"$FFTW_INCLUDE_PATH"fftw_mpi.h" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for \"$FFTW_INCLUDE_PATH\"fftw_mpi.h" >&5 +echo $ECHO_N "checking for \"$FFTW_INCLUDE_PATH\"fftw_mpi.h... $ECHO_C" >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && @@ -8544,20 +9157,21 @@ eval "$as_ac_File=no" fi fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_File'}'` = yes; then : else echo "Eeek! I can't find fftw_mpi.h!"; - echo "It doesn't look like you'll be able to use fftw_mpi"; - echo "Continuing anyway" + echo "It doesn't look like you'll be able to use fftw_mpi"; + echo "Continuing anyway" fi - fi + fi - echo "$as_me:$LINENO: checking for fftw2d_mpi_create_plan in -lfftw_mpi" >&5 -echo $ECHO_N "checking for fftw2d_mpi_create_plan in -lfftw_mpi... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for fftw2d_mpi_create_plan in -lfftw_mpi" >&5 +echo $ECHO_N "checking for fftw2d_mpi_create_plan in -lfftw_mpi... $ECHO_C" >&6; } if test "${ac_cv_lib_fftw_mpi_fftw2d_mpi_create_plan+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8570,63 +9184,60 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char fftw2d_mpi_create_plan (); int main () { -fftw2d_mpi_create_plan (); +return fftw2d_mpi_create_plan (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_fftw_mpi_fftw2d_mpi_create_plan=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_fftw_mpi_fftw2d_mpi_create_plan=no + ac_cv_lib_fftw_mpi_fftw2d_mpi_create_plan=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_fftw_mpi_fftw2d_mpi_create_plan" >&5 -echo "${ECHO_T}$ac_cv_lib_fftw_mpi_fftw2d_mpi_create_plan" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_fftw_mpi_fftw2d_mpi_create_plan" >&5 +echo "${ECHO_T}$ac_cv_lib_fftw_mpi_fftw2d_mpi_create_plan" >&6; } if test $ac_cv_lib_fftw_mpi_fftw2d_mpi_create_plan = yes; then FFTW_MPI="-lfftw_mpi" else echo "Eeek! fftw_mpi doesn't seem to work"; - echo "It doesn't look like you'll be able to use fftw_mpi"; - echo "Perhaps you need to use --enable-mpi in fftw??"; - echo "Continuing anyway" + echo "It doesn't look like you'll be able to use fftw_mpi"; + echo "Perhaps you need to use --enable-mpi in fftw??"; + echo "Continuing anyway" fi @@ -8636,16 +9247,16 @@ if test -z "$FFTW_PATH" then - FFTW_MPI_LIBS="$FFTW_THREADS $FFTW_MPI $FFTW_LIBS" - FFTW_LIBS="$FFTW_THREADS $FFTW_LIBS" + FFTW_MPI_LIBS="$FFTW_THREADS $FFTW_MPI $FFTW_LIBS" + FFTW_LIBS="$FFTW_THREADS $FFTW_LIBS" else - FFTW_MPI_LIBS="-L$FFTW_LIB_PATH $FFTW_THREADS $FFTW_MPI $FFTW_LIBS" - FFTW_LIBS="-L$FFTW_LIB_PATH $FFTW_THREADS $FFTW_LIBS" + FFTW_MPI_LIBS="-L$FFTW_LIB_PATH $FFTW_THREADS $FFTW_MPI $FFTW_LIBS" + FFTW_LIBS="-L$FFTW_LIB_PATH $FFTW_THREADS $FFTW_LIBS" fi if test "x$FFTW3_PATH" != "x" then - FFTW3_LIBS="-L$FFTW3_LIB_PATH $FFTW3_LIBS" + FFTW3_LIBS="-L$FFTW3_LIB_PATH $FFTW3_LIBS" fi XMDS_LIBS="$LIBS -L$USER_LIB -lxmds" @@ -8719,16 +9330,16 @@ FFTW_THREE_ONLY=0 if test "x$HAVE_FFTW_THREE" = "xyes" then - # if we have *only* fftw3 then use the FFTW3 libs for FFTW - if test "x$HAVE_FFTW_TWO" = "xno" - then + # if we have *only* fftw3 then use the FFTW3 libs for FFTW + if test "x$HAVE_FFTW_TWO" = "xno" + then cat >>confdefs.h <<_ACEOF #define FFTW_LIBS "$FFTW3_LIBS" _ACEOF - FFTW_THREE_ONLY=1 - fi + FFTW_THREE_ONLY=1 + fi cat >>confdefs.h <<_ACEOF #define FFTW_THREE_ONLY $FFTW_THREE_ONLY @@ -8738,44 +9349,44 @@ if test "x$XMDS_CC" = "xicc" then - XMDS_LIBS="$XMDS_LIBS" - if test -z "$XMDS_CFLAGS" - then - XMDS_CFLAGS="$tempXMDS_CFLAGS $AGGRESSIVE_ICC_CFLAGS" - fi + XMDS_LIBS="$XMDS_LIBS" + if test -z "$XMDS_CFLAGS" + then + XMDS_CFLAGS="$tempXMDS_CFLAGS $AGGRESSIVE_ICC_CFLAGS" + fi else - XMDS_CC="$CXX" + XMDS_CC="$CXX" fi if test x"$ac_compiler_gnu" = xyes -a "x$XMDS_CC" != "xicc" then - XMDS_CFLAGS="$tempXMDS_CFLAGS $AGGRESSIVE_GCC_CFLAGS" + XMDS_CFLAGS="$tempXMDS_CFLAGS $AGGRESSIVE_GCC_CFLAGS" fi if test -z "$XMDS_CFLAGS" then - XMDS_CFLAGS="$CFLAGS" + XMDS_CFLAGS="$CFLAGS" fi if test -n "$XMDS_CFLAGS" then - xmdsflagsTest=`echo "$XMDS_CFLAGS" | grep 'pthread'` - if test -z "$xmdsflagsTest" -a -n "$PTHREAD_CFLAGS" - then - { echo "$as_me:$LINENO: WARNING: $PTHREAD_CFLAGS required for xmds but not in XMDS_CFLAGS; appending" >&5 + xmdsflagsTest=`echo "$XMDS_CFLAGS" | grep 'pthread'` + if test -z "$xmdsflagsTest" -a -n "$PTHREAD_CFLAGS" + then + { echo "$as_me:$LINENO: WARNING: $PTHREAD_CFLAGS required for xmds but not in XMDS_CFLAGS; appending" >&5 echo "$as_me: WARNING: $PTHREAD_CFLAGS required for xmds but not in XMDS_CFLAGS; appending" >&2;} - XMDS_CFLAGS="$XMDS_CFLAGS $PTHREAD_CFLAGS" - fi + XMDS_CFLAGS="$XMDS_CFLAGS $PTHREAD_CFLAGS" + fi fi tru64Test=`cxx -V 2>/dev/null| grep 'Tru64'` if test -n "$tru64Test" then - { echo "$as_me:$LINENO: WARNING: It looks like you are using the Tru64 compiler..." >&5 + { echo "$as_me:$LINENO: WARNING: It looks like you are using the Tru64 compiler..." >&5 echo "$as_me: WARNING: It looks like you are using the Tru64 compiler..." >&2;} - { echo "$as_me:$LINENO: WARNING: I will set __USE_STD_IOSTREAM appropriately" >&5 + { echo "$as_me:$LINENO: WARNING: I will set __USE_STD_IOSTREAM appropriately" >&5 echo "$as_me: WARNING: I will set __USE_STD_IOSTREAM appropriately" >&2;} - XMDS_CFLAGS="$XMDS_CFLAGS -D__USE_STD_IOSTREAM=1" + XMDS_CFLAGS="$XMDS_CFLAGS -D__USE_STD_IOSTREAM=1" fi @@ -8803,44 +9414,44 @@ if test x"$MPICC" = xmpicc then - echo "$as_me:$LINENO: checking how mpicc is run" >&5 -echo $ECHO_N "checking how mpicc is run... $ECHO_C" >&6 - lamTest=`echo "$MPILIBS" | grep 'llam' | cut -f1 -d' '` - mpichTest=`echo "$MPILIBS" | grep 'lmpich' | cut -f1 -d' '` - if test x"$lamTest" != x - then - mpiccTest=`mpicc -showme | cut -f1 -d' '` - elif test x"$mpichTest" != x - then - mpiccTest=`mpicc -show | cut -f1 -d' '` - fi + { echo "$as_me:$LINENO: checking how mpicc is run" >&5 +echo $ECHO_N "checking how mpicc is run... $ECHO_C" >&6; } + lamTest=`echo "$MPILIBS" | grep 'llam' | cut -f1 -d' '` + mpichTest=`echo "$MPILIBS" | grep 'lmpich' | cut -f1 -d' '` + if test x"$lamTest" != x + then + mpiccTest=`mpicc -showme | cut -f1 -d' '` + elif test x"$mpichTest" != x + then + mpiccTest=`mpicc -show | cut -f1 -d' '` + fi - if test -z "$mpiccTest" - then - { echo "$as_me:$LINENO: WARNING: cannot work out how mpicc is run; assuming gcc" >&5 + if test -z "$mpiccTest" + then + { echo "$as_me:$LINENO: WARNING: cannot work out how mpicc is run; assuming gcc" >&5 echo "$as_me: WARNING: cannot work out how mpicc is run; assuming gcc" >&2;} - mpiccTest=gcc - fi + mpiccTest=gcc + fi - stdcTest=`echo "$LIBS" | grep 'stdc++'` - case "$mpiccTest" in - *gcc* ) - if test -z "$stdcTest" - then - MPILIBS="$MPILIBS -lstdc++" - fi - echo "$as_me:$LINENO: result: gcc" >&5 -echo "${ECHO_T}gcc" >&6 - ;; - *icc* ) - echo "$as_me:$LINENO: result: icc" >&5 -echo "${ECHO_T}icc" >&6 - ;; - * ) - echo "$as_me:$LINENO: result: \"$mpiccTest\"" >&5 -echo "${ECHO_T}\"$mpiccTest\"" >&6 - ;; - esac + stdcTest=`echo "$LIBS" | grep 'stdc++'` + case "$mpiccTest" in + *gcc* ) + if test -z "$stdcTest" + then + MPILIBS="$MPILIBS -lstdc++" + fi + { echo "$as_me:$LINENO: result: gcc" >&5 +echo "${ECHO_T}gcc" >&6; } + ;; + *icc* ) + { echo "$as_me:$LINENO: result: icc" >&5 +echo "${ECHO_T}icc" >&6; } + ;; + * ) + { echo "$as_me:$LINENO: result: \"$mpiccTest\"" >&5 +echo "${ECHO_T}\"$mpiccTest\"" >&6; } + ;; + esac fi @@ -8851,17 +9462,17 @@ case "$mpiccTest" in - *gcc* ) - # use the gcc aggressive flags by default - MPICCFLAGS="$tempMPICCFLAGS $AGGRESSIVE_GCC_CFLAGS $MPILIBS $MPI_LIB_PATH -I$USER_INCLUDE -L$USER_LIB $XMDS_LIBS" - ;; - *icc* ) - MPICCFLAGS="$tempMPICCFLAGS $AGGRESSIVE_ICC_CFLAGS $MPILIBS $MPI_LIB_PATH -I$USER_INCLUDE -L$USER_LIB $XMDS_LIBS" - ;; - * ) - MPICCFLAGS="$XMDS_CFLAGS $MPILIBS $MPI_LIB_PATH $XMDS_LIBS" - # MPICCFLAGS="$CFLAGS $INCLUDES $LIBS $THREADLIBS $MPI_LIBS $FFTW_MPI_LIBS" - ;; + *gcc* ) + # use the gcc aggressive flags by default + MPICCFLAGS="$tempMPICCFLAGS $AGGRESSIVE_GCC_CFLAGS $MPILIBS $MPI_LIB_PATH -I$USER_INCLUDE -L$USER_LIB $XMDS_LIBS" + ;; + *icc* ) + MPICCFLAGS="$tempMPICCFLAGS $AGGRESSIVE_ICC_CFLAGS $MPILIBS $MPI_LIB_PATH -I$USER_INCLUDE -L$USER_LIB $XMDS_LIBS" + ;; + * ) + MPICCFLAGS="$XMDS_CFLAGS $MPILIBS $MPI_LIB_PATH $XMDS_LIBS" + # MPICCFLAGS="$CFLAGS $INCLUDES $LIBS $THREADLIBS $MPI_LIBS $FFTW_MPI_LIBS" + ;; esac cat >>confdefs.h <<_ACEOF @@ -8869,8 +9480,8 @@ _ACEOF -echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 +echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } if test "${ac_cv_c_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8888,10 +9499,10 @@ #ifndef __cplusplus /* Ultrix mips cc rejects this. */ typedef int charset[2]; - const charset x; + const charset cs; /* SunOS 4.1.1 cc rejects this. */ - char const *const *ccp; - char **p; + char const *const *pcpcc; + char **ppc; /* NEC SVR4.0.2 mips cc rejects this. */ struct point {int x, y;}; static struct point const zero = {0,0}; @@ -8900,16 +9511,17 @@ an arm of an if-expression whose if-part is not a constant expression */ const char *g = "string"; - ccp = &g + (g ? g-g : 0); + pcpcc = &g + (g ? g-g : 0); /* HPUX 7.0 cc rejects these. */ - ++ccp; - p = (char**) ccp; - ccp = (char const *const *) p; + ++pcpcc; + ppc = (char**) pcpcc; + pcpcc = (char const *const *) ppc; { /* SCO 3.2v4 cc rejects this. */ char *t; char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; + if (s) return 0; } { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ int x[] = {25, 17}; @@ -8928,7 +9540,9 @@ } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; + if (!foo) return 0; } + return !cs[0] && !zero.x; #endif ; @@ -8936,38 +9550,34 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_c_const=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_c_const=no + ac_cv_c_const=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -echo "${ECHO_T}$ac_cv_c_const" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 +echo "${ECHO_T}$ac_cv_c_const" >&6; } if test $ac_cv_c_const = no; then cat >>confdefs.h <<\_ACEOF @@ -8976,8 +9586,8 @@ fi -echo "$as_me:$LINENO: checking for inline" >&5 -echo $ECHO_N "checking for inline... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for inline" >&5 +echo $ECHO_N "checking for inline... $ECHO_C" >&6; } if test "${ac_cv_c_inline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8997,39 +9607,37 @@ _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_inline=$ac_kw; break + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_c_inline=$ac_kw else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + test "$ac_cv_c_inline" != no && break done fi -echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 -echo "${ECHO_T}$ac_cv_c_inline" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 +echo "${ECHO_T}$ac_cv_c_inline" >&6; } case $ac_cv_c_inline in @@ -9048,7 +9656,8 @@ esac - ac_config_files="$ac_config_files Makefile source/Makefile examples/Makefile" +ac_config_files="$ac_config_files Makefile source/Makefile examples/Makefile" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -9067,39 +9676,58 @@ # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. +# So, we kill variables containing newlines. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. -{ +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done + (set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; + ;; #( *) # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} | + esac | + sort +) | sed ' + /^ac_cv_env_/b end t clear - : clear + :clear s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if diff $cache_file confcache >/dev/null 2>&1; then :; else - if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + test "x$cache_file" != "x/dev/null" && + { echo "$as_me:$LINENO: updating cache $cache_file" >&5 +echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - echo "not updating unwritable cache $cache_file" + { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -9108,32 +9736,18 @@ # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -}' -fi - DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. - ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -9147,6 +9761,20 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -9171,17 +9799,45 @@ ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi -DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then @@ -9191,8 +9847,43 @@ fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + # Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done PS1='$ ' PS2='> ' PS4='+ ' @@ -9206,18 +9897,19 @@ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else - $as_unset $as_var + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var fi done # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then as_basename=basename else as_basename=false @@ -9225,159 +9917,120 @@ # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi +# CDPATH. +$as_unset CDPATH - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' as_lineno_1=$LINENO as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ t loop - s,-$,, - s,^['$as_cr_digits']*\n,, + s/-\n.*// ' >$as_me.lineno && - chmod +x $as_me.lineno || - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} + chmod +x "$as_me.lineno" || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" # Exit status is that of the last command. exit } -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi echo >conf$$.file if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then as_mkdir_p=: @@ -9386,7 +10039,28 @@ as_mkdir_p=false fi -as_executable_p="test -f" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -9395,31 +10069,14 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - exec 6>&1 -# Open the log real soon, to keep \$[0] and so on meaningful, and to +# Save the log message, to keep $[0] and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. Logging --version etc. is OK. -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX -} >&5 -cat >&5 <<_CSEOF - +# values after options handling. +ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -9427,30 +10084,20 @@ CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 $@ -_CSEOF -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 -echo >&5 +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + _ACEOF +cat >>$CONFIG_STATUS <<_ACEOF # Files that config.status was made for. -if test -n "$ac_config_files"; then - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS -fi +config_files="$ac_config_files" +config_headers="$ac_config_headers" +config_commands="$ac_config_commands" -if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -fi +_ACEOF cat >>$CONFIG_STATUS <<\_ACEOF - ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. @@ -9458,7 +10105,7 @@ Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit - -V, --version print version number, then exit + -V, --version print version number and configuration settings, then exit -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions @@ -9477,19 +10124,22 @@ $config_commands Report bugs to ." -_ACEOF +_ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.59, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.61, + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 2006 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -srcdir=$srcdir -INSTALL="$INSTALL" + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -9500,39 +10150,24 @@ do case $1 in --*=*) - ac_option=`expr "x$1" : 'x\([^=]*\)='` - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; - -*) + *) ac_option=$1 ac_optarg=$2 ac_shift=shift ;; - *) # This is not an option, so the user has probably given explicit - # arguments. - ac_option=$1 - ac_need_defaults=false;; esac case $ac_option in # Handling of the options. -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header - { { echo "$as_me:$LINENO: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + echo "$ac_cs_version"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift @@ -9542,18 +10177,24 @@ $ac_shift CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + { echo "$as_me: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; };; + --help | --hel | -h ) + echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2;} + -*) { echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; - *) ac_config_targets="$ac_config_targets $1" ;; + *) ac_config_targets="$ac_config_targets $1" + ac_need_defaults=false ;; esac shift @@ -9569,39 +10210,51 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF if \$ac_cs_recheck; then - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + CONFIG_SHELL=$SHELL + export CONFIG_SHELL + exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion fi _ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + echo "$ac_log" +} >&5 +_ACEOF cat >>$CONFIG_STATUS <<_ACEOF # -# INIT-COMMANDS section. +# INIT-COMMANDS # - AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" _ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF + +# Handling of arguments. for ac_config_target in $ac_config_targets do - case "$ac_config_target" in - # Handling of arguments. - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "source/Makefile" ) CONFIG_FILES="$CONFIG_FILES source/Makefile" ;; - "examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; - "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "source/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS source/config.h" ;; + case $ac_config_target in + "source/config.h") CONFIG_HEADERS="$CONFIG_HEADERS source/config.h" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "source/Makefile") CONFIG_FILES="$CONFIG_FILES source/Makefile" ;; + "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac done + # If the user did not use the arguments to specify the items to instantiate, # then the envvar interface is used. Set only those that are not. # We use the long form for the default assignment because of an extremely @@ -9613,713 +10266,638 @@ fi # Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason to put it here, and in addition, +# simply because there is no reason against having it here, and in addition, # creating and moving files from /tmp can sometimes cause problems. -# Create a temporary directory, and hook for its removal unless debugging. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. $debug || { - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 + tmp= + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status +' 0 trap '{ (exit 1); exit 1; }' 1 2 13 15 } - # Create a (secure) tmp directory for tmp files. { - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=./confstat$$-$RANDOM - (umask 077 && mkdir $tmp) + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") } || { echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF - # -# CONFIG_FILES section. +# Set up the sed scripts for CONFIG_FILES section. # # No need to generate the scripts if there are no CONFIG_FILES. # This happens for instance when ./config.status config.h -if test -n "\$CONFIG_FILES"; then - # Protect against being on the right side of a sed subst in config.status. - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF -s,@SHELL@,$SHELL,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t -s,@exec_prefix@,$exec_prefix,;t t -s,@prefix@,$prefix,;t t -s,@program_transform_name@,$program_transform_name,;t t -s,@bindir@,$bindir,;t t -s,@sbindir@,$sbindir,;t t -s,@libexecdir@,$libexecdir,;t t -s,@datadir@,$datadir,;t t -s,@sysconfdir@,$sysconfdir,;t t -s,@sharedstatedir@,$sharedstatedir,;t t -s,@localstatedir@,$localstatedir,;t t -s,@libdir@,$libdir,;t t -s,@includedir@,$includedir,;t t -s,@oldincludedir@,$oldincludedir,;t t -s,@infodir@,$infodir,;t t -s,@mandir@,$mandir,;t t -s,@build_alias@,$build_alias,;t t -s,@host_alias@,$host_alias,;t t -s,@target_alias@,$target_alias,;t t -s,@DEFS@,$DEFS,;t t -s,@ECHO_C@,$ECHO_C,;t t -s,@ECHO_N@,$ECHO_N,;t t -s,@ECHO_T@,$ECHO_T,;t t -s,@LIBS@,$LIBS,;t t -s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t -s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t -s,@INSTALL_DATA@,$INSTALL_DATA,;t t -s,@PACKAGE@,$PACKAGE,;t t -s,@VERSION@,$VERSION,;t t -s,@ACLOCAL@,$ACLOCAL,;t t -s,@AUTOCONF@,$AUTOCONF,;t t -s,@AUTOMAKE@,$AUTOMAKE,;t t -s,@AUTOHEADER@,$AUTOHEADER,;t t -s,@MAKEINFO@,$MAKEINFO,;t t -s,@AMTAR@,$AMTAR,;t t -s,@install_sh@,$install_sh,;t t -s,@STRIP@,$STRIP,;t t -s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t -s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t -s,@AWK@,$AWK,;t t -s,@SET_MAKE@,$SET_MAKE,;t t -s,@CC@,$CC,;t t -s,@CXX@,$CXX,;t t -s,@CXXFLAGS@,$CXXFLAGS,;t t -s,@LDFLAGS@,$LDFLAGS,;t t -s,@CPPFLAGS@,$CPPFLAGS,;t t -s,@ac_ct_CXX@,$ac_ct_CXX,;t t -s,@EXEEXT@,$EXEEXT,;t t -s,@OBJEXT@,$OBJEXT,;t t -s,@DEPDIR@,$DEPDIR,;t t -s,@am__include@,$am__include,;t t -s,@am__quote@,$am__quote,;t t -s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t -s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t -s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t -s,@CXXDEPMODE@,$CXXDEPMODE,;t t -s,@CFLAGS@,$CFLAGS,;t t -s,@ac_ct_CC@,$ac_ct_CC,;t t -s,@CCDEPMODE@,$CCDEPMODE,;t t -s,@LN_S@,$LN_S,;t t -s,@RANLIB@,$RANLIB,;t t -s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t -s,@CPP@,$CPP,;t t -s,@EGREP@,$EGREP,;t t -s,@ALLOCA@,$ALLOCA,;t t -s,@build@,$build,;t t -s,@build_cpu@,$build_cpu,;t t -s,@build_vendor@,$build_vendor,;t t -s,@build_os@,$build_os,;t t -s,@host@,$host,;t t -s,@host_cpu@,$host_cpu,;t t -s,@host_vendor@,$host_vendor,;t t -s,@host_os@,$host_os,;t t -s,@PTHREAD_CC@,$PTHREAD_CC,;t t -s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t -s,@PTHREAD_CFLAGS@,$PTHREAD_CFLAGS,;t t -s,@THREADLIBS@,$THREADLIBS,;t t -s,@MPICC@,$MPICC,;t t -s,@MPILIBS@,$MPILIBS,;t t -s,@LIBOBJS@,$LIBOBJS,;t t -s,@LTLIBOBJS@,$LTLIBOBJS,;t t -CEOF - -_ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. - ac_max_sed_lines=48 - ac_sed_frag=1 # Number of current file. - ac_beg=1 # First line for current file. - ac_end=$ac_max_sed_lines # Line after last line for current file. - ac_more_lines=: - ac_sed_cmds= - while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - fi - if test ! -s $tmp/subs.frag; then - ac_more_lines=false - else - # The purpose of the label and of the branching condition is to - # speed up the sed processing (if there are no `@' at all, there - # is no need to browse any of the substitutions). - # These are the two extra sed commands mentioned above. - (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" - else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" - fi - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` - fi - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat +if test -n "$CONFIG_FILES"; then + +_ACEOF + + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +SHELL!$SHELL$ac_delim +PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim +PACKAGE_NAME!$PACKAGE_NAME$ac_delim +PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim +PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim +PACKAGE_STRING!$PACKAGE_STRING$ac_delim +PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim +exec_prefix!$exec_prefix$ac_delim +prefix!$prefix$ac_delim +program_transform_name!$program_transform_name$ac_delim +bindir!$bindir$ac_delim +sbindir!$sbindir$ac_delim +libexecdir!$libexecdir$ac_delim +datarootdir!$datarootdir$ac_delim +datadir!$datadir$ac_delim +sysconfdir!$sysconfdir$ac_delim +sharedstatedir!$sharedstatedir$ac_delim +localstatedir!$localstatedir$ac_delim +includedir!$includedir$ac_delim +oldincludedir!$oldincludedir$ac_delim +docdir!$docdir$ac_delim +infodir!$infodir$ac_delim +htmldir!$htmldir$ac_delim +dvidir!$dvidir$ac_delim +pdfdir!$pdfdir$ac_delim +psdir!$psdir$ac_delim +libdir!$libdir$ac_delim +localedir!$localedir$ac_delim +mandir!$mandir$ac_delim +DEFS!$DEFS$ac_delim +ECHO_C!$ECHO_C$ac_delim +ECHO_N!$ECHO_N$ac_delim +ECHO_T!$ECHO_T$ac_delim +LIBS!$LIBS$ac_delim +build_alias!$build_alias$ac_delim +host_alias!$host_alias$ac_delim +target_alias!$target_alias$ac_delim +INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim +INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim +INSTALL_DATA!$INSTALL_DATA$ac_delim +am__isrc!$am__isrc$ac_delim +CYGPATH_W!$CYGPATH_W$ac_delim +PACKAGE!$PACKAGE$ac_delim +VERSION!$VERSION$ac_delim +ACLOCAL!$ACLOCAL$ac_delim +AUTOCONF!$AUTOCONF$ac_delim +AUTOMAKE!$AUTOMAKE$ac_delim +AUTOHEADER!$AUTOHEADER$ac_delim +MAKEINFO!$MAKEINFO$ac_delim +install_sh!$install_sh$ac_delim +STRIP!$STRIP$ac_delim +INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim +mkdir_p!$mkdir_p$ac_delim +AWK!$AWK$ac_delim +SET_MAKE!$SET_MAKE$ac_delim +am__leading_dot!$am__leading_dot$ac_delim +AMTAR!$AMTAR$ac_delim +am__tar!$am__tar$ac_delim +am__untar!$am__untar$ac_delim +CC!$CC$ac_delim +CXX!$CXX$ac_delim +CXXFLAGS!$CXXFLAGS$ac_delim +LDFLAGS!$LDFLAGS$ac_delim +CPPFLAGS!$CPPFLAGS$ac_delim +ac_ct_CXX!$ac_ct_CXX$ac_delim +EXEEXT!$EXEEXT$ac_delim +OBJEXT!$OBJEXT$ac_delim +DEPDIR!$DEPDIR$ac_delim +am__include!$am__include$ac_delim +am__quote!$am__quote$ac_delim +AMDEP_TRUE!$AMDEP_TRUE$ac_delim +AMDEP_FALSE!$AMDEP_FALSE$ac_delim +AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim +CXXDEPMODE!$CXXDEPMODE$ac_delim +am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim +am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim +CFLAGS!$CFLAGS$ac_delim +ac_ct_CC!$ac_ct_CC$ac_delim +CCDEPMODE!$CCDEPMODE$ac_delim +am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim +am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim +LN_S!$LN_S$ac_delim +RANLIB!$RANLIB$ac_delim +CPP!$CPP$ac_delim +GREP!$GREP$ac_delim +EGREP!$EGREP$ac_delim +ALLOCA!$ALLOCA$ac_delim +build!$build$ac_delim +build_cpu!$build_cpu$ac_delim +build_vendor!$build_vendor$ac_delim +build_os!$build_os$ac_delim +host!$host$ac_delim +host_cpu!$host_cpu$ac_delim +host_vendor!$host_vendor$ac_delim +host_os!$host_os$ac_delim +PTHREAD_CC!$PTHREAD_CC$ac_delim +PTHREAD_LIBS!$PTHREAD_LIBS$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -fi # test -n "$CONFIG_FILES" +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b _ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +PTHREAD_CFLAGS!$PTHREAD_CFLAGS$ac_delim +THREADLIBS!$THREADLIBS$ac_delim +MPICC!$MPICC$ac_delim +MPILIBS!$MPILIBS$ac_delim +LIBOBJS!$LIBOBJS$ac_delim +LTLIBOBJS!$LTLIBOBJS$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 6; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +:end +s/|#_!!_#|//g +CEOF$ac_eof +_ACEOF + + +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/ +s/:*\${srcdir}:*/:/ +s/:*@srcdir@:*/:/ +s/^\([^=]*=[ ]*\):*/\1/ +s/:*$// +s/^[^=]*=[ ]*$// +}' +fi + cat >>$CONFIG_STATUS <<\_ACEOF -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; +fi # test -n "$CONFIG_FILES" + + +for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 +echo "$as_me: error: Invalid tag $ac_tag." >&2;} + { (exit 1); exit 1; }; };; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`(dirname "$ac_file") 2>/dev/null || + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +echo "$as_me: error: cannot find input file: $ac_f" >&2;} + { (exit 1); exit 1; }; };; + esac + ac_file_inputs="$ac_file_inputs $ac_f" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input="Generated from "`IFS=: + echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + fi + + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin";; + esac + ;; + esac + + ac_dir=`$as_dirname -- "$ac_file" || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir="$ac_dir" + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || + while :; do + case $as_dir in #( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } - ac_builddir=. -if test "$ac_dir" != .; then +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix case $srcdir in - .) # No --srcdir option. We are building in place. + .) # We are building in place. ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac + case $ac_mode in + :F) + # + # CONFIG_FILE + # case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac +_ACEOF - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - configure_input= - else - configure_input="$ac_file. " - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } +cat >>$CONFIG_STATUS <<\_ACEOF +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= + +case `sed -n '/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p +' $ac_file_inputs` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac +_ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? +cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub $extrasub _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s,@configure_input@,$configure_input,;t t -s,@srcdir@,$ac_srcdir,;t t -s,@abs_srcdir@,$ac_abs_srcdir,;t t -s,@top_srcdir@,$ac_top_srcdir,;t t -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t -s,@builddir@,$ac_builddir,;t t -s,@abs_builddir@,$ac_abs_builddir,;t t -s,@top_builddir@,$ac_top_builddir,;t t -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t -s,@INSTALL@,$ac_INSTALL,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin - if test x"$ac_file" != x-; then - mv $tmp/out $ac_file - else - cat $tmp/out - rm -f $tmp/out - fi - -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -# -# CONFIG_HEADER section. -# - -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where -# NAME is the cpp macro being defined and VALUE is the value it is being given. -# -# ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='[ ].*$,\1#\2' -ac_dC=' ' -ac_dD=',;t' -# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='$,\1#\2define\3' -ac_uC=' ' -ac_uD=',;t' +s&@configure_input@&$configure_input&;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t +$ac_datarootdir_hack +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out + +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&5 +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&2;} -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + rm -f "$tmp/stdin" case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; + -) cat "$tmp/out"; rm -f "$tmp/out";; + *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; esac + ;; + :H) + # + # CONFIG_HEADER + # +_ACEOF + +# Transform confdefs.h into a sed script `conftest.defines', that +# substitutes the proper values into config.h.in to produce config.h. +rm -f conftest.defines conftest.tail +# First, append a space to every undef/define line, to ease matching. +echo 's/$/ /' >conftest.defines +# Then, protect against being on the right side of a sed subst, or in +# an unquoted here document, in config.status. If some macros were +# called several times there might be several #defines for the same +# symbol, which is useless. But do not sort them, since the last +# AC_DEFINE must be honored. +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where +# NAME is the cpp macro being defined, VALUE is the value it is being given. +# PARAMS is the parameter list in the macro definition--in most cases, it's +# just an empty string. +ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' +ac_dB='\\)[ (].*,\\1define\\2' +ac_dC=' ' +ac_dD=' ,' - test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - # Do quote $f, to prevent DOS paths from being IFS'd. - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } - # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in - -_ACEOF +uniq confdefs.h | + sed -n ' + t rset + :rset + s/^[ ]*#[ ]*define[ ][ ]*// + t ok + d + :ok + s/[\\&,]/\\&/g + s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p + s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p + ' >>conftest.defines -# Transform confdefs.h into two sed scripts, `conftest.defines' and -# `conftest.undefs', that substitutes the proper values into -# config.h.in to produce config.h. The first handles `#define' -# templates, and the second `#undef' templates. -# And first: Protect against being on the right side of a sed subst in -# config.status. Protect against being in an unquoted here document -# in config.status. -rm -f conftest.defines conftest.undefs -# Using a here document instead of a string reduces the quoting nightmare. -# Putting comments in sed scripts is not portable. -# -# `end' is used to avoid that the second main sed command (meant for -# 0-ary CPP macros) applies to n-ary macro definitions. -# See the Autoconf documentation for `clear'. -cat >confdef2sed.sed <<\_ACEOF -s/[\\&,]/\\&/g -s,[\\$`],\\&,g -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp -t end -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp -: end -_ACEOF -# If some macros were called several times there might be several times -# the same #defines, which is useless. Nevertheless, we may not want to -# sort them, since we want the *last* AC-DEFINE to be honored. -uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines -sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs -rm -f confdef2sed.sed - -# This sed command replaces #undef with comments. This is necessary, for +# Remove the space that was appended to ease matching. +# Then replace #undef with comments. This is necessary, for # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. -cat >>conftest.undefs <<\_ACEOF -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, +# (The regexp can be short, since the line contains either #define or #undef.) +echo 's/ $// +s,^[ #]*u.*,/* & */,' >>conftest.defines + +# Break up conftest.defines: +ac_max_sed_lines=50 + +# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" +# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" +# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" +# et cetera. +ac_in='$ac_file_inputs' +ac_out='"$tmp/out1"' +ac_nxt='"$tmp/out2"' + +while : +do + # Write a here document: + cat >>$CONFIG_STATUS <<_ACEOF + # First, check the format of the line: + cat >"\$tmp/defines.sed" <<\\CEOF +/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def +/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def +b +:def _ACEOF - -# Break up conftest.defines because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS -echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS -echo ' :' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.defines >/dev/null -do - # Write a limited-size here document to $tmp/defines.sed. - echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#define' lines. - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS + sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS echo 'CEOF - sed -f $tmp/defines.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail + sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS + ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in + sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail + grep . conftest.tail >/dev/null || break rm -f conftest.defines mv conftest.tail conftest.defines done -rm -f conftest.defines -echo ' fi # grep' >>$CONFIG_STATUS -echo >>$CONFIG_STATUS - -# Break up conftest.undefs because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #undef templates' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.undefs >/dev/null -do - # Write a limited-size here document to $tmp/undefs.sed. - echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#undef' - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS - echo 'CEOF - sed -f $tmp/undefs.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail - rm -f conftest.undefs - mv conftest.tail conftest.undefs -done -rm -f conftest.undefs +rm -f conftest.defines conftest.tail +echo "ac_result=$ac_in" >>$CONFIG_STATUS cat >>$CONFIG_STATUS <<\_ACEOF - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - echo "/* Generated by configure. */" >$tmp/config.h - else - echo "/* $ac_file. Generated by configure. */" >$tmp/config.h - fi - cat $tmp/in >>$tmp/config.h - rm -f $tmp/in if test x"$ac_file" != x-; then - if diff $ac_file $tmp/config.h >/dev/null 2>&1; then + echo "/* $configure_input */" >"$tmp/config.h" + cat "$ac_result" >>"$tmp/config.h" + if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - rm -f $ac_file - mv $tmp/config.h $ac_file + mv "$tmp/config.h" $ac_file fi else - cat $tmp/config.h - rm -f $tmp/config.h + echo "/* $configure_input */" + cat "$ac_result" fi - # Run the commands associated with the file. - case $ac_file in - source/config.h ) # update the timestamp -echo 'timestamp for source/config.h' >"source/stamp-h1" - ;; + rm -f "$tmp/out12" +# Compute $ac_file's index in $config_headers. +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $ac_file | $ac_file:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -# -# CONFIG_COMMANDS section. -# -for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue - ac_dest=`echo "$ac_file" | sed 's,:.*,,'` - ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_dir=`(dirname "$ac_dest") 2>/dev/null || -$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_dest" : 'X\(//\)[^/]' \| \ - X"$ac_dest" : 'X\(//\)$' \| \ - X"$ac_dest" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_dest" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac +echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || +$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X$ac_file : 'X\(//\)[^/]' \| \ + X$ac_file : 'X\(//\)$' \| \ + X$ac_file : 'X\(/\)' \| . 2>/dev/null || +echo X$ac_file | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac + :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 +echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac - { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 -echo "$as_me: executing $ac_dest commands" >&6;} - case $ac_dest in - depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + case $ac_file$ac_mode in + "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. @@ -10327,94 +10905,126 @@ # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`(dirname "$mf") 2>/dev/null || + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$mf" : 'X\(/\)' \| . 2>/dev/null || echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` else continue fi - grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. - DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n -e '/^U = / s///p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n -e ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue - fdir=`(dirname "$file") 2>/dev/null || + fdir=`$as_dirname -- "$file" || $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$file" : 'X\(/\)' \| . 2>/dev/null || echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p $dirpart/$fdir - else - as_dir=$dirpart/$fdir + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir=$dirpart/$fdir + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || + while :; do + case $as_dir in #( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 -echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } - # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done done ;; + esac -done -_ACEOF +done # for ac_tag -cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } _ACEOF @@ -10469,11 +11079,11 @@ echo " mpi options:" if test -z "$enable_mpi" then - echo " MPI NOT ENABLED" + echo " MPI NOT ENABLED" else - echo " MPICC = $MPICC" - echo " MPICCFLAGS = $MPICCFLAGS" - echo " MPILIBS = $MPILIBS" + echo " MPICC = $MPICC" + echo " MPICCFLAGS = $MPICCFLAGS" + echo " MPILIBS = $MPILIBS" fi echo "" echo " fftw options:" @@ -10481,10 +11091,10 @@ echo " FFTW_MPI_LIBS = $FFTW_MPI_LIBS" if test x"$enable_fftw3" = "xyes" then - echo " FFTW3_LIBS = $FFTW3_LIBS" - echo " FFTW3_THREADLIBS = $FFTW3_THREADLIBS" + echo " FFTW3_LIBS = $FFTW3_LIBS" + echo " FFTW3_THREADLIBS = $FFTW3_THREADLIBS" else - echo " FFTW3 NOT ENABLED" + echo " FFTW3 NOT ENABLED" fi echo "" echo "The user defined options were:" @@ -10493,3 +11103,10 @@ echo "" echo "**************************************************" echo "" + +# +# Local variables: +# indent-tabs-mode: nil +# End: +# +# vim: tabstop=4 expandtab shiftwidth=4: diff -Nru xmds-1.6.5/configure.in xmds-1.6.6/configure.in --- xmds-1.6.5/configure.in 2008-02-25 21:32:21.000000000 -0600 +++ xmds-1.6.6/configure.in 2008-07-03 20:37:54.000000000 -0500 @@ -19,11 +19,11 @@ dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. dnl -dnl $Id: configure.in 1694 2008-01-26 22:52:53Z paultcochrane $ +dnl $Id: configure.in 1972 2008-04-09 10:44:00Z paultcochrane $ dnl AC_INIT(source/main.cc) -XMDS_VERSION="1.6.5" +XMDS_VERSION="1.6.6" AM_INIT_AUTOMAKE(xmds, "$XMDS_VERSION") AM_CONFIG_HEADER(source/config.h) @@ -36,8 +36,8 @@ dnl Ok, now grab the arguments, if any dnl FFTW stuff AC_ARG_WITH([fftw-path], - [ --with-fftw-path Set the path to the prefix of your fftw distribution], - [FFTW_PATH="$withval"],[FFTW_PATH=""]) + [ --with-fftw-path Set the path to the prefix of your fftw distribution], + [FFTW_PATH="$withval"],[FFTW_PATH=""]) AC_ARG_WITH([fftw3-path], [ --with-fftw3-path Set the path to the prefix of your fftw3 distribution (defaults to the path to fftw2, if set)], @@ -45,26 +45,27 @@ dnl Is this a user installation? AC_ARG_WITH([user], - [ --with-user Install XMDS into user's bin directory], - [bindir="$HOME"/bin - includedir="$HOME"/bin + [ --with-user Install XMDS into user's bin directory], + [bindir="$HOME"/bin + includedir="$HOME"/bin libdir="$HOME"/bin mandir="$HOME"/man + docdir="$HOME"/doc/xmds USER_LIB="$HOME"/bin - USER_INCLUDE="$HOME"/bin - echo "XMDS will be installed into $bindir"], - [USER_INCLUDE="." + USER_INCLUDE="$HOME"/bin + echo "XMDS will be installed into $bindir"], + [USER_INCLUDE="." USER_LIB="."]) dnl Do we need extral libs passed to check for mpi? (eg -llam) AC_ARG_WITH([mpi-libs], - [ --with-mpi-libs Extra libraries needed when checking for MPI], - [MPI_LIBS="$withval"],[MPI_LIBS="$MPI_LIBS"]) + [ --with-mpi-libs Extra libraries needed when checking for MPI], + [MPI_LIBS="$withval"],[MPI_LIBS="$MPI_LIBS"]) dnl Add a path to mpi if necessary AC_ARG_WITH([mpi-path], - [ --with-mpi-path Set the path to the prefix of your mpi distribution], - [MPI_PATH="$withval" PATH="$PATH:$withval/bin"],[MPI_PATH="$MPI_PATH"]) + [ --with-mpi-path Set the path to the prefix of your mpi distribution], + [MPI_PATH="$withval" PATH="$PATH:$withval/bin"],[MPI_PATH="$MPI_PATH"]) dnl Choose your mpi C compiler if necessary AC_ARG_WITH([mpi-compiler], @@ -72,15 +73,15 @@ dnl Enable mpi? AC_ARG_ENABLE([mpi], - [ --enable-mpi If you want to use mpi, then set this flag]) + [ --enable-mpi If you want to use mpi, then set this flag]) dnl Enable threads? AC_ARG_ENABLE([threads], - [ --enable-threads If you want to use threads, then set this flag]) + [ --enable-threads If you want to use threads, then set this flag]) dnl Enable fftw3? AC_ARG_ENABLE([fftw3], - [ --enable-fftw3 If you want to use fftw3, then set this flag]) + [ --enable-fftw3 If you want to use fftw3, then set this flag]) dnl These settings are from an Intel white paper comparing gcc and icc AGGRESSIVE_GCC_CFLAGS=" -O3 -ffast-math -funroll-all-loops -fomit-frame-pointer" @@ -141,8 +142,8 @@ # Can't have this one when mpicc and cc are mixed non-gnu/gnu #if test "x$CC" = xgcc #then -# CFLAGS="$CFLAGS -Wall -pedantic" -# CXXFLAGS="$CXXFLAGS -Wall -pedantic -ansi" +# CFLAGS="$CFLAGS -Wall -pedantic" +# CXXFLAGS="$CXXFLAGS -Wall -pedantic -ansi" #fi # Add some warnings to the build @@ -161,56 +162,56 @@ dnl if --enable-threads is set, then check for threads libraries if test "x$enable_threads" = "xyes" then -dnl Check for threads library... - - # POSIX threads, the default choice: - if test -z "$THREADLIBS"; then - sinclude(acx_pthread.m4) - ACX_PTHREAD([THREADLIBS="$PTHREAD_LIBS " - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS" - tempXMDS_CFLAGS="$PTHREAD_CFLAGS" - tempMPICCFLAGS="$PTHREAD_CFLAGS" - CC="$PTHREAD_CC" - AC_DEFINE([XMDS_USING_POSIX_THREADS],[],[Define for posix threads])]) - fi - # Solaris threads: - if test -z "$THREADLIBS"; then - AC_CHECK_LIB(thread, thr_create, - [THREADLIBS="-lthread" - AC_DEFINE([XMDS_USING_SOLARIS_THREADS],[],[Define for solaris threads])]) - fi - # Mach C threads: - if test -z "$THREADLIBS"; then - AC_CHECK_FUNC(cthread_fork, - [THREADLIBS=" " - AC_DEFINE([XMDS_USING_MACH_THREADS],[],[Define for mach threads])]) - AC_CHECK_HEADERS(mach/cthreads.h cthreads.h cthread.h) - fi - if test -z "$THREADLIBS"; then - AC_CHECK_LIB(cthread, cthread_fork, - [THREADLIBS="-lcthread" - AC_DEFINE([XMDS_USING_MACH_THREADS],[],[Define for mach threads])]) - AC_CHECK_HEADERS(mach/cthreads.h cthreads.h cthread.h) - fi - if test -z "$THREADLIBS"; then - AC_CHECK_LIB(cthreads, cthread_fork, - [THREADLIBS="-lcthreads" - AC_DEFINE([XMDS_USING_MACH_THREADS],[],[Define for mach threads])]) - AC_CHECK_HEADERS(mach/cthreads.h cthreads.h cthread.h) - fi - # BeOS threads: - if test -z "$THREADLIBS"; then - AC_CHECK_FUNC(spawn_thread, - [THREADLIBS=" " - AC_DEFINE([XMDS_USING_BEOS_THREADS],[],[Define for beos threads])]) - fi - if test -z "$THREADLIBS"; then - AC_MSG_ERROR(couldn't find threads library) - fi - - AC_SUBST(THREADLIBS) -# end enable_threads test +dnl Check for threads library... + + # POSIX threads, the default choice: + if test -z "$THREADLIBS"; then + sinclude(acx_pthread.m4) + ACX_PTHREAD([THREADLIBS="$PTHREAD_LIBS " + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS" + tempXMDS_CFLAGS="$PTHREAD_CFLAGS" + tempMPICCFLAGS="$PTHREAD_CFLAGS" + CC="$PTHREAD_CC" + AC_DEFINE([XMDS_USING_POSIX_THREADS],[],[Define for posix threads])]) + fi + # Solaris threads: + if test -z "$THREADLIBS"; then + AC_CHECK_LIB(thread, thr_create, + [THREADLIBS="-lthread" + AC_DEFINE([XMDS_USING_SOLARIS_THREADS],[],[Define for solaris threads])]) + fi + # Mach C threads: + if test -z "$THREADLIBS"; then + AC_CHECK_FUNC(cthread_fork, + [THREADLIBS=" " + AC_DEFINE([XMDS_USING_MACH_THREADS],[],[Define for mach threads])]) + AC_CHECK_HEADERS(mach/cthreads.h cthreads.h cthread.h) + fi + if test -z "$THREADLIBS"; then + AC_CHECK_LIB(cthread, cthread_fork, + [THREADLIBS="-lcthread" + AC_DEFINE([XMDS_USING_MACH_THREADS],[],[Define for mach threads])]) + AC_CHECK_HEADERS(mach/cthreads.h cthreads.h cthread.h) + fi + if test -z "$THREADLIBS"; then + AC_CHECK_LIB(cthreads, cthread_fork, + [THREADLIBS="-lcthreads" + AC_DEFINE([XMDS_USING_MACH_THREADS],[],[Define for mach threads])]) + AC_CHECK_HEADERS(mach/cthreads.h cthreads.h cthread.h) + fi + # BeOS threads: + if test -z "$THREADLIBS"; then + AC_CHECK_FUNC(spawn_thread, + [THREADLIBS=" " + AC_DEFINE([XMDS_USING_BEOS_THREADS],[],[Define for beos threads])]) + fi + if test -z "$THREADLIBS"; then + AC_MSG_ERROR(couldn't find threads library) + fi + + AC_SUBST(THREADLIBS) + # end enable_threads test fi ### This code included from libsndfile configure.ac. @@ -232,15 +233,15 @@ HAVE_FFTW_TWO="yes" if test "x$FFTW_PATH" = "x" then -AC_CHECK_HEADERS(["$FFTW_INCLUDE_PATH"fftw.h],[], - [echo "Eeek! I can't find fftw.h!"; - echo "It doesn't look like you'll be able to use fftw"; - echo "Are you sure that --with-fftw-path is set correctly?"]) + AC_CHECK_HEADERS(["$FFTW_INCLUDE_PATH"fftw.h],[], + [echo "Eeek! I can't find fftw.h!"; + echo "It doesn't look like you'll be able to use fftw"; + echo "Are you sure that --with-fftw-path is set correctly?"]) else -AC_CHECK_FILE(["$FFTW_INCLUDE_PATH"fftw.h],[], - [echo "Eeek! I can't find fftw.h!"; - echo "It doesn't look like you'll be able to use fftw"; - echo "Are you sure that --with-fftw-path is set correctly?"]) + AC_CHECK_FILE(["$FFTW_INCLUDE_PATH"fftw.h],[], + [echo "Eeek! I can't find fftw.h!"; + echo "It doesn't look like you'll be able to use fftw"; + echo "Are you sure that --with-fftw-path is set correctly?"]) fi # only add FFTW_LIB_PATH to LDFLAGS when it is defined @@ -264,36 +265,36 @@ # check for fftw3 if we enabled its use if test "x$enable_fftw3" = "xyes" then - FFTW_EXISTS="yes" - HAVE_FFTW_THREE="yes" - if test "x$FFTW3_PATH" = "x" - then - AC_CHECK_HEADERS(["$FFTW3_INCLUDE_PATH"fftw3.h],[], - [echo "Eeek! I can't find fftw3.h!"; + FFTW_EXISTS="yes" + HAVE_FFTW_THREE="yes" + if test "x$FFTW3_PATH" = "x" + then + AC_CHECK_HEADERS(["$FFTW3_INCLUDE_PATH"fftw3.h],[], + [echo "Eeek! I can't find fftw3.h!"; echo "It doesn't look like you'll be able to use fftw3"; echo "Are you sure that --with-fftw3-path is set correctly?"]) - else - AC_CHECK_FILE(["$FFTW3_INCLUDE_PATH"fftw3.h],[], + else + AC_CHECK_FILE(["$FFTW3_INCLUDE_PATH"fftw3.h],[], [echo "Eeek! I can't find fftw3.h!"; echo "It doesn't look like you'll be able to use fftw3"; echo "Are you sure that --with-fftw3-path is set correctly?"]) - fi + fi + + # only add FFTW3_LIB_PATH to LDFLAGS when it is defined + if test -n "$FFTW3_LIB_PATH" + then + LDFLAGS="$LDFLAGS -L$FFTW3_LIB_PATH" + fi - # only add FFTW3_LIB_PATH to LDFLAGS when it is defined - if test "x$FFTW3_LIB_PATH" != "x" - then - LDFLAGS="$LDFLAGS -L$FFTW3_LIB_PATH" - fi - - AC_CHECK_LIB([fftw3], - [fftw_execute], - [FFTW3_LIBS="-lfftw3"], - [echo "Bummer! fftw3 doesn't seem to work"; - echo "You asked for fftw3, but you will need to install it to use it"; - echo "If you have installed it, make sure you have passed the correct"; - echo "path to fftw3 with the --with-fftw3-path option"; - echo "fftw3 is available from http://www.fftw.org"; - exit]) + AC_CHECK_LIB([fftw3], + [fftw_execute], + [FFTW3_LIBS="-lfftw3"], + [echo "Bummer! fftw3 doesn't seem to work"; + echo "You asked for fftw3, but you will need to install it to use it"; + echo "If you have installed it, make sure you have passed the correct"; + echo "path to fftw3 with the --with-fftw3-path option"; + echo "fftw3 is available from http://www.fftw.org"; + exit]) fi # if we couldn't find fftw2 and the test for fftw3 failed, then make sure we @@ -313,103 +314,114 @@ # if threads are enabled, check to see if fftw_threads is available if test "x$enable_threads" = "xyes" then - if test "x$FFTW_PATH" = "x" - then - AC_CHECK_HEADERS(["$FFTW_INCLUDE_PATH"fftw_threads.h],[], - [echo "Eeek! I can't find fftw_threads.h!"; - echo "It doesn't look like you'll be able to use fftw_threads"; - echo "Continuing anyway"]) - else - AC_CHECK_FILE(["$FFTW_INCLUDE_PATH"fftw_threads.h],[], - [echo "Eeek! I can't find fftw_threads.h!"; - echo "It doesn't look like you'll be able to use fftw_threads"; - echo "Continuing anyway"]) - fi + if test "x$FFTW_PATH" = "x" + then + AC_CHECK_HEADERS(["$FFTW_INCLUDE_PATH"fftw_threads.h],[], + [echo "Eeek! I can't find fftw_threads.h!"; + echo "It doesn't look like you'll be able to use fftw_threads"; + echo "Continuing anyway"]) + else + AC_CHECK_FILE(["$FFTW_INCLUDE_PATH"fftw_threads.h],[], + [echo "Eeek! I can't find fftw_threads.h!"; + echo "It doesn't look like you'll be able to use fftw_threads"; + echo "Continuing anyway"]) + fi - AC_CHECK_LIB([fftw_threads], [fftw_threads_init], - [THREADLIBS="-L$FFTW_LIB_PATH -lfftw_threads $THREADLIBS"; - FFTW_THREADS="-lfftw_threads"], - [echo "Eeek! fftw_threads doesn't seem to work"; - echo "It doesn't look like you'll be able to use fftw_threads"; - echo "Perhaps you need to use --enable-threads in fftw??"; - echo "Continuing anyway"], - ["$FFTW_LIBS" "$THREADLIBS"]) + AC_CHECK_LIB([fftw_threads], [fftw_threads_init], + [THREADLIBS="-L$FFTW_LIB_PATH -lfftw_threads $THREADLIBS"; + FFTW_THREADS="-lfftw_threads"], + [echo "Eeek! fftw_threads doesn't seem to work"; + echo "It doesn't look like you'll be able to use fftw_threads"; + echo "Perhaps you need to use --enable-threads in fftw??"; + echo "Continuing anyway"], + ["$FFTW_LIBS" "$THREADLIBS"]) - if test x"$enable_fftw3" = "xyes" - then - AC_CHECK_LIB([fftw3_threads], [fftw_init_threads], + if test x"$enable_fftw3" = "xyes" + then + AC_CHECK_LIB([fftw3_threads], [fftw_init_threads], [FFTW3_THREADLIBS="$FFTW3_THREADLIBS -lfftw3_threads"], [echo "Eeek! fftw3_threads doesn't seem to work"; echo "It doesn't look like you'll be able to use fftw3_threads"; echo "Perhaps you need to use --enable-threads in fftw3??"; echo "Continuing anyway"], ["$FFTW3_LIBS" "$FFTW3_THREADLIBS"]) - fi + fi # end enable_threads check fi if test "x$enable_mpi" = "xyes" then - dnl If --with-mpi-compiler is used, then change the MPICC setting if test -n "$with_mpi_compiler" then MPICC="$with_mpi_compiler" fi - dnl Copied and hacked from fftw's configure.in - dnl Check for mpi library... - sinclude(acx_mpi.m4) - ACX_MPI([], [AC_MSG_ERROR([couldn't find mpi library])]) + dnl Copied and hacked from fftw's configure.in + dnl Check for mpi library... + sinclude(acx_mpi.m4) + ACX_MPI([], [AC_MSG_ERROR([couldn't find mpi library])]) - dnl This is a hack to make the compilers point to $MPICC only for the rest of the mpi tests. + dnl This is a hack to make the compilers point to $MPICC only + dnl for the rest of the mpi tests. dnl This must be reversed at the end of this section. joempi_save_CC="$CC" joempi_save_CPP="$CPP" CC="$MPICC" CPP="$MPICC -E" - dnl checking to see if lam is installed as mpi implementation - save_LIBS="$LIBS" - AC_CHECK_LIB([lam], [lamlog], [MPILIBS="-lmpi -llam $MPILIBS"], [], [-lmpi "$MPI_LIB_PATH"]) - lamTest=`echo "$MPILIBS" | grep 'llam' | cut -f1 -d' '` - if test x"$lamTest" = x - then - dnl if didn't find lam, then look for mpich - AC_CHECK_LIB([mpich], [MPI_Init], [MPILIBS="-lmpich $MPILIBS"], [], ["$MPI_LIB_PATH"]) - else - # test to see if lam has added in -llammpi++ - lammpiTest=`mpicc -showme | grep 'lammpi++'` - if test x"$lammpiTest" = x - then - # append -llammpi++ to $MPILIBS - MPILIBS="$MPILIBS -llammpi++" - fi - fi - LIBS="$save_LIBS" # we don't want to add -lmpi -llam or -lmpich to the LIBS variable - - dnl check for fftw_mpi.h - if test "x$FFTW_PATH" = "x" - then - AC_CHECK_HEADERS(["$FFTW_INCLUDE_PATH"fftw_mpi.h],[], - [echo "Eeek! I can't find fftw_mpi.h!"; - echo "It doesn't look like you'll be able to use fftw_mpi"; - echo "Continuing anyway"]) - else - AC_CHECK_FILE(["$FFTW_INCLUDE_PATH"fftw_mpi.h],[], - [echo "Eeek! I can't find fftw_mpi.h!"; - echo "It doesn't look like you'll be able to use fftw_mpi"; - echo "Continuing anyway"]) - fi - - dnl check for the fftw_mpi library - AC_CHECK_LIB([fftw_mpi], [fftw2d_mpi_create_plan], - [FFTW_MPI="-lfftw_mpi"], - [echo "Eeek! fftw_mpi doesn't seem to work"; - echo "It doesn't look like you'll be able to use fftw_mpi"; - echo "Perhaps you need to use --enable-mpi in fftw??"; - echo "Continuing anyway"], - ["$THREADLIBS" "$FFTW_LIBS" "$MPILIBS" "$MPI_LIBS" "$MPI_LIB_PATH" "$MPI_INCLUDE_PATH"]) + dnl checking to see if lam is installed as mpi implementation + save_LIBS="$LIBS" + AC_CHECK_LIB([lam], + [lamlog], + [MPILIBS="-lmpi -llam $MPILIBS"], + [], + [-lmpi "$MPI_LIB_PATH"]) + lamTest=`echo "$MPILIBS" | grep 'llam' | cut -f1 -d' '` + + if test x"$lamTest" = x + then + dnl if didn't find lam, then look for mpich + AC_CHECK_LIB([mpich], + [MPI_Init], + [MPILIBS="-lmpich $MPILIBS"], + [], + ["$MPI_LIB_PATH"]) + else + # test to see if lam has added in -llammpi++ + lammpiTest=`mpicc -showme | grep 'lammpi++'` + if test x"$lammpiTest" = x + then + # append -llammpi++ to $MPILIBS + MPILIBS="$MPILIBS -llammpi++" + fi + fi + + # we don't want to add -lmpi -llam or -lmpich to the LIBS variable + LIBS="$save_LIBS" + + dnl check for fftw_mpi.h + if test "x$FFTW_PATH" = "x" + then + AC_CHECK_HEADERS(["$FFTW_INCLUDE_PATH"fftw_mpi.h],[], + [echo "Eeek! I can't find fftw_mpi.h!"; + echo "It doesn't look like you'll be able to use fftw_mpi"; + echo "Continuing anyway"]) + else + AC_CHECK_FILE(["$FFTW_INCLUDE_PATH"fftw_mpi.h],[], + [echo "Eeek! I can't find fftw_mpi.h!"; + echo "It doesn't look like you'll be able to use fftw_mpi"; + echo "Continuing anyway"]) + fi + + dnl check for the fftw_mpi library + AC_CHECK_LIB([fftw_mpi], [fftw2d_mpi_create_plan], + [FFTW_MPI="-lfftw_mpi"], + [echo "Eeek! fftw_mpi doesn't seem to work"; + echo "It doesn't look like you'll be able to use fftw_mpi"; + echo "Perhaps you need to use --enable-mpi in fftw??"; + echo "Continuing anyway"], + ["$THREADLIBS" "$FFTW_LIBS" "$MPILIBS" "$MPI_LIBS" "$MPI_LIB_PATH" "$MPI_INCLUDE_PATH"]) dnl Must replace the compilers with the original CC="$joempi_save_CC" @@ -419,16 +431,16 @@ dnl If the FFTW_PATH is set, put -L$FFTW_PATH into the FFTW_* variables if test -z "$FFTW_PATH" then - FFTW_MPI_LIBS="$FFTW_THREADS $FFTW_MPI $FFTW_LIBS" - FFTW_LIBS="$FFTW_THREADS $FFTW_LIBS" + FFTW_MPI_LIBS="$FFTW_THREADS $FFTW_MPI $FFTW_LIBS" + FFTW_LIBS="$FFTW_THREADS $FFTW_LIBS" else - FFTW_MPI_LIBS="-L$FFTW_LIB_PATH $FFTW_THREADS $FFTW_MPI $FFTW_LIBS" - FFTW_LIBS="-L$FFTW_LIB_PATH $FFTW_THREADS $FFTW_LIBS" + FFTW_MPI_LIBS="-L$FFTW_LIB_PATH $FFTW_THREADS $FFTW_MPI $FFTW_LIBS" + FFTW_LIBS="-L$FFTW_LIB_PATH $FFTW_THREADS $FFTW_LIBS" fi if test "x$FFTW3_PATH" != "x" then - FFTW3_LIBS="-L$FFTW3_LIB_PATH $FFTW3_LIBS" + FFTW3_LIBS="-L$FFTW3_LIB_PATH $FFTW3_LIBS" fi dnl We need to know where libxmds.a is @@ -460,39 +472,39 @@ FFTW_THREE_ONLY=0 if test "x$HAVE_FFTW_THREE" = "xyes" then - # if we have *only* fftw3 then use the FFTW3 libs for FFTW - if test "x$HAVE_FFTW_TWO" = "xno" - then - AC_DEFINE_UNQUOTED([FFTW_LIBS],["$FFTW3_LIBS"],[Libraries for FFTW]) - FFTW_THREE_ONLY=1 - fi - AC_DEFINE_UNQUOTED([FFTW_THREE_ONLY],[$FFTW_THREE_ONLY],[Have we only got FFTW3?]) + # if we have *only* fftw3 then use the FFTW3 libs for FFTW + if test "x$HAVE_FFTW_TWO" = "xno" + then + AC_DEFINE_UNQUOTED([FFTW_LIBS],["$FFTW3_LIBS"],[Libraries for FFTW]) + FFTW_THREE_ONLY=1 + fi + AC_DEFINE_UNQUOTED([FFTW_THREE_ONLY],[$FFTW_THREE_ONLY],[Have we only got FFTW3?]) fi dnl set up the libraries and CFLAGS to be passed to icc if test "x$XMDS_CC" = "xicc" then - dnl XMDS_LIBS="-limf $XMDS_LIBS" - XMDS_LIBS="$XMDS_LIBS" - if test -z "$XMDS_CFLAGS" - then - XMDS_CFLAGS="$tempXMDS_CFLAGS $AGGRESSIVE_ICC_CFLAGS" - fi + dnl XMDS_LIBS="-limf $XMDS_LIBS" + XMDS_LIBS="$XMDS_LIBS" + if test -z "$XMDS_CFLAGS" + then + XMDS_CFLAGS="$tempXMDS_CFLAGS $AGGRESSIVE_ICC_CFLAGS" + fi else - XMDS_CC="$CXX" + XMDS_CC="$CXX" fi dnl if we're using gcc, then use the gcc aggressive flags by default dnl ac_compiler_gnu is the flag internal to configure that is set if using the gnu c/c++ compiler if test x"$ac_compiler_gnu" = xyes -a "x$XMDS_CC" != "xicc" then - XMDS_CFLAGS="$tempXMDS_CFLAGS $AGGRESSIVE_GCC_CFLAGS" + XMDS_CFLAGS="$tempXMDS_CFLAGS $AGGRESSIVE_GCC_CFLAGS" fi dnl if the XMDS_CFLAGS etc aren't set, then use the CFLAGS if test -z "$XMDS_CFLAGS" then - XMDS_CFLAGS="$CFLAGS" + XMDS_CFLAGS="$CFLAGS" fi dnl if the user has set XMDS_CFLAGS at the command line, but not @@ -500,12 +512,12 @@ dnl PTHREAD_CFLAGS to XMDS_CFLAGS if test -n "$XMDS_CFLAGS" then - xmdsflagsTest=`echo "$XMDS_CFLAGS" | grep 'pthread'` - if test -z "$xmdsflagsTest" -a -n "$PTHREAD_CFLAGS" - then - AC_MSG_WARN([$PTHREAD_CFLAGS required for xmds but not in XMDS_CFLAGS; appending]) - XMDS_CFLAGS="$XMDS_CFLAGS $PTHREAD_CFLAGS" - fi + xmdsflagsTest=`echo "$XMDS_CFLAGS" | grep 'pthread'` + if test -z "$xmdsflagsTest" -a -n "$PTHREAD_CFLAGS" + then + AC_MSG_WARN([$PTHREAD_CFLAGS required for xmds but not in XMDS_CFLAGS; appending]) + XMDS_CFLAGS="$XMDS_CFLAGS $PTHREAD_CFLAGS" + fi fi dnl if the C or C++ compilers are the Tru64 ones then need @@ -513,9 +525,9 @@ tru64Test=`cxx -V 2>/dev/null| grep 'Tru64'` if test -n "$tru64Test" then - AC_MSG_WARN([It looks like you are using the Tru64 compiler...]) - AC_MSG_WARN([I will set __USE_STD_IOSTREAM appropriately]) - XMDS_CFLAGS="$XMDS_CFLAGS -D__USE_STD_IOSTREAM=1" + AC_MSG_WARN([It looks like you are using the Tru64 compiler...]) + AC_MSG_WARN([I will set __USE_STD_IOSTREAM appropriately]) + XMDS_CFLAGS="$XMDS_CFLAGS -D__USE_STD_IOSTREAM=1" fi dnl now set the variables in stone @@ -529,66 +541,66 @@ dnl we need to work out how mpicc is run, if it is used. if test x"$MPICC" = xmpicc then - AC_MSG_CHECKING([how mpicc is run]) - lamTest=`echo "$MPILIBS" | grep 'llam' | cut -f1 -d' '` - mpichTest=`echo "$MPILIBS" | grep 'lmpich' | cut -f1 -d' '` - if test x"$lamTest" != x - then - mpiccTest=`mpicc -showme | cut -f1 -d' '` - elif test x"$mpichTest" != x - then - mpiccTest=`mpicc -show | cut -f1 -d' '` - fi - - dnl if mpiccTest isn't set, then assume gcc - if test -z "$mpiccTest" - then - AC_MSG_WARN([cannot work out how mpicc is run; assuming gcc]) - mpiccTest=gcc - fi - - stdcTest=`echo "$LIBS" | grep 'stdc++'` - case "$mpiccTest" in - *gcc* ) - if test -z "$stdcTest" - then - MPILIBS="$MPILIBS -lstdc++" - fi - AC_MSG_RESULT([gcc]) - ;; - *icc* ) - AC_MSG_RESULT([icc]) - ;; - * ) - AC_MSG_RESULT(["$mpiccTest"]) - ;; - esac + AC_MSG_CHECKING([how mpicc is run]) + lamTest=`echo "$MPILIBS" | grep 'llam' | cut -f1 -d' '` + mpichTest=`echo "$MPILIBS" | grep 'lmpich' | cut -f1 -d' '` + if test x"$lamTest" != x + then + mpiccTest=`mpicc -showme | cut -f1 -d' '` + elif test x"$mpichTest" != x + then + mpiccTest=`mpicc -show | cut -f1 -d' '` + fi + + dnl if mpiccTest isn't set, then assume gcc + if test -z "$mpiccTest" + then + AC_MSG_WARN([cannot work out how mpicc is run; assuming gcc]) + mpiccTest=gcc + fi + + stdcTest=`echo "$LIBS" | grep 'stdc++'` + case "$mpiccTest" in + *gcc* ) + if test -z "$stdcTest" + then + MPILIBS="$MPILIBS -lstdc++" + fi + AC_MSG_RESULT([gcc]) + ;; + *icc* ) + AC_MSG_RESULT([icc]) + ;; + * ) + AC_MSG_RESULT(["$mpiccTest"]) + ;; + esac dnl This part seems to be a bad idea, we've already tested that it works above (acx_mpi.m4) dnl All this section does is beef up the default compiler options dnl else -dnl if test -n "$enable_mpi" -dnl then -dnl AC_MSG_WARN([mpicc not set explicitly; using system C++ compiler]) -dnl MPICC=$CXX -dnl fi +dnl if test -n "$enable_mpi" +dnl then +dnl AC_MSG_WARN([mpicc not set explicitly; using system C++ compiler]) +dnl MPICC=$CXX +dnl fi fi AC_DEFINE_UNQUOTED([MPICC],["$MPICC"],[MPI C compiler]) dnl this is a better way to test than with an if blah = moo then... case "$mpiccTest" in - *gcc* ) - # use the gcc aggressive flags by default - MPICCFLAGS="$tempMPICCFLAGS $AGGRESSIVE_GCC_CFLAGS $MPILIBS $MPI_LIB_PATH -I$USER_INCLUDE -L$USER_LIB $XMDS_LIBS" - ;; - *icc* ) - MPICCFLAGS="$tempMPICCFLAGS $AGGRESSIVE_ICC_CFLAGS $MPILIBS $MPI_LIB_PATH -I$USER_INCLUDE -L$USER_LIB $XMDS_LIBS" - ;; - * ) - MPICCFLAGS="$XMDS_CFLAGS $MPILIBS $MPI_LIB_PATH $XMDS_LIBS" - # MPICCFLAGS="$CFLAGS $INCLUDES $LIBS $THREADLIBS $MPI_LIBS $FFTW_MPI_LIBS" - ;; + *gcc* ) + # use the gcc aggressive flags by default + MPICCFLAGS="$tempMPICCFLAGS $AGGRESSIVE_GCC_CFLAGS $MPILIBS $MPI_LIB_PATH -I$USER_INCLUDE -L$USER_LIB $XMDS_LIBS" + ;; + *icc* ) + MPICCFLAGS="$tempMPICCFLAGS $AGGRESSIVE_ICC_CFLAGS $MPILIBS $MPI_LIB_PATH -I$USER_INCLUDE -L$USER_LIB $XMDS_LIBS" + ;; + * ) + MPICCFLAGS="$XMDS_CFLAGS $MPILIBS $MPI_LIB_PATH $XMDS_LIBS" + # MPICCFLAGS="$CFLAGS $INCLUDES $LIBS $THREADLIBS $MPI_LIBS $FFTW_MPI_LIBS" + ;; esac AC_DEFINE_UNQUOTED([MPICCFLAGS],["$MPICCFLAGS"],[MPI C compiler flags]) @@ -627,11 +639,11 @@ echo " mpi options:" if test -z "$enable_mpi" then - echo " MPI NOT ENABLED" + echo " MPI NOT ENABLED" else - echo " MPICC = $MPICC" - echo " MPICCFLAGS = $MPICCFLAGS" - echo " MPILIBS = $MPILIBS" + echo " MPICC = $MPICC" + echo " MPICCFLAGS = $MPICCFLAGS" + echo " MPILIBS = $MPILIBS" fi echo "" echo " fftw options:" @@ -639,10 +651,10 @@ echo " FFTW_MPI_LIBS = $FFTW_MPI_LIBS" if test x"$enable_fftw3" = "xyes" then - echo " FFTW3_LIBS = $FFTW3_LIBS" - echo " FFTW3_THREADLIBS = $FFTW3_THREADLIBS" + echo " FFTW3_LIBS = $FFTW3_LIBS" + echo " FFTW3_THREADLIBS = $FFTW3_THREADLIBS" else - echo " FFTW3 NOT ENABLED" + echo " FFTW3 NOT ENABLED" fi echo "" echo "The user defined options were:" @@ -651,3 +663,10 @@ echo "" echo "**************************************************" echo "" + +# +# Local variables: +# indent-tabs-mode: nil +# End: +# +# vim: tabstop=4 expandtab shiftwidth=4: diff -Nru xmds-1.6.5/debian/changelog xmds-1.6.6/debian/changelog --- xmds-1.6.5/debian/changelog 2008-07-18 18:16:55.000000000 -0500 +++ xmds-1.6.6/debian/changelog 2008-07-18 18:16:56.000000000 -0500 @@ -1,3 +1,24 @@ +xmds (1.6.6-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes (LP: #249987): + - debian/control: Getting rid of octave2.1-headers in b-d + - Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Nathan Handler Fri, 18 Jul 2008 17:59:20 -0500 + +xmds (1.6.6-1) unstable; urgency=low + + * New upstream release + * debian/patches/compile-with-gcc-4.3.diff: Drop patch (applied upstream) + * debian/rules: Use debian/clean instead of manually cleaning files + * debian/compat, debian/control: Bump build-dependency on debhelper to + >= 7.0.0, otherwise debian/clean is moot + * debian/clean: New file + * debian/control: Bump Standards-Version to 3.8.0 (no changes needed) + + -- Rafael Laboissiere Sat, 12 Jul 2008 10:53:41 +0200 + xmds (1.6.5-2ubuntu1) intrepid; urgency=low * Merge from debian unstable, remaining changes: diff -Nru xmds-1.6.5/debian/clean xmds-1.6.6/debian/clean --- xmds-1.6.5/debian/clean 1969-12-31 18:00:00.000000000 -0600 +++ xmds-1.6.6/debian/clean 2008-07-18 18:16:56.000000000 -0500 @@ -0,0 +1 @@ +config.log source/lorenz.* make-examples-stamp config.status diff -Nru xmds-1.6.5/debian/compat xmds-1.6.6/debian/compat --- xmds-1.6.5/debian/compat 2008-07-18 18:16:55.000000000 -0500 +++ xmds-1.6.6/debian/compat 2008-07-18 18:16:56.000000000 -0500 @@ -1 +1 @@ -5 +7 diff -Nru xmds-1.6.5/debian/control xmds-1.6.6/debian/control --- xmds-1.6.5/debian/control 2008-07-18 18:16:55.000000000 -0500 +++ xmds-1.6.6/debian/control 2008-07-18 18:16:56.000000000 -0500 @@ -5,9 +5,10 @@ XSBC-Original-Maintainer: Debian Scientific Computing Team Uploaders: Christian T. Steigies , Rafael Laboissiere -Build-Depends: cdbs, debhelper (>= 5), autotools-dev, fftw-dev, libfftw3-dev, - libmpich1.0-dev, octave3.0-headers, autoconf, quilt -Standards-Version: 3.7.3 +Build-Depends: cdbs, debhelper (>= 7.0.0), autotools-dev, fftw-dev, + libfftw3-dev, libmpich1.0-dev, octave3.0-headers, + autoconf +Standards-Version: 3.8.0 Homepage: http://xmds.sourceforge.net/ Vcs-Svn: svn://svn.debian.org/svn/pkg-scicomp/xmds/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-scicomp/xmds/ diff -Nru xmds-1.6.5/debian/patches/compile-with-gcc-4.3.diff xmds-1.6.6/debian/patches/compile-with-gcc-4.3.diff --- xmds-1.6.5/debian/patches/compile-with-gcc-4.3.diff 2008-07-18 18:16:55.000000000 -0500 +++ xmds-1.6.6/debian/patches/compile-with-gcc-4.3.diff 1969-12-31 18:00:00.000000000 -0600 @@ -1,112 +0,0 @@ -Index: xmds-1.6.5/source/xmds_simulation.h -=================================================================== ---- xmds-1.6.5.orig/source/xmds_simulation.h 2008-04-08 07:47:35.000000000 +0000 -+++ xmds-1.6.5/source/xmds_simulation.h 2008-04-08 07:47:39.000000000 +0000 -@@ -40,6 +40,8 @@ - #include - #include - -+#include -+ - // ***************************************************************************** - // ***************************************************************************** - // xmdsSimulation -Index: xmds-1.6.5/source/xmds_integrate_ark45.cc -=================================================================== ---- xmds-1.6.5.orig/source/xmds_integrate_ark45.cc 2008-04-08 07:47:35.000000000 +0000 -+++ xmds-1.6.5/source/xmds_integrate_ark45.cc 2008-04-08 07:47:39.000000000 +0000 -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - - // ************************************************************************** - // ************************************************************************** -@@ -289,7 +290,7 @@ - fprintf(outfile, "for(unsigned long _i0=0; _i0<_%s_size; _i0++){\n", fieldName); - } - fprintf(outfile, " for(unsigned long _i1=0; _i1<_%s_main_ncomponents; _i1++){\n", fieldName); -- if (strcmp(typeName, "complex") == 0) { -+ if (std::strcmp(typeName, "complex") == 0) { - fprintf(outfile, " _temp_mod=mod2(_%s_main[_%s_main_index_pointer + _i1]);\n", fieldName, fieldName); - } - else { -@@ -347,7 +348,7 @@ - } - fprintf(outfile, " for(unsigned long _i1=0; _i1<_%s_main_ncomponents; _i1++)\n", fieldName); - -- if (strcmp(typeName, "complex") == 0) { -+ if (std::strcmp(typeName, "complex") == 0) { - fprintf(outfile, " if(mod2(_%s_main[_%s_main_index_pointer + _i1])>_peak[_i1]){\n", fieldName, fieldName); - fprintf(outfile, " _temp_error=mod(_%s_main[_%s_main_index_pointer + _i1]-_checkfield[_%s_main_index_pointer + _i1])/(mod(_%s_main[_%s_main_index_pointer + _i1])+1e-20);\n", fieldName, fieldName, fieldName, fieldName, fieldName); - } -@@ -364,7 +365,7 @@ - else{ // if ndims==0 - fprintf(outfile, " for(unsigned long _i1=0; _i1<_%s_main_ncomponents; _i1++){\n", fieldName); - -- if (strcmp(typeName, "complex") == 0) { -+ if (std::strcmp(typeName, "complex") == 0) { - fprintf(outfile, " _temp_error=mod(_%s_main[_i1]-_checkfield[_i1])/(mod(_%s_main[_i1])+1e-20);\n", fieldName, fieldName); - } - else{ -Index: xmds-1.6.5/source/xmds_integrate_ark89.cc -=================================================================== ---- xmds-1.6.5.orig/source/xmds_integrate_ark89.cc 2008-04-08 07:47:35.000000000 +0000 -+++ xmds-1.6.5/source/xmds_integrate_ark89.cc 2008-04-08 07:47:39.000000000 +0000 -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - - // ************************************************************************** - // ************************************************************************** -@@ -284,7 +285,7 @@ - fprintf(outfile, "for (unsigned long _i0=0; _i0<_%s_size; _i0++){\n", fieldName); - } - fprintf(outfile, " for (unsigned long _i1=0; _i1<_%s_main_ncomponents; _i1++){\n", fieldName); -- if (strcmp(typeName, "complex") == 0) { -+ if (std::strcmp(typeName, "complex") == 0) { - fprintf(outfile, " _temp_mod=mod2(_%s_main[_%s_main_index_pointer + _i1]);\n", fieldName, fieldName); - } - else { -@@ -334,7 +335,7 @@ - } - fprintf(outfile, " for (unsigned long _i1=0; _i1<_%s_main_ncomponents; _i1++)\n", fieldName); - -- if (strcmp(typeName, "complex") == 0) { -+ if (std::strcmp(typeName, "complex") == 0) { - fprintf(outfile, " if (mod2(_%s_main[_%s_main_index_pointer + _i1])>_peak[_i1]){\n", fieldName, fieldName); - fprintf(outfile, " _temp_error=mod(_%s_main[_%s_main_index_pointer + _i1]-_checkfield[_%s_main_index_pointer + _i1])/(mod(_%s_main[_%s_main_index_pointer + _i1])+1e-20);\n", fieldName, fieldName, fieldName, fieldName, fieldName); - } -@@ -352,7 +353,7 @@ - - fprintf(outfile, " for (unsigned long _i1=0; _i1<_%s_main_ncomponents; _i1++){\n", fieldName); - -- if (strcmp(typeName, "complex") == 0){ -+ if (std::strcmp(typeName, "complex") == 0){ - fprintf(outfile, " _temp_error=mod(_%s_main[_i1]-_checkfield[_i1])/(mod(_%s_main[_i1])+1e-20);\n", fieldName, fieldName); - } - else{ -Index: xmds-1.6.5/source/xsil2graphics.cc -=================================================================== ---- xmds-1.6.5.orig/source/xsil2graphics.cc 2008-04-08 07:51:54.000000000 +0000 -+++ xmds-1.6.5/source/xsil2graphics.cc 2008-04-08 07:52:08.000000000 +0000 -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - // ********************************************************************** - -@@ -306,7 +307,7 @@ - - const DOMString *mgName = nextElement->getAttribute("Name"); - int mgNumber = i+1; -- if (strcmp("breakpoint", mgName->c_str()) == 0) { -+ if (std::strcmp("breakpoint", mgName->c_str()) == 0) { - mgNumber = 1; - } - else { diff -Nru xmds-1.6.5/debian/patches/series xmds-1.6.6/debian/patches/series --- xmds-1.6.5/debian/patches/series 2008-07-18 18:16:55.000000000 -0500 +++ xmds-1.6.6/debian/patches/series 1969-12-31 18:00:00.000000000 -0600 @@ -1 +0,0 @@ -compile-with-gcc-4.3.diff diff -Nru xmds-1.6.5/debian/rules xmds-1.6.6/debian/rules --- xmds-1.6.5/debian/rules 2008-07-18 18:16:55.000000000 -0500 +++ xmds-1.6.6/debian/rules 2008-07-18 18:16:56.000000000 -0500 @@ -2,7 +2,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk debdir = $(CURDIR)/debian instdir = $(debdir)/xmds @@ -42,6 +41,3 @@ # Add Makefile to the examples directory cp debian/Makefile-examples $(expdir)/Makefile - -clean:: - rm -rf config.log source/lorenz.* make-examples-stamp config.status diff -Nru xmds-1.6.5/examples/Makefile.am xmds-1.6.6/examples/Makefile.am --- xmds-1.6.5/examples/Makefile.am 2008-02-25 21:32:21.000000000 -0600 +++ xmds-1.6.6/examples/Makefile.am 2008-07-03 20:38:26.000000000 -0500 @@ -42,7 +42,7 @@ van_der_pol\ vibstring -CLEANFILES = $(check_SCRIPTS) *.o *.xsil *.m *.sci *.gnu *.R +CLEANFILES = $(check_SCRIPTS) *.cc *.exe *.o *.xsil *.m *.sci *.gnu *.R .xmds: -../source/xmds $*.xmds diff -Nru xmds-1.6.5/examples/Makefile.in xmds-1.6.6/examples/Makefile.in --- xmds-1.6.5/examples/Makefile.in 2008-02-25 21:32:56.000000000 -0600 +++ xmds-1.6.6/examples/Makefile.in 2008-07-03 21:47:30.000000000 -0500 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,86 +15,143 @@ @SET_MAKE@ # $Id: Makefile.am 1667 2008-01-21 22:12:20Z paultcochrane $ -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ +build_triplet = @build@ host_triplet = @host@ - -EXEEXT = @EXEEXT@ -OBJEXT = @OBJEXT@ -PATH_SEPARATOR = @PATH_SEPARATOR@ +subdir = examples +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/acx_pthread.m4 $(top_srcdir)/acx_mpi.m4 \ + $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/source/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ DEPDIR = @DEPDIR@ -F77 = @F77@ -GETCONF = @GETCONF@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ MPICC = @MPICC@ -MPICXX = @MPICXX@ -MPIF77 = @MPIF77@ MPILIBS = @MPILIBS@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ THREADLIBS = @THREADLIBS@ VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ - +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ SUFFIXES = .xmds check_SCRIPTS = \ atomlaser\ @@ -135,43 +192,63 @@ van_der_pol\ vibstring - -CLEANFILES = $(check_SCRIPTS) *.o *.xsil *.m *.sci *.gnu *.R -subdir = examples -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/source/config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DIST_COMMON = Makefile.am Makefile.in +CLEANFILES = $(check_SCRIPTS) *.cc *.exe *.o *.xsil *.m *.sci *.gnu *.R all: all-am .SUFFIXES: .SUFFIXES: .xmds -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu examples/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -uninstall-info-am: +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh tags: TAGS TAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ctags: CTAGS +CTAGS: -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -186,9 +263,7 @@ $(MAKE) $(AM_MAKEFLAGS) $(check_SCRIPTS) check: check-am all-am: Makefile - installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -200,7 +275,7 @@ installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -209,7 +284,7 @@ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -219,44 +294,66 @@ clean-am: clean-generic mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: install-data-am: +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic -uninstall-am: uninstall-info-am +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic uninstall uninstall-am uninstall-info-am + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am .xmds: diff -Nru xmds-1.6.5/install-sh xmds-1.6.6/install-sh --- xmds-1.6.5/install-sh 2008-02-25 21:32:21.000000000 -0600 +++ xmds-1.6.6/install-sh 2008-07-04 05:10:22.000000000 -0500 @@ -1,36 +1,62 @@ #!/bin/sh -# # install - install a program, script, or datafile -# This comes from X11R5 (mit/util/scripts/install.sh). + +scriptversion=2006-10-14.15 + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: # -# Copyright 1991 by the Massachusetts Institute of Technology +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. # -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of M.I.T. not be used in advertising or -# publicity pertaining to distribution of the software without specific, -# written prior permission. M.I.T. makes no representations about the -# suitability of this software for any purpose. It is provided "as is" -# without express or implied warranty. +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent # `make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. +# from scratch. +nl=' +' +IFS=" "" $nl" # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. doit="${DOITPROG-}" +if test -z "$doit"; then + doit_exec=exec +else + doit_exec=$doit +fi - -# put in absolute paths if you don't have them in your path; or use env. vars. +# Put in absolute file names if you don't have them in your path; +# or use environment vars. mvprog="${MVPROG-mv}" cpprog="${CPPROG-cp}" @@ -41,211 +67,441 @@ rmprog="${RMPROG-rm}" mkdirprog="${MKDIRPROG-mkdir}" -transformbasename="" -transform_arg="" -instcmd="$mvprog" -chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src="" -dst="" -dir_arg="" - -while [ x"$1" != x ]; do - case $1 in - -c) instcmd="$cpprog" - shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd="$stripprog" - shift - continue;; - - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; - - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac -done - -if [ x"$src" = x ] -then - echo "install: no input file specified" - exit 1 -else - true -fi +posix_glob= +posix_mkdir= -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d $dst ]; then - instcmd=: - chmodcmd="" - else - instcmd=mkdir - fi -else +# Desired mode of installed file. +mode=0755 -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f $src -o -d $src ] - then - true - else - echo "install: $src does not exist" - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "install: no destination specified" - exit 1 - else - true - fi +chmodcmd=$chmodprog +chowncmd= +chgrpcmd= +stripcmd= +rmcmd="$rmprog -f" +mvcmd="$mvprog" +src= +dst= +dir_arg= +dstarg= +no_target_directory= + +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" + +while test $# -ne 0; do + case $1 in + -c) shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + --help) echo "$usage"; exit $?;; + + -m) mode=$2 + shift + shift + case $mode in + *' '* | *' '* | *' +'* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic + -t) dstarg=$2 + shift + shift + continue;; - if [ -d $dst ] - then - dst="$dst"/`basename $src` - else - true - fi -fi + -T) no_target_directory=true + shift + continue;; -## this sed command emulates the dirname command -dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` + --version) echo "$0 $scriptversion"; exit $?;; -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script + --) shift + break;; -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' -' -IFS="${IFS-${defaultIFS}}" + -*) echo "$0: invalid option: $1" >&2 + exit 1;; -oIFS="${IFS}" -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS="${oIFS}" + *) break;; + esac +done -pathcomp='' +if test $# -ne 0 && test -z "$dir_arg$dstarg"; then + # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done +fi -while [ $# -ne 0 ] ; do - pathcomp="${pathcomp}${1}" - shift +if test $# -eq 0; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi - if [ ! -d "${pathcomp}" ] ; - then - $mkdirprog "${pathcomp}" - else - true - fi +if test -z "$dir_arg"; then + trap '(exit $?); exit' 1 2 13 15 - pathcomp="${pathcomp}/" -done + # Set umask so as not to create temps with too-generous modes. + # However, 'strip' requires both read and write access to temps. + case $mode in + # Optimize common cases. + *644) cp_umask=133;; + *755) cp_umask=22;; + + *[0-7]) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw='% 200' + fi + cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; + *) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw=,u+rw + fi + cp_umask=$mode$u_plus_rw;; + esac fi -if [ x"$dir_arg" != x ] -then - $doit $instcmd $dst && - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi -else - -# If we're going to rename the final executable, determine the name now. +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac + + if test -n "$dir_arg"; then + dst=$src + dstdir=$dst + test -d "$dstdir" + dstdir_status=$? + else + + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac - if [ x"$transformarg" = x ] - then - dstfile=`basename $dst` + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + dstdir=$dst + dst=$dstdir/`basename "$src"` + dstdir_status=0 + else + # Prefer dirname, but fall back on a substitute if dirname fails. + dstdir=` + (dirname "$dst") 2>/dev/null || + expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$dst" : 'X\(//\)[^/]' \| \ + X"$dst" : 'X\(//\)$' \| \ + X"$dst" : 'X\(/\)' \| . 2>/dev/null || + echo X"$dst" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q' + ` + + test -d "$dstdir" + dstdir_status=$? + fi + fi + + obsolete_mkdir_used=false + + if test $dstdir_status != 0; then + case $posix_mkdir in + '') + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode else - dstfile=`basename $dst $transformbasename | - sed $transformarg`$transformbasename + mkdir_mode= fi -# don't allow the sed command to completely eliminate the filename + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - if [ x"$dstfile" = x ] - then - dstfile=`basename $dst` + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writeable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; + esac + + if + $posix_mkdir && ( + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + ) + then : + else + + # The umask is ridiculous, or mkdir does not conform to POSIX, + # or it failed possibly due to a race condition. Create the + # directory the slow way, step by step, checking for races as we go. + + case $dstdir in + /*) prefix=/ ;; + -*) prefix=./ ;; + *) prefix= ;; + esac + + case $posix_glob in + '') + if (set -f) 2>/dev/null; then + posix_glob=true + else + posix_glob=false + fi ;; + esac + + oIFS=$IFS + IFS=/ + $posix_glob && set -f + set fnord $dstdir + shift + $posix_glob && set +f + IFS=$oIFS + + prefixes= + + for d + do + test -z "$d" && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= else - true + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi fi + prefix=$prefix/ + done -# Make a temp file name in the proper directory. - - dsttmp=$dstdir/#inst.$$# - -# Move or copy the file name to the temp name - - $doit $instcmd $src $dsttmp && - - trap "rm -f ${dsttmp}" 0 && - -# and set any options; do chmod last to preserve setuid bits - -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && - -# Now rename the file to the real destination. - - $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile - -fi && + if test -n "$prefixes"; then + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true + fi + fi + fi + + if test -n "$dir_arg"; then + { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && + { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || + test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 + else + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + + # Copy the file name to the temp name. + (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dst"; then + $doit $rmcmd -f "$dst" 2>/dev/null \ + || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ + && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ + || { + echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + } || exit 1 + trap '' 0 + fi +done -exit 0 +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff -Nru xmds-1.6.5/Makefile.in xmds-1.6.6/Makefile.in --- xmds-1.6.5/Makefile.in 2008-02-25 21:32:56.000000000 -0600 +++ xmds-1.6.6/Makefile.in 2008-07-03 21:47:30.000000000 -0500 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,88 +15,186 @@ @SET_MAKE@ # $Id: Makefile.am 1696 2008-01-26 23:07:17Z paultcochrane $ -SHELL = @SHELL@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ +build_triplet = @build@ host_triplet = @host@ - -EXEEXT = @EXEEXT@ -OBJEXT = @OBJEXT@ -PATH_SEPARATOR = @PATH_SEPARATOR@ +subdir = . +DIST_COMMON = README $(am__configure_deps) $(dist_doc_examples_DATA) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ + TODO config.guess config.sub depcomp install-sh ltmain.sh \ + missing mkinstalldirs +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/acx_pthread.m4 $(top_srcdir)/acx_mpi.m4 \ + $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno config.status.lineno +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/source/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +man1dir = $(mandir)/man1 +am__installdirs = "$(DESTDIR)$(man1dir)" \ + "$(DESTDIR)$(doc_examplesdir)" +NROFF = nroff +MANS = $(man1_MANS) +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +dist_doc_examplesDATA_INSTALL = $(INSTALL_DATA) +DATA = $(dist_doc_examples_DATA) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } +DIST_ARCHIVES = $(distdir).tar.gz +GZIP_ENV = --best +distuninstallcheck_listfiles = find . -type f -print +distcleancheck_listfiles = find . -type f -print +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ DEPDIR = @DEPDIR@ -F77 = @F77@ -GETCONF = @GETCONF@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ MPICC = @MPICC@ -MPICXX = @MPICXX@ -MPIF77 = @MPIF77@ MPILIBS = @MPILIBS@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ THREADLIBS = @THREADLIBS@ VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ - +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ SUBDIRS = source examples - example_files = \ examples/HighdimPlotExample.nb \ examples/atomlaser.xmds\ @@ -137,66 +235,55 @@ examples/van_der_pol.xmds\ examples/vibstring.xmds - manfiles = man/loadxsil.1\ man/xmds.1\ man/xsil2graphics.1 - man1_MANS = $(manfiles) - m4files = acx_mpi.m4 acx_pthread.m4 - EXTRA_DIST = $(example_files) $(m4files) $(manfiles) MANIFEST README.Windows source/loadxsil.m dist_doc_data = AUTHORS NEWS COPYING README README.Windows source/loadxsil.m doc_examplesdir = ${docdir}/examples dist_doc_examples_DATA = $(example_files) -subdir = . -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/source/config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = - -NROFF = nroff -MANS = $(man1_MANS) -DATA = $(dist_doc_examples_DATA) - - -RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ - uninstall-info-recursive all-recursive install-data-recursive \ - install-exec-recursive installdirs-recursive install-recursive \ - uninstall-recursive check-recursive installcheck-recursive -DIST_COMMON = README $(dist_doc_examples_DATA) AUTHORS COPYING \ - ChangeLog INSTALL Makefile.am Makefile.in NEWS TODO \ - acinclude.m4 aclocal.m4 config.guess config.sub configure \ - configure.in depcomp install-sh ltmain.sh missing mkinstalldirs -DIST_SUBDIRS = $(SUBDIRS) all: all-recursive .SUFFIXES: - -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +am--refresh: + @: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ + cd $(srcdir) && $(AUTOMAKE) --gnu \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; -$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) - cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): configure.in acinclude.m4 +$(top_srcdir)/configure: $(am__configure_deps) + cd $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -uninstall-info-am: - -man1dir = $(mandir)/man1 install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(man1dir) + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -215,8 +302,8 @@ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ done uninstall-man1: @$(NORMAL_UNINSTALL) @@ -229,29 +316,32 @@ done; \ for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ - rm -f $(DESTDIR)$(man1dir)/$$inst; \ + echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ done -dist_doc_examplesDATA_INSTALL = $(INSTALL_DATA) install-dist_doc_examplesDATA: $(dist_doc_examples_DATA) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(doc_examplesdir) + test -z "$(doc_examplesdir)" || $(MKDIR_P) "$(DESTDIR)$(doc_examplesdir)" @list='$(dist_doc_examples_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(dist_doc_examplesDATA_INSTALL) $$d$$p $(DESTDIR)$(doc_examplesdir)/$$f"; \ - $(dist_doc_examplesDATA_INSTALL) $$d$$p $(DESTDIR)$(doc_examplesdir)/$$f; \ + f=$(am__strip_dir) \ + echo " $(dist_doc_examplesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(doc_examplesdir)/$$f'"; \ + $(dist_doc_examplesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(doc_examplesdir)/$$f"; \ done uninstall-dist_doc_examplesDATA: @$(NORMAL_UNINSTALL) @list='$(dist_doc_examples_DATA)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(doc_examplesdir)/$$f"; \ - rm -f $(DESTDIR)$(doc_examplesdir)/$$f; \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(doc_examplesdir)/$$f'"; \ + rm -f "$(DESTDIR)$(doc_examplesdir)/$$f"; \ done # This directory's subdirectories are mostly independent; you can cd @@ -261,7 +351,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @set fnord $$MAKEFLAGS; amf=$$2; \ + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -273,15 +369,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @set fnord $$MAKEFLAGS; amf=$$2; \ +$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ @@ -302,17 +403,16 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done - -ETAGS = etags -ETAGSFLAGS = - -tags: TAGS +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -322,14 +422,23 @@ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -338,8 +447,24 @@ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique GTAGS: @@ -348,34 +473,26 @@ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = . -distdir = $(PACKAGE)-$(VERSION) - -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } - -GZIP_ENV = --best -distcleancheck_listfiles = find . -type f -print + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) $(am__remove_distdir) - mkdir $(distdir) - $(mkinstalldirs) $(distdir)/examples $(distdir)/man $(distdir)/source - @list='$(DISTFILES)'; for file in $$list; do \ + test -d $(distdir) || mkdir $(distdir) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -386,15 +503,19 @@ || exit 1; \ fi; \ done - list='$(SUBDIRS)'; for subdir in $$list; do \ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" \ - distdir=../$(distdir)/$$subdir \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -402,29 +523,57 @@ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + +dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) + +dist-shar: distdir + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + $(am__remove_distdir) + +dist-zip: distdir + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) $(am__remove_distdir) dist dist-all: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another # tarfile. distcheck: dist - $(am__remove_distdir) - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/=build - mkdir $(distdir)/=inst + mkdir $(distdir)/_build + mkdir $(distdir)/_inst chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ - && cd $(distdir)/=build \ - && ../configure --srcdir=.. --prefix=$$dc_install_base \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && cd $(distdir)/_build \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -432,23 +581,40 @@ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - find $$dc_install_base -type f -print ; \ - exit 1; } >&2 ) \ - && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ - && rm -f $(distdir).tar.gz \ + && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck $(am__remove_distdir) - @echo "$(distdir).tar.gz is ready for distribution" | \ - sed 'h;s/./=/g;p;x;p;x' + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' +distuninstallcheck: + @cd $(distuninstallcheck_dir) \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ + fi ; \ + $(distuninstallcheck_listfiles) ; \ + exit 1; } >&2 distcleancheck: distclean - if test '$(srcdir)' = . ; then \ + @if test '$(srcdir)' = . ; then \ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ exit 1 ; \ fi - test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left after distclean:" ; \ + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left in build directory after distclean:" ; \ $(distcleancheck_listfiles) ; \ exit 1; } >&2 check-am: all-am @@ -456,8 +622,9 @@ all-am: Makefile $(MANS) $(DATA) installdirs: installdirs-recursive installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(man1dir) $(DESTDIR)$(doc_examplesdir) - + for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(doc_examplesdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -469,7 +636,7 @@ installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -477,7 +644,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -488,58 +655,78 @@ distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive dvi-am: +html: html-recursive + info: info-recursive info-am: install-data-am: install-dist_doc_examplesDATA install-man +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: install-man1 +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf autom4te.cache + -rm -rf $(top_srcdir)/autom4te.cache + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-generic -uninstall-am: uninstall-dist_doc_examplesDATA uninstall-info-am \ - uninstall-man +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive -uninstall-info: uninstall-info-recursive +ps-am: + +uninstall-am: uninstall-dist_doc_examplesDATA uninstall-man uninstall-man: uninstall-man1 -.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ - clean-generic clean-recursive dist dist-all dist-gzip distcheck \ - distclean distclean-generic distclean-recursive distclean-tags \ - distcleancheck distdir dvi dvi-am dvi-recursive info info-am \ - info-recursive install install-am install-data install-data-am \ - install-data-recursive install-dist_doc_examplesDATA \ - install-exec install-exec-am install-exec-recursive \ - install-info install-info-am install-info-recursive install-man \ - install-man1 install-recursive install-strip installcheck \ - installcheck-am installdirs installdirs-am \ - installdirs-recursive maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive tags tags-recursive uninstall \ - uninstall-am uninstall-dist_doc_examplesDATA uninstall-info-am \ - uninstall-info-recursive uninstall-man uninstall-man1 \ - uninstall-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am am--refresh check check-am clean clean-generic \ + ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ + dist-shar dist-tarZ dist-zip distcheck distclean \ + distclean-generic distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_doc_examplesDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-man1 \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ + tags-recursive uninstall uninstall-am \ + uninstall-dist_doc_examplesDATA uninstall-man uninstall-man1 .PHONY: api examples examples-clean test test-clean diff -Nru xmds-1.6.5/MANIFEST xmds-1.6.6/MANIFEST --- xmds-1.6.5/MANIFEST 2008-02-25 21:35:00.000000000 -0600 +++ xmds-1.6.6/MANIFEST 2008-07-04 05:21:04.000000000 -0500 @@ -1,161 +1,161 @@ -xmds-1.6.5/ -xmds-1.6.5/AUTHORS -xmds-1.6.5/COPYING -xmds-1.6.5/ChangeLog -xmds-1.6.5/INSTALL -xmds-1.6.5/MANIFEST -xmds-1.6.5/Makefile.am -xmds-1.6.5/Makefile.in -xmds-1.6.5/NEWS -xmds-1.6.5/README -xmds-1.6.5/README.Windows -xmds-1.6.5/TODO -xmds-1.6.5/acinclude.m4 -xmds-1.6.5/aclocal.m4 -xmds-1.6.5/acx_mpi.m4 -xmds-1.6.5/acx_pthread.m4 -xmds-1.6.5/config.guess -xmds-1.6.5/config.sub -xmds-1.6.5/configure -xmds-1.6.5/configure.in -xmds-1.6.5/depcomp -xmds-1.6.5/examples/ -xmds-1.6.5/examples/HighdimPlotExample.nb -xmds-1.6.5/examples/Makefile.am -xmds-1.6.5/examples/Makefile.in -xmds-1.6.5/examples/atomlaser.xmds -xmds-1.6.5/examples/branch.xmds -xmds-1.6.5/examples/brusselator.xmds -xmds-1.6.5/examples/catcycle.xmds -xmds-1.6.5/examples/chain.xmds -xmds-1.6.5/examples/chemkin.xmds -xmds-1.6.5/examples/diffusion.xmds -xmds-1.6.5/examples/duffing.xmds -xmds-1.6.5/examples/fibre.xmds -xmds-1.6.5/examples/fisher_reaction_diffusion.xmds -xmds-1.6.5/examples/fullpos3D.xmds -xmds-1.6.5/examples/gaugeatomlaser.xmds -xmds-1.6.5/examples/groundstate.xmds -xmds-1.6.5/examples/highdim.xmds -xmds-1.6.5/examples/highdim_vector_version.xmds -xmds-1.6.5/examples/hires.xmds -xmds-1.6.5/examples/krebs.xmds -xmds-1.6.5/examples/kubo.xmds -xmds-1.6.5/examples/lane_emden.xmds -xmds-1.6.5/examples/lorenz.xmds -xmds-1.6.5/examples/lorenzInput.dat -xmds-1.6.5/examples/lotka_volterra.xmds -xmds-1.6.5/examples/nan.xmds -xmds-1.6.5/examples/ndparamp.xmds -xmds-1.6.5/examples/nlse.xmds -xmds-1.6.5/examples/oregonator.xmds -xmds-1.6.5/examples/paraxial_wave.xmds -xmds-1.6.5/examples/pendulum.xmds -xmds-1.6.5/examples/ring_modulator.xmds -xmds-1.6.5/examples/sech_soliton.xmds -xmds-1.6.5/examples/sech_soliton_tdepk.xmds -xmds-1.6.5/examples/sine.xmds -xmds-1.6.5/examples/soliton.xmds -xmds-1.6.5/examples/thermkin.xmds -xmds-1.6.5/examples/tla.xmds -xmds-1.6.5/examples/van_der_pol.xmds -xmds-1.6.5/examples/vibstring.xmds -xmds-1.6.5/install-sh -xmds-1.6.5/ltmain.sh -xmds-1.6.5/man/ -xmds-1.6.5/man/loadxsil.1 -xmds-1.6.5/man/xmds.1 -xmds-1.6.5/man/xsil2graphics.1 -xmds-1.6.5/missing -xmds-1.6.5/mkinstalldirs -xmds-1.6.5/source/ -xmds-1.6.5/source/Makefile.am -xmds-1.6.5/source/Makefile.in -xmds-1.6.5/source/config.h.in -xmds-1.6.5/source/dom3.h -xmds-1.6.5/source/getopt_xmds.c -xmds-1.6.5/source/getopt_xmds.h -xmds-1.6.5/source/getopt_xmds1.c -xmds-1.6.5/source/getopt_xmds_init.c -xmds-1.6.5/source/kissdom.cc -xmds-1.6.5/source/kissdom.h -xmds-1.6.5/source/loadxsil.m -xmds-1.6.5/source/main.cc -xmds-1.6.5/source/version.h -xmds-1.6.5/source/xmds_arg.cc -xmds-1.6.5/source/xmds_arg.h -xmds-1.6.5/source/xmds_arg_element.cc -xmds-1.6.5/source/xmds_arg_element.h -xmds-1.6.5/source/xmds_argv.cc -xmds-1.6.5/source/xmds_argv.h -xmds-1.6.5/source/xmds_breakpoint.cc -xmds-1.6.5/source/xmds_breakpoint.h -xmds-1.6.5/source/xmds_common.h -xmds-1.6.5/source/xmds_complex.h -xmds-1.6.5/source/xmds_element.cc -xmds-1.6.5/source/xmds_element.h -xmds-1.6.5/source/xmds_field.cc -xmds-1.6.5/source/xmds_field.h -xmds-1.6.5/source/xmds_filter.cc -xmds-1.6.5/source/xmds_filter.h -xmds-1.6.5/source/xmds_globals.cc -xmds-1.6.5/source/xmds_globals.h -xmds-1.6.5/source/xmds_integrate.cc -xmds-1.6.5/source/xmds_integrate.h -xmds-1.6.5/source/xmds_integrate_ark45.cc -xmds-1.6.5/source/xmds_integrate_ark45.h -xmds-1.6.5/source/xmds_integrate_ark45ex.cc -xmds-1.6.5/source/xmds_integrate_ark45ex.h -xmds-1.6.5/source/xmds_integrate_ark45ip.cc -xmds-1.6.5/source/xmds_integrate_ark45ip.h -xmds-1.6.5/source/xmds_integrate_ark89.cc -xmds-1.6.5/source/xmds_integrate_ark89.h -xmds-1.6.5/source/xmds_integrate_ark89ex.cc -xmds-1.6.5/source/xmds_integrate_ark89ex.h -xmds-1.6.5/source/xmds_integrate_ark89ip.cc -xmds-1.6.5/source/xmds_integrate_ark89ip.h -xmds-1.6.5/source/xmds_integrate_ex.cc -xmds-1.6.5/source/xmds_integrate_ex.h -xmds-1.6.5/source/xmds_integrate_ip.cc -xmds-1.6.5/source/xmds_integrate_ip.h -xmds-1.6.5/source/xmds_integrate_rk4.cc -xmds-1.6.5/source/xmds_integrate_rk4.h -xmds-1.6.5/source/xmds_integrate_rk4ex.cc -xmds-1.6.5/source/xmds_integrate_rk4ex.h -xmds-1.6.5/source/xmds_integrate_rk4ip.cc -xmds-1.6.5/source/xmds_integrate_rk4ip.h -xmds-1.6.5/source/xmds_integrate_rk9.cc -xmds-1.6.5/source/xmds_integrate_rk9.h -xmds-1.6.5/source/xmds_integrate_rk9ex.cc -xmds-1.6.5/source/xmds_integrate_rk9ex.h -xmds-1.6.5/source/xmds_integrate_rk9ip.cc -xmds-1.6.5/source/xmds_integrate_rk9ip.h -xmds-1.6.5/source/xmds_integrate_si.cc -xmds-1.6.5/source/xmds_integrate_si.h -xmds-1.6.5/source/xmds_integrate_siex.cc -xmds-1.6.5/source/xmds_integrate_siex.h -xmds-1.6.5/source/xmds_integrate_siip.cc -xmds-1.6.5/source/xmds_integrate_siip.h -xmds-1.6.5/source/xmds_moment_group.cc -xmds-1.6.5/source/xmds_moment_group.h -xmds-1.6.5/source/xmds_output.cc -xmds-1.6.5/source/xmds_output.h -xmds-1.6.5/source/xmds_segment.cc -xmds-1.6.5/source/xmds_segment.h -xmds-1.6.5/source/xmds_sequence.cc -xmds-1.6.5/source/xmds_sequence.h -xmds-1.6.5/source/xmds_simulation.cc -xmds-1.6.5/source/xmds_simulation.h -xmds-1.6.5/source/xmds_utils.cc -xmds-1.6.5/source/xmds_utils.h -xmds-1.6.5/source/xmds_vector.cc -xmds-1.6.5/source/xmds_vector.h -xmds-1.6.5/source/xmds_vector_element.cc -xmds-1.6.5/source/xmds_vector_element.h -xmds-1.6.5/source/xml_basics.cc -xmds-1.6.5/source/xml_basics.h -xmds-1.6.5/source/xml_parser.cc -xmds-1.6.5/source/xml_parser.h -xmds-1.6.5/source/xsil2graphics.cc -xmds-1.6.5/source/xsil_field.cc -xmds-1.6.5/source/xsil_field.h +xmds-1.6.6/ +xmds-1.6.6/AUTHORS +xmds-1.6.6/COPYING +xmds-1.6.6/ChangeLog +xmds-1.6.6/INSTALL +xmds-1.6.6/MANIFEST +xmds-1.6.6/Makefile.am +xmds-1.6.6/Makefile.in +xmds-1.6.6/NEWS +xmds-1.6.6/README +xmds-1.6.6/README.Windows +xmds-1.6.6/TODO +xmds-1.6.6/acinclude.m4 +xmds-1.6.6/aclocal.m4 +xmds-1.6.6/acx_mpi.m4 +xmds-1.6.6/acx_pthread.m4 +xmds-1.6.6/config.guess +xmds-1.6.6/config.sub +xmds-1.6.6/configure +xmds-1.6.6/configure.in +xmds-1.6.6/depcomp +xmds-1.6.6/examples/ +xmds-1.6.6/examples/HighdimPlotExample.nb +xmds-1.6.6/examples/Makefile.am +xmds-1.6.6/examples/Makefile.in +xmds-1.6.6/examples/atomlaser.xmds +xmds-1.6.6/examples/branch.xmds +xmds-1.6.6/examples/brusselator.xmds +xmds-1.6.6/examples/catcycle.xmds +xmds-1.6.6/examples/chain.xmds +xmds-1.6.6/examples/chemkin.xmds +xmds-1.6.6/examples/diffusion.xmds +xmds-1.6.6/examples/duffing.xmds +xmds-1.6.6/examples/fibre.xmds +xmds-1.6.6/examples/fisher_reaction_diffusion.xmds +xmds-1.6.6/examples/fullpos3D.xmds +xmds-1.6.6/examples/gaugeatomlaser.xmds +xmds-1.6.6/examples/groundstate.xmds +xmds-1.6.6/examples/highdim.xmds +xmds-1.6.6/examples/highdim_vector_version.xmds +xmds-1.6.6/examples/hires.xmds +xmds-1.6.6/examples/krebs.xmds +xmds-1.6.6/examples/kubo.xmds +xmds-1.6.6/examples/lane_emden.xmds +xmds-1.6.6/examples/lorenz.xmds +xmds-1.6.6/examples/lorenzInput.dat +xmds-1.6.6/examples/lotka_volterra.xmds +xmds-1.6.6/examples/nan.xmds +xmds-1.6.6/examples/ndparamp.xmds +xmds-1.6.6/examples/nlse.xmds +xmds-1.6.6/examples/oregonator.xmds +xmds-1.6.6/examples/paraxial_wave.xmds +xmds-1.6.6/examples/pendulum.xmds +xmds-1.6.6/examples/ring_modulator.xmds +xmds-1.6.6/examples/sech_soliton.xmds +xmds-1.6.6/examples/sech_soliton_tdepk.xmds +xmds-1.6.6/examples/sine.xmds +xmds-1.6.6/examples/soliton.xmds +xmds-1.6.6/examples/thermkin.xmds +xmds-1.6.6/examples/tla.xmds +xmds-1.6.6/examples/van_der_pol.xmds +xmds-1.6.6/examples/vibstring.xmds +xmds-1.6.6/install-sh +xmds-1.6.6/ltmain.sh +xmds-1.6.6/man/ +xmds-1.6.6/man/loadxsil.1 +xmds-1.6.6/man/xmds.1 +xmds-1.6.6/man/xsil2graphics.1 +xmds-1.6.6/missing +xmds-1.6.6/mkinstalldirs +xmds-1.6.6/source/ +xmds-1.6.6/source/Makefile.am +xmds-1.6.6/source/Makefile.in +xmds-1.6.6/source/config.h.in +xmds-1.6.6/source/dom3.h +xmds-1.6.6/source/getopt_xmds.c +xmds-1.6.6/source/getopt_xmds.h +xmds-1.6.6/source/getopt_xmds1.c +xmds-1.6.6/source/getopt_xmds_init.c +xmds-1.6.6/source/kissdom.cc +xmds-1.6.6/source/kissdom.h +xmds-1.6.6/source/loadxsil.m +xmds-1.6.6/source/main.cc +xmds-1.6.6/source/version.h +xmds-1.6.6/source/xmds_arg.cc +xmds-1.6.6/source/xmds_arg.h +xmds-1.6.6/source/xmds_arg_element.cc +xmds-1.6.6/source/xmds_arg_element.h +xmds-1.6.6/source/xmds_argv.cc +xmds-1.6.6/source/xmds_argv.h +xmds-1.6.6/source/xmds_breakpoint.cc +xmds-1.6.6/source/xmds_breakpoint.h +xmds-1.6.6/source/xmds_common.h +xmds-1.6.6/source/xmds_complex.h +xmds-1.6.6/source/xmds_element.cc +xmds-1.6.6/source/xmds_element.h +xmds-1.6.6/source/xmds_field.cc +xmds-1.6.6/source/xmds_field.h +xmds-1.6.6/source/xmds_filter.cc +xmds-1.6.6/source/xmds_filter.h +xmds-1.6.6/source/xmds_globals.cc +xmds-1.6.6/source/xmds_globals.h +xmds-1.6.6/source/xmds_integrate.cc +xmds-1.6.6/source/xmds_integrate.h +xmds-1.6.6/source/xmds_integrate_ark45.cc +xmds-1.6.6/source/xmds_integrate_ark45.h +xmds-1.6.6/source/xmds_integrate_ark45ex.cc +xmds-1.6.6/source/xmds_integrate_ark45ex.h +xmds-1.6.6/source/xmds_integrate_ark45ip.cc +xmds-1.6.6/source/xmds_integrate_ark45ip.h +xmds-1.6.6/source/xmds_integrate_ark89.cc +xmds-1.6.6/source/xmds_integrate_ark89.h +xmds-1.6.6/source/xmds_integrate_ark89ex.cc +xmds-1.6.6/source/xmds_integrate_ark89ex.h +xmds-1.6.6/source/xmds_integrate_ark89ip.cc +xmds-1.6.6/source/xmds_integrate_ark89ip.h +xmds-1.6.6/source/xmds_integrate_ex.cc +xmds-1.6.6/source/xmds_integrate_ex.h +xmds-1.6.6/source/xmds_integrate_ip.cc +xmds-1.6.6/source/xmds_integrate_ip.h +xmds-1.6.6/source/xmds_integrate_rk4.cc +xmds-1.6.6/source/xmds_integrate_rk4.h +xmds-1.6.6/source/xmds_integrate_rk4ex.cc +xmds-1.6.6/source/xmds_integrate_rk4ex.h +xmds-1.6.6/source/xmds_integrate_rk4ip.cc +xmds-1.6.6/source/xmds_integrate_rk4ip.h +xmds-1.6.6/source/xmds_integrate_rk9.cc +xmds-1.6.6/source/xmds_integrate_rk9.h +xmds-1.6.6/source/xmds_integrate_rk9ex.cc +xmds-1.6.6/source/xmds_integrate_rk9ex.h +xmds-1.6.6/source/xmds_integrate_rk9ip.cc +xmds-1.6.6/source/xmds_integrate_rk9ip.h +xmds-1.6.6/source/xmds_integrate_si.cc +xmds-1.6.6/source/xmds_integrate_si.h +xmds-1.6.6/source/xmds_integrate_siex.cc +xmds-1.6.6/source/xmds_integrate_siex.h +xmds-1.6.6/source/xmds_integrate_siip.cc +xmds-1.6.6/source/xmds_integrate_siip.h +xmds-1.6.6/source/xmds_moment_group.cc +xmds-1.6.6/source/xmds_moment_group.h +xmds-1.6.6/source/xmds_output.cc +xmds-1.6.6/source/xmds_output.h +xmds-1.6.6/source/xmds_segment.cc +xmds-1.6.6/source/xmds_segment.h +xmds-1.6.6/source/xmds_sequence.cc +xmds-1.6.6/source/xmds_sequence.h +xmds-1.6.6/source/xmds_simulation.cc +xmds-1.6.6/source/xmds_simulation.h +xmds-1.6.6/source/xmds_utils.cc +xmds-1.6.6/source/xmds_utils.h +xmds-1.6.6/source/xmds_vector.cc +xmds-1.6.6/source/xmds_vector.h +xmds-1.6.6/source/xmds_vector_element.cc +xmds-1.6.6/source/xmds_vector_element.h +xmds-1.6.6/source/xml_basics.cc +xmds-1.6.6/source/xml_basics.h +xmds-1.6.6/source/xml_parser.cc +xmds-1.6.6/source/xml_parser.h +xmds-1.6.6/source/xsil2graphics.cc +xmds-1.6.6/source/xsil_field.cc +xmds-1.6.6/source/xsil_field.h diff -Nru xmds-1.6.5/NEWS xmds-1.6.6/NEWS --- xmds-1.6.5/NEWS 2008-02-25 21:32:21.000000000 -0600 +++ xmds-1.6.6/NEWS 2008-07-03 20:40:09.000000000 -0500 @@ -1,4 +1,71 @@ -$Id: NEWS 1194 2006-12-18 12:59:46Z paultcochrane $ +$Id: NEWS 1889 2008-03-18 15:48:09Z paultcochrane $ + +Version xmds-1.6.5 (2008-02-26) + + * Various bug fixes - new no known bug status + * Superior treatment of extreme cases in adaptive algorithms + * Simulation can halt if the solution goes non-finite. + Put this in the appropriate integration element: + yes + * Cross-propagation is now 4th order for RK4 algorithms + * Patches to fix compiler warnings (and potential issues, and the removal + of superfluous files courtesy of Rafael Laboissiere. + * ChangeLog format altered to give a better summary of changes + * Reconfigured the location of where some files are installed, + specifically loadxsil.m, ancillary files like README and the example + files are all installed under the equivalent of /usr/share/doc/xmds. + * Automatic plotting of simulation output is now possible with the -p + (a.k.a. --plot) command line argument to xsil2graphics. This is only + possible with Matlab/Octave at present. + * One can now specify the desired XSIL output filename at the command + line when one calls the simulation program. Just use the + -o (--outfilename) argument and supply the desired filename. + +Version xmds-1.6.4 (2008-01-10) + +A new release for a new year. + + * Arrays: + +... phi(100) + +... for (long j=1;j<101;j++) { +dphi_dt(j) = L[phi](j) + V*phi(j); +} +... + + * Bug fixes! + * Internal code cleanups + * New example scripts + * Rudimentary visualisation capability with R (http://www.r-project.org) + + +Version xmds-1.6.3 (2007-06-27) + +This is another bugfix release of xmds-1.6. It is unlikely that anyone else has +ever encountered these bugs, and now they never will. We are back to "no known +bugs". + +Version xmds-1.6.2 (2007-06-15) + +This is a critical bugfix update of xmds-1.6. Recommended for all users. + +Version xmds-1.6.1 (2007-05-10) + +This is a bugfix and minor tweak release of xmds, to correspond with the new +documentation release. + +Version xmds-1.6 (2007-03-22) + +Welcome to a brave new world of XMDS. A brave new algorithm list, anyway. Say +hello to Michael Hush and the new algorithms he coded. We now have adaptive +9(8)th order deterministic integration, where the adaptive step is stochastic +safe. In our testing this means 4th order adaptive strong convergence for +stochastic equations. The new algorithms are: RK9IP, RK9EX, ARK89IP and +ARK89EX. The syntax and workings are identical to the RK4 and ARK45 algorithms, +except that for stochastic problems the adaptive algorithm changes +automatically to a stochastic-safe version. Also, less bugs. We are back to +zero known bugs, as usual for release. Version 1.5-3 (19/09/2006) * FFTW version 3! This version is faster, and vectorises on many diff -Nru xmds-1.6.5/README xmds-1.6.6/README --- xmds-1.6.5/README 2008-02-25 21:32:21.000000000 -0600 +++ xmds-1.6.6/README 2008-07-03 20:40:09.000000000 -0500 @@ -1,4 +1,4 @@ -# $Id: README 1827 2008-02-26 03:31:33Z joehope $ +# $Id: README 1888 2008-03-18 15:41:15Z paultcochrane $ This is XMDS: eXtensible Multi Dimensional Simulator; an open source numerical simulation package that integrates equations. You write them @@ -108,21 +108,21 @@ Try out the nlse.xmds example in the examples/ directory. Type: -.../xmds-1.6.5> cd examples -.../xmds-1.6.5/examples> xmds nlse.xmds +.../xmds-1.6.6> cd examples +.../xmds-1.6.6/examples> xmds nlse.xmds This makes an executable file called nlse, which includes all the high-level simulation data in nlse.xmds, in the form of an executable, compiled C++ program. All you have to do is run the code to get the results of your simulation: -.../xmds-1.6.5/examples> nlse +.../xmds-1.6.6/examples> nlse The output is in the file nlse.xsil, in scientific interchange xml format. There is a utilitly installed to convert this into other formats for plotting: -.../xmds-1.6.5/examples> xsil2graphics nlse.xsil +.../xmds-1.6.6/examples> xsil2graphics nlse.xsil once in matlab or octave, type: @@ -131,7 +131,7 @@ OR -.../xmds-1.6.5/examples> xsil2graphics --scilab nlse.xsil +.../xmds-1.6.6/examples> xsil2graphics --scilab nlse.xsil and once in scilab, type: diff -Nru xmds-1.6.5/source/config.h.in xmds-1.6.6/source/config.h.in --- xmds-1.6.5/source/config.h.in 2008-02-25 21:32:55.000000000 -0600 +++ xmds-1.6.6/source/config.h.in 2008-07-03 21:47:37.000000000 -0500 @@ -130,12 +130,12 @@ your system. */ #undef PTHREAD_CREATE_JOINABLE -/* The size of a `unsigned long', as computed by sizeof. */ +/* The size of `unsigned long', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_LONG /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. + automatically deduced at runtime. STACK_DIRECTION > 0 => grows toward higher addresses STACK_DIRECTION < 0 => grows toward lower addresses STACK_DIRECTION = 0 => direction of growth unknown */ diff -Nru xmds-1.6.5/source/kissdom.cc xmds-1.6.6/source/kissdom.cc --- xmds-1.6.5/source/kissdom.cc 2008-02-25 21:32:18.000000000 -0600 +++ xmds-1.6.6/source/kissdom.cc 2008-07-03 20:38:23.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 + Copyright (C) 2000-2008 Code contributed by Greg Collecutt, Joseph Hope and Paul Cochrane @@ -21,7 +21,7 @@ */ /* - $Id: kissdom.cc 1656 2008-01-19 16:02:13Z paultcochrane $ + $Id: kissdom.cc 1885 2008-03-18 15:24:56Z paultcochrane $ */ /*! @file kissdom.cc diff -Nru xmds-1.6.5/source/main.cc xmds-1.6.6/source/main.cc --- xmds-1.6.5/source/main.cc 2008-02-25 21:32:17.000000000 -0600 +++ xmds-1.6.6/source/main.cc 2008-07-03 20:38:23.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 + Copyright (C) 2000-2008 Code contributed by Greg Collecutt, Joseph Hope and Paul Cochrane @@ -21,7 +21,7 @@ */ /* - $Id: main.cc 1733 2008-01-30 07:19:08Z gmcmanus $ + $Id: main.cc 1885 2008-03-18 15:24:56Z paultcochrane $ */ /*! @@ -415,7 +415,7 @@ */ cout << "This is xmds, version " << VERSION << " (" << REVISION <<")\n" << - "Copyright 2000-2007 Greg Collecutt, Joseph Hope "<< + "Copyright 2000-2008 Greg Collecutt, Joseph Hope "<< "and the xmds-devel team\n" << "xmds is available from http://www.xmds.org\n\n" << "Writing a template to file with filename: " << outfilename << "\n"; @@ -705,7 +705,7 @@ cout << "This is xmds, version " << myxmdsSimulation.parameters()->version.c_str() << " (" << REVISION << ")" << "\n"; - cout << "Copyright 2000-2007 Greg Collecutt, Joseph Hope " << + cout << "Copyright 2000-2008 Greg Collecutt, Joseph Hope " << "and the xmds-devel team\n" << "xmds is available from http://www.xmds.org\n\n"; diff -Nru xmds-1.6.5/source/Makefile.in xmds-1.6.6/source/Makefile.in --- xmds-1.6.5/source/Makefile.in 2008-02-25 21:32:56.000000000 -0600 +++ xmds-1.6.6/source/Makefile.in 2008-07-03 21:47:30.000000000 -0500 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,86 +15,220 @@ @SET_MAKE@ # $Id: Makefile.am 1667 2008-01-21 22:12:20Z paultcochrane $ -SHELL = @SHELL@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include + +VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ +build_triplet = @build@ host_triplet = @host@ - -EXEEXT = @EXEEXT@ -OBJEXT = @OBJEXT@ -PATH_SEPARATOR = @PATH_SEPARATOR@ +bin_PROGRAMS = xmds$(EXEEXT) xsil2graphics$(EXEEXT) +subdir = source +DIST_COMMON = $(dist_include_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/acx_pthread.m4 $(top_srcdir)/acx_mpi.m4 \ + $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = config.h +CONFIG_CLEAN_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ + "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" +libLIBRARIES_INSTALL = $(INSTALL_DATA) +LIBRARIES = $(lib_LIBRARIES) +AR = ar +ARFLAGS = cru +libxmds_a_AR = $(AR) $(ARFLAGS) +libxmds_a_LIBADD = +am_libxmds_a_OBJECTS = getopt_xmds.$(OBJEXT) getopt_xmds1.$(OBJEXT) \ + getopt_xmds_init.$(OBJEXT) xsil_field.$(OBJEXT) \ + xml_basics.$(OBJEXT) kissdom.$(OBJEXT) xml_parser.$(OBJEXT) \ + xmds_utils.$(OBJEXT) +libxmds_a_OBJECTS = $(am_libxmds_a_OBJECTS) +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +PROGRAMS = $(bin_PROGRAMS) +am__objects_1 = kissdom.$(OBJEXT) xml_basics.$(OBJEXT) \ + xml_parser.$(OBJEXT) +am__objects_2 = xmds_argv.$(OBJEXT) xmds_arg.$(OBJEXT) \ + xmds_arg_element.$(OBJEXT) +am__objects_3 = xmds_integrate_ip.$(OBJEXT) \ + xmds_integrate_ex.$(OBJEXT) xmds_integrate_si.$(OBJEXT) \ + xmds_integrate_siip.$(OBJEXT) xmds_integrate_siex.$(OBJEXT) \ + xmds_integrate_rk4.$(OBJEXT) xmds_integrate_rk4ip.$(OBJEXT) \ + xmds_integrate_rk4ex.$(OBJEXT) xmds_integrate_ark45.$(OBJEXT) \ + xmds_integrate_ark45ip.$(OBJEXT) \ + xmds_integrate_ark45ex.$(OBJEXT) xmds_integrate_rk9.$(OBJEXT) \ + xmds_integrate_rk9ip.$(OBJEXT) xmds_integrate_rk9ex.$(OBJEXT) \ + xmds_integrate_ark89.$(OBJEXT) \ + xmds_integrate_ark89ip.$(OBJEXT) \ + xmds_integrate_ark89ex.$(OBJEXT) +am__objects_4 = $(am__objects_1) xmds_utils.$(OBJEXT) \ + xmds_element.$(OBJEXT) xmds_globals.$(OBJEXT) \ + xmds_field.$(OBJEXT) xmds_vector.$(OBJEXT) \ + xmds_vector_element.$(OBJEXT) xmds_moment_group.$(OBJEXT) \ + xmds_output.$(OBJEXT) xmds_segment.$(OBJEXT) \ + xmds_sequence.$(OBJEXT) xmds_integrate.$(OBJEXT) \ + xmds_filter.$(OBJEXT) xmds_simulation.$(OBJEXT) \ + xmds_breakpoint.$(OBJEXT) $(am__objects_2) $(am__objects_3) \ + main.$(OBJEXT) +am_xmds_OBJECTS = $(am__objects_4) +xmds_OBJECTS = $(am_xmds_OBJECTS) +xmds_LDADD = $(LDADD) +am_xsil2graphics_OBJECTS = xml_basics.$(OBJEXT) kissdom.$(OBJEXT) \ + xml_parser.$(OBJEXT) xmds_utils.$(OBJEXT) xsil_field.$(OBJEXT) \ + xsil2graphics.$(OBJEXT) +xsil2graphics_OBJECTS = $(am_xsil2graphics_OBJECTS) +xsil2graphics_LDADD = $(LDADD) +DEFAULT_INCLUDES = -I.@am__isrc@ +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +CXXLD = $(CXX) +CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + -o $@ +SOURCES = $(libxmds_a_SOURCES) $(xmds_SOURCES) \ + $(xsil2graphics_SOURCES) +DIST_SOURCES = $(libxmds_a_SOURCES) $(xmds_SOURCES) \ + $(xsil2graphics_SOURCES) +dist_includeHEADERS_INSTALL = $(INSTALL_HEADER) +nodist_includeHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(dist_include_HEADERS) $(nodist_include_HEADERS) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ DEPDIR = @DEPDIR@ -F77 = @F77@ -GETCONF = @GETCONF@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ MPICC = @MPICC@ -MPICXX = @MPICXX@ -MPIF77 = @MPIF77@ MPILIBS = @MPILIBS@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ THREADLIBS = @THREADLIBS@ VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ - +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ XML_PARSER_SOURCES = dom3.h\ kissdom.h\ kissdom.cc\ @@ -103,7 +237,6 @@ xml_parser.h\ xml_parser.cc - ALGORITHM_SOURCES = \ xmds_integrate_ip.h\ xmds_integrate_ip.cc\ @@ -140,7 +273,6 @@ xmds_integrate_ark89ex.h\ xmds_integrate_ark89ex.cc - ARGUMENT_PARSING_SOURCES = \ xmds_argv.h\ xmds_argv.cc\ @@ -149,8 +281,6 @@ xmds_arg_element.h\ xmds_arg_element.cc - -bin_PROGRAMS = xmds xsil2graphics xmds_SOURCES_temp = \ $(XML_PARSER_SOURCES)\ xmds_common.h\ @@ -188,9 +318,7 @@ $(ALGORITHM_SOURCES)\ main.cc - xmds_SOURCES = version.h $(xmds_SOURCES_temp) - xsil2graphics_SOURCES = xml_basics.cc\ kissdom.cc\ xml_parser.cc\ @@ -198,11 +326,9 @@ xsil_field.cc\ xsil2graphics.cc - dist_include_HEADERS = xmds_complex.h getopt_xmds.h nodist_include_HEADERS = xmds_config.h DISTCLEANFILES = xmds_config.h - lib_LIBRARIES = libxmds.a libxmds_a_SOURCES = getopt_xmds.h\ getopt_xmds.c\ @@ -214,176 +340,82 @@ xml_parser.cc\ xmds_utils.cc -subdir = source -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = -LIBRARIES = $(lib_LIBRARIES) - -libxmds_a_AR = $(AR) cru -libxmds_a_LIBADD = -am_libxmds_a_OBJECTS = getopt_xmds.$(OBJEXT) getopt_xmds1.$(OBJEXT) \ - getopt_xmds_init.$(OBJEXT) xsil_field.$(OBJEXT) \ - xml_basics.$(OBJEXT) kissdom.$(OBJEXT) xml_parser.$(OBJEXT) \ - xmds_utils.$(OBJEXT) -libxmds_a_OBJECTS = $(am_libxmds_a_OBJECTS) -bin_PROGRAMS = xmds$(EXEEXT) xsil2graphics$(EXEEXT) -PROGRAMS = $(bin_PROGRAMS) - -am__objects_1 = kissdom.$(OBJEXT) xml_basics.$(OBJEXT) \ - xml_parser.$(OBJEXT) -am__objects_2 = xmds_argv.$(OBJEXT) xmds_arg.$(OBJEXT) \ - xmds_arg_element.$(OBJEXT) -am__objects_3 = xmds_integrate_ip.$(OBJEXT) xmds_integrate_ex.$(OBJEXT) \ - xmds_integrate_si.$(OBJEXT) xmds_integrate_siip.$(OBJEXT) \ - xmds_integrate_siex.$(OBJEXT) xmds_integrate_rk4.$(OBJEXT) \ - xmds_integrate_rk4ip.$(OBJEXT) xmds_integrate_rk4ex.$(OBJEXT) \ - xmds_integrate_ark45.$(OBJEXT) xmds_integrate_ark45ip.$(OBJEXT) \ - xmds_integrate_ark45ex.$(OBJEXT) xmds_integrate_rk9.$(OBJEXT) \ - xmds_integrate_rk9ip.$(OBJEXT) xmds_integrate_rk9ex.$(OBJEXT) \ - xmds_integrate_ark89.$(OBJEXT) xmds_integrate_ark89ip.$(OBJEXT) \ - xmds_integrate_ark89ex.$(OBJEXT) -am__objects_4 = $(am__objects_1) xmds_utils.$(OBJEXT) \ - xmds_element.$(OBJEXT) xmds_globals.$(OBJEXT) \ - xmds_field.$(OBJEXT) xmds_vector.$(OBJEXT) \ - xmds_vector_element.$(OBJEXT) xmds_moment_group.$(OBJEXT) \ - xmds_output.$(OBJEXT) xmds_segment.$(OBJEXT) \ - xmds_sequence.$(OBJEXT) xmds_integrate.$(OBJEXT) \ - xmds_filter.$(OBJEXT) xmds_simulation.$(OBJEXT) \ - xmds_breakpoint.$(OBJEXT) $(am__objects_2) $(am__objects_3) \ - main.$(OBJEXT) -am_xmds_OBJECTS = $(am__objects_4) -xmds_OBJECTS = $(am_xmds_OBJECTS) -xmds_LDADD = $(LDADD) -xmds_DEPENDENCIES = -xmds_LDFLAGS = -am_xsil2graphics_OBJECTS = xml_basics.$(OBJEXT) kissdom.$(OBJEXT) \ - xml_parser.$(OBJEXT) xmds_utils.$(OBJEXT) xsil_field.$(OBJEXT) \ - xsil2graphics.$(OBJEXT) -xsil2graphics_OBJECTS = $(am_xsil2graphics_OBJECTS) -xsil2graphics_LDADD = $(LDADD) -xsil2graphics_DEPENDENCIES = -xsil2graphics_LDFLAGS = - -DEFS = @DEFS@ -DEFAULT_INCLUDES = -I. -I$(srcdir) -I. -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/getopt_xmds.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/getopt_xmds1.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/getopt_xmds_init.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/kissdom.Po ./$(DEPDIR)/main.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_arg.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_arg_element.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_argv.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_breakpoint.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_element.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_field.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_filter.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_globals.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_integrate.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_integrate_ark45.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_integrate_ark45ex.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_integrate_ark45ip.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_integrate_ark89.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_integrate_ark89ex.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_integrate_ark89ip.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_integrate_ex.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_integrate_ip.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_integrate_rk4.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_integrate_rk4ex.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_integrate_rk4ip.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_integrate_rk9.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_integrate_rk9ex.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_integrate_rk9ip.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_integrate_si.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_integrate_siex.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_integrate_siip.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_moment_group.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_output.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_segment.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_sequence.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_simulation.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_utils.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_vector.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xmds_vector_element.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xml_basics.Po ./$(DEPDIR)/xml_parser.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xsil2graphics.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xsil_field.Po -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ - -o $@ -DIST_SOURCES = $(libxmds_a_SOURCES) $(xmds_SOURCES) \ - $(xsil2graphics_SOURCES) -HEADERS = $(dist_include_HEADERS) $(nodist_include_HEADERS) - -DIST_COMMON = $(dist_include_HEADERS) Makefile.am Makefile.in \ - config.h.in -SOURCES = $(libxmds_a_SOURCES) $(xmds_SOURCES) $(xsil2graphics_SOURCES) - all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: .SUFFIXES: .c .cc .o .obj -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu source/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu source/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh config.h: stamp-h1 @if test ! -f $@; then \ rm -f stamp-h1; \ - $(MAKE) stamp-h1; \ + $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status source/config.h - -$(srcdir)/config.h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/config.h.in: $(am__configure_deps) cd $(top_srcdir) && $(AUTOHEADER) - touch $(srcdir)/config.h.in + rm -f stamp-h1 + touch $@ distclean-hdr: -rm -f config.h stamp-h1 - -AR = ar -libLIBRARIES_INSTALL = $(INSTALL_DATA) install-libLIBRARIES: $(lib_LIBRARIES) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(libdir) + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f"; \ - $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f; \ + f=$(am__strip_dir) \ + echo " $(libLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ + $(libLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ else :; fi; \ done @$(POST_INSTALL) @list='$(lib_LIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ - p="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \ - $(RANLIB) $(DESTDIR)$(libdir)/$$p; \ + p=$(am__strip_dir) \ + echo " $(RANLIB) '$(DESTDIR)$(libdir)/$$p'"; \ + $(RANLIB) "$(DESTDIR)$(libdir)/$$p"; \ else :; fi; \ done uninstall-libLIBRARIES: @$(NORMAL_UNINSTALL) @list='$(lib_LIBRARIES)'; for p in $$list; do \ - p="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(libdir)/$$p"; \ - rm -f $(DESTDIR)$(libdir)/$$p; \ + p=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + rm -f "$(DESTDIR)$(libdir)/$$p"; \ done clean-libLIBRARIES: @@ -392,17 +424,16 @@ -rm -f libxmds.a $(libxmds_a_AR) libxmds.a $(libxmds_a_OBJECTS) $(libxmds_a_LIBADD) $(RANLIB) libxmds.a -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ - $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ + echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -410,21 +441,21 @@ @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ - rm -f $(DESTDIR)$(bindir)/$$f; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ done clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) xmds$(EXEEXT): $(xmds_OBJECTS) $(xmds_DEPENDENCIES) @rm -f xmds$(EXEEXT) - $(CXXLINK) $(xmds_LDFLAGS) $(xmds_OBJECTS) $(xmds_LDADD) $(LIBS) + $(CXXLINK) $(xmds_OBJECTS) $(xmds_LDADD) $(LIBS) xsil2graphics$(EXEEXT): $(xsil2graphics_OBJECTS) $(xsil2graphics_DEPENDENCIES) @rm -f xsil2graphics$(EXEEXT) - $(CXXLINK) $(xsil2graphics_LDFLAGS) $(xsil2graphics_OBJECTS) $(xsil2graphics_LDADD) $(LIBS) + $(CXXLINK) $(xsil2graphics_OBJECTS) $(xsil2graphics_LDADD) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c @@ -473,77 +504,68 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsil2graphics.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsil_field.Po@am__quote@ -distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: -@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `cygpath -w $<` -CCDEPMODE = @CCDEPMODE@ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .cc.o: -@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< .cc.obj: -@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(CXXCOMPILE) -c -o $@ `cygpath -w $<` -CXXDEPMODE = @CXXDEPMODE@ -uninstall-info-am: -dist_includeHEADERS_INSTALL = $(INSTALL_HEADER) +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` install-dist_includeHEADERS: $(dist_include_HEADERS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(includedir) + test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" @list='$(dist_include_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(dist_includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \ - $(dist_includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \ + f=$(am__strip_dir) \ + echo " $(dist_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \ + $(dist_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \ done uninstall-dist_includeHEADERS: @$(NORMAL_UNINSTALL) @list='$(dist_include_HEADERS)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(includedir)/$$f"; \ - rm -f $(DESTDIR)$(includedir)/$$f; \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \ + rm -f "$(DESTDIR)$(includedir)/$$f"; \ done -nodist_includeHEADERS_INSTALL = $(INSTALL_HEADER) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(includedir) + test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" @list='$(nodist_include_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(nodist_includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \ - $(nodist_includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \ + f=$(am__strip_dir) \ + echo " $(nodist_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \ + $(nodist_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \ done uninstall-nodist_includeHEADERS: @$(NORMAL_UNINSTALL) @list='$(nodist_include_HEADERS)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(includedir)/$$f"; \ - rm -f $(DESTDIR)$(includedir)/$$f; \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \ + rm -f "$(DESTDIR)$(includedir)/$$f"; \ done -ETAGS = etags -ETAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -552,6 +574,7 @@ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -563,8 +586,24 @@ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique GTAGS: @@ -573,23 +612,24 @@ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -603,10 +643,10 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS) config.h - installdirs: - $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir) - + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -618,7 +658,7 @@ installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -626,7 +666,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @@ -638,14 +678,17 @@ mostlyclean-am distclean: distclean-am - -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-hdr distclean-tags + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-hdr distclean-tags dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -653,39 +696,59 @@ install-data-am: install-dist_includeHEADERS \ install-nodist_includeHEADERS +install-dvi: install-dvi-am + install-exec-am: install-binPROGRAMS install-libLIBRARIES +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -rf ./$(DEPDIR) + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-compile mostlyclean-generic +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + uninstall-am: uninstall-binPROGRAMS uninstall-dist_includeHEADERS \ - uninstall-info-am uninstall-libLIBRARIES \ - uninstall-nodist_includeHEADERS + uninstall-libLIBRARIES uninstall-nodist_includeHEADERS + +.MAKE: install-am install-strip -.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libLIBRARIES distclean distclean-compile \ - distclean-depend distclean-generic distclean-hdr distclean-tags \ - distdir dvi dvi-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am \ - install-dist_includeHEADERS install-exec install-exec-am \ - install-info install-info-am install-libLIBRARIES install-man \ - install-nodist_includeHEADERS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic tags uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-dist_includeHEADERS \ - uninstall-info-am uninstall-libLIBRARIES \ +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-libLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-hdr \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-data \ + install-data-am install-dist_includeHEADERS install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libLIBRARIES install-man install-nodist_includeHEADERS \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-dist_includeHEADERS uninstall-libLIBRARIES \ uninstall-nodist_includeHEADERS diff -Nru xmds-1.6.5/source/version.h xmds-1.6.6/source/version.h --- xmds-1.6.5/source/version.h 2008-02-25 21:33:32.000000000 -0600 +++ xmds-1.6.6/source/version.h 2008-07-03 21:47:36.000000000 -0500 @@ -1 +1 @@ -#define REVISION "r1827" +#define REVISION "r2041" diff -Nru xmds-1.6.5/source/xmds_arg.cc xmds-1.6.6/source/xmds_arg.cc --- xmds-1.6.5/source/xmds_arg.cc 2008-02-25 21:32:18.000000000 -0600 +++ xmds-1.6.6/source/xmds_arg.cc 2008-07-03 20:38:23.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 + Copyright (C) 2000-2008 Code contributed by Greg Collecutt, Joseph Hope and Paul Cochrane @@ -21,7 +21,7 @@ */ /* - $Id: xmds_arg.cc 1599 2007-11-17 13:42:49Z paultcochrane $ + $Id: xmds_arg.cc 1885 2008-03-18 15:24:56Z paultcochrane $ */ /*! @file xmds_arg.cc diff -Nru xmds-1.6.5/source/xmds_arg_element.cc xmds-1.6.6/source/xmds_arg_element.cc --- xmds-1.6.5/source/xmds_arg_element.cc 2008-02-25 21:32:17.000000000 -0600 +++ xmds-1.6.6/source/xmds_arg_element.cc 2008-07-03 20:38:23.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 + Copyright (C) 2000-2008 Code contributed by Greg Collecutt, Joseph Hope and Paul Cochrane @@ -21,7 +21,7 @@ */ /* - $Id: xmds_arg_element.cc 1602 2007-11-18 18:47:00Z paultcochrane $ + $Id: xmds_arg_element.cc 1885 2008-03-18 15:24:56Z paultcochrane $ */ /*! @file xmds_arg_element.cc diff -Nru xmds-1.6.5/source/xmds_argv.cc xmds-1.6.6/source/xmds_argv.cc --- xmds-1.6.5/source/xmds_argv.cc 2008-02-25 21:32:17.000000000 -0600 +++ xmds-1.6.6/source/xmds_argv.cc 2008-07-03 20:38:23.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 + Copyright (C) 2000-2008 Code contributed by Greg Collecutt, Joseph Hope and Paul Cochrane @@ -21,7 +21,7 @@ */ /* - $Id: xmds_argv.cc 1603 2007-11-18 18:47:12Z paultcochrane $ + $Id: xmds_argv.cc 1885 2008-03-18 15:24:56Z paultcochrane $ */ /*! @file xmds_argv.cc diff -Nru xmds-1.6.5/source/xmds_breakpoint.cc xmds-1.6.6/source/xmds_breakpoint.cc --- xmds-1.6.5/source/xmds_breakpoint.cc 2008-02-25 21:32:17.000000000 -0600 +++ xmds-1.6.6/source/xmds_breakpoint.cc 2008-07-03 20:38:23.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 + Copyright (C) 2000-2008 Code contributed by Greg Collecutt, Joseph Hope and Paul Cochrane @@ -21,7 +21,7 @@ */ /* - $Id: xmds_breakpoint.cc 1755 2008-02-06 07:03:20Z grahamdennis $ + $Id: xmds_breakpoint.cc 1885 2008-03-18 15:24:56Z paultcochrane $ */ /*! @file xmds_breakpoint.cc diff -Nru xmds-1.6.5/source/xmds_complex.h xmds-1.6.6/source/xmds_complex.h --- xmds-1.6.5/source/xmds_complex.h 2008-02-25 21:32:17.000000000 -0600 +++ xmds-1.6.6/source/xmds_complex.h 2008-07-03 20:38:23.000000000 -0500 @@ -21,7 +21,7 @@ */ /* - $Id: xmds_complex.h 1604 2007-11-18 18:47:23Z paultcochrane $ + $Id: xmds_complex.h 2040 2008-07-02 08:46:15Z grahamdennis $ */ /*! @file xmds_complex.h @@ -102,7 +102,7 @@ return z; } - //! Overloaded complex subtraction operator + //! Overloaded complex unary negation operator inline fftw_complex operator - (fftw_complex z) { z.im = -z.im; z.re = -z.re; @@ -170,6 +170,13 @@ z.im *= j; return z; } + + //! Overloaded complex multiplication operator + inline fftw_complex operator * (fftw_complex z, const long& j) { + z.re *= j; + z.im *= j; + return z; + } //! Overloaded complex multiplication operator inline fftw_complex operator * (const int& j, fftw_complex z) { @@ -178,6 +185,13 @@ return z; } + //! Overloaded complex multiplication operator + inline fftw_complex operator * (const long& j, fftw_complex z) { + z.re *= j; + z.im *= j; + return z; + } + //! Overloaded complex division operator inline fftw_complex operator / (fftw_complex z1, const fftw_complex& z2) { const double c = z2.re*z2.re + z2.im*z2.im; @@ -217,6 +231,21 @@ return z; } + //! Overloaded complex division operator + inline fftw_complex operator / (fftw_complex z, const long& j) { + z.re /= j; + z.im /= j; + return z; + } + + //! Overloaded complex division operator + inline fftw_complex operator / (const long& j, fftw_complex z) { + double c = z.re*z.re + z.im*z.im; + z.re *= j/c; + z.im *= -j/c; + return z; + } + //! Overloaded complex less than operator inline bool operator < (const double& d, const fftw_complex& z) { return d < z.re*z.re+z.im*z.im; @@ -273,20 +302,7 @@ //! Returns arg of a complex number inline double arg(const fftw_complex& z) { - - double _phi=0; - - if (fabs(z.re)<1e-100) { - if (z.im>0) - _phi=M_PI/2; - else if (z.im<0) - _phi=-M_PI/2; - } - else { - _phi=atan2(z.im, z.re); - } - - return _phi; + return atan2(z.im, z.re); } //! Returns the complex conjugate @@ -381,11 +397,9 @@ return *this; } - //! Subtraction operator - inline complex& operator - () { - re = -re; - im = -im; - return *this; + //! Unary negation operator + inline complex operator - () { + return complex(-re, -im); } //! Assignment operator @@ -471,6 +485,13 @@ return *this; } + //! /= operator + inline complex& operator /= (const long& j) { + re /= j; + im /= j; + return *this; + } + //! Less than comparison operator inline bool operator < (const fftw_complex& z) const { return re*re+im*im < z.re*z.re+z.im*z.im; diff -Nru xmds-1.6.5/source/xmds_element.cc xmds-1.6.6/source/xmds_element.cc --- xmds-1.6.5/source/xmds_element.cc 2008-02-25 21:32:17.000000000 -0600 +++ xmds-1.6.6/source/xmds_element.cc 2008-07-03 20:38:23.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 + Copyright (C) 2000-2008 Code contributed by Greg Collecutt, Joseph Hope and Paul Cochrane @@ -21,7 +21,7 @@ */ /* - $Id: xmds_element.cc 1613 2007-11-18 23:16:29Z paultcochrane $ + $Id: xmds_element.cc 1885 2008-03-18 15:24:56Z paultcochrane $ */ /*! @file xmds_element.cc diff -Nru xmds-1.6.5/source/xmds_field.cc xmds-1.6.6/source/xmds_field.cc --- xmds-1.6.5/source/xmds_field.cc 2008-02-25 21:32:17.000000000 -0600 +++ xmds-1.6.6/source/xmds_field.cc 2008-07-03 20:38:23.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 + Copyright (C) 2000-2008 Code contributed by Greg Collecutt, Joseph Hope and Paul Cochrane @@ -21,7 +21,7 @@ */ /* - $Id: xmds_field.cc 1658 2008-01-19 16:11:28Z paultcochrane $ + $Id: xmds_field.cc 1885 2008-03-18 15:24:56Z paultcochrane $ */ /*! @file xmds_field.cc diff -Nru xmds-1.6.5/source/xmds_filter.cc xmds-1.6.6/source/xmds_filter.cc --- xmds-1.6.5/source/xmds_filter.cc 2008-02-25 21:32:17.000000000 -0600 +++ xmds-1.6.6/source/xmds_filter.cc 2008-07-03 20:38:23.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 + Copyright (C) 2000-2008 Code contributed by Greg Collecutt, Joseph Hope and Paul Cochrane @@ -21,7 +21,7 @@ */ /* - $Id: xmds_filter.cc 1634 2007-12-30 17:34:30Z paultcochrane $ + $Id: xmds_filter.cc 1885 2008-03-18 15:24:56Z paultcochrane $ */ /*! @file xmds_filter.cc diff -Nru xmds-1.6.5/source/xmds_globals.cc xmds-1.6.6/source/xmds_globals.cc --- xmds-1.6.5/source/xmds_globals.cc 2008-02-25 21:32:17.000000000 -0600 +++ xmds-1.6.6/source/xmds_globals.cc 2008-07-03 20:38:23.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 + Copyright (C) 2000-2008 Code contributed by Greg Collecutt, Joseph Hope and Paul Cochrane @@ -21,7 +21,7 @@ */ /* - $Id: xmds_globals.cc 1635 2007-12-30 17:34:42Z paultcochrane $ + $Id: xmds_globals.cc 1885 2008-03-18 15:24:56Z paultcochrane $ */ /*! @file xmds_globals.cc diff -Nru xmds-1.6.5/source/xmds_integrate_ark45.cc xmds-1.6.6/source/xmds_integrate_ark45.cc --- xmds-1.6.5/source/xmds_integrate_ark45.cc 2008-02-25 21:32:17.000000000 -0600 +++ xmds-1.6.6/source/xmds_integrate_ark45.cc 2008-07-03 20:38:23.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 + Copyright (C) 2000-2008 Code contributed by Greg Collecutt, Joseph Hope and Paul Cochrane @@ -21,7 +21,7 @@ */ /* - $Id: xmds_integrate_ark45.cc 1735 2008-01-31 06:00:35Z michaelhush $ + $Id: xmds_integrate_ark45.cc 1964 2008-04-09 00:42:11Z paultcochrane $ */ /*! @file xmds_integrate_ark45.cc @@ -35,6 +35,7 @@ #include #include #include +#include // ************************************************************************** // ************************************************************************** @@ -289,7 +290,7 @@ fprintf(outfile, "for(unsigned long _i0=0; _i0<_%s_size; _i0++){\n", fieldName); } fprintf(outfile, " for(unsigned long _i1=0; _i1<_%s_main_ncomponents; _i1++){\n", fieldName); - if (strcmp(typeName, "complex") == 0) { + if (std::strcmp(typeName, "complex") == 0) { fprintf(outfile, " _temp_mod=mod2(_%s_main[_%s_main_index_pointer + _i1]);\n", fieldName, fieldName); } else { @@ -347,7 +348,7 @@ } fprintf(outfile, " for(unsigned long _i1=0; _i1<_%s_main_ncomponents; _i1++)\n", fieldName); - if (strcmp(typeName, "complex") == 0) { + if (std::strcmp(typeName, "complex") == 0) { fprintf(outfile, " if(mod2(_%s_main[_%s_main_index_pointer + _i1])>_peak[_i1]){\n", fieldName, fieldName); fprintf(outfile, " _temp_error=mod(_%s_main[_%s_main_index_pointer + _i1]-_checkfield[_%s_main_index_pointer + _i1])/(mod(_%s_main[_%s_main_index_pointer + _i1])+1e-20);\n", fieldName, fieldName, fieldName, fieldName, fieldName); } @@ -364,7 +365,7 @@ else{ // if ndims==0 fprintf(outfile, " for(unsigned long _i1=0; _i1<_%s_main_ncomponents; _i1++){\n", fieldName); - if (strcmp(typeName, "complex") == 0) { + if (std::strcmp(typeName, "complex") == 0) { fprintf(outfile, " _temp_error=mod(_%s_main[_i1]-_checkfield[_i1])/(mod(_%s_main[_i1])+1e-20);\n", fieldName, fieldName); } else{ diff -Nru xmds-1.6.5/source/xmds_integrate_ark45ex.cc xmds-1.6.6/source/xmds_integrate_ark45ex.cc --- xmds-1.6.5/source/xmds_integrate_ark45ex.cc 2008-02-25 21:32:18.000000000 -0600 +++ xmds-1.6.6/source/xmds_integrate_ark45ex.cc 2008-07-03 20:38:23.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 + Copyright (C) 2000-2008 Code contributed by Greg Collecutt, Joseph Hope and Paul Cochrane @@ -21,7 +21,7 @@ */ /* - $Id: xmds_integrate_ark45ex.cc 1599 2007-11-17 13:42:49Z paultcochrane $ + $Id: xmds_integrate_ark45ex.cc 1885 2008-03-18 15:24:56Z paultcochrane $ */ /*! @file xmds_integrate_ark45ex.cc diff -Nru xmds-1.6.5/source/xmds_integrate_ark45ip.cc xmds-1.6.6/source/xmds_integrate_ark45ip.cc --- xmds-1.6.5/source/xmds_integrate_ark45ip.cc 2008-02-25 21:32:18.000000000 -0600 +++ xmds-1.6.6/source/xmds_integrate_ark45ip.cc 2008-07-03 20:38:23.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 + Copyright (C) 2000-2008 Code contributed by Greg Collecutt, Joseph Hope and Paul Cochrane @@ -21,7 +21,7 @@ */ /* - $Id: xmds_integrate_ark45ip.cc 1599 2007-11-17 13:42:49Z paultcochrane $ + $Id: xmds_integrate_ark45ip.cc 1885 2008-03-18 15:24:56Z paultcochrane $ */ /*! @file xmds_integrate_ark45ip.cc diff -Nru xmds-1.6.5/source/xmds_integrate_ark89.cc xmds-1.6.6/source/xmds_integrate_ark89.cc --- xmds-1.6.5/source/xmds_integrate_ark89.cc 2008-02-25 21:32:17.000000000 -0600 +++ xmds-1.6.6/source/xmds_integrate_ark89.cc 2008-07-03 20:38:23.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 + Copyright (C) 2000-2008 Code contributed by Greg Collecutt, Joseph Hope and Paul Cochrane @@ -21,7 +21,7 @@ */ /* - $Id: xmds_integrate_ark89.cc 1735 2008-01-31 06:00:35Z michaelhush $ + $Id: xmds_integrate_ark89.cc 1964 2008-04-09 00:42:11Z paultcochrane $ */ /*! @file xmds_integrate_ark89.cc @@ -35,6 +35,7 @@ #include #include #include +#include // ************************************************************************** // ************************************************************************** @@ -284,7 +285,7 @@ fprintf(outfile, "for (unsigned long _i0=0; _i0<_%s_size; _i0++){\n", fieldName); } fprintf(outfile, " for (unsigned long _i1=0; _i1<_%s_main_ncomponents; _i1++){\n", fieldName); - if (strcmp(typeName, "complex") == 0) { + if (std::strcmp(typeName, "complex") == 0) { fprintf(outfile, " _temp_mod=mod2(_%s_main[_%s_main_index_pointer + _i1]);\n", fieldName, fieldName); } else { @@ -334,7 +335,7 @@ } fprintf(outfile, " for (unsigned long _i1=0; _i1<_%s_main_ncomponents; _i1++)\n", fieldName); - if (strcmp(typeName, "complex") == 0) { + if (std::strcmp(typeName, "complex") == 0) { fprintf(outfile, " if (mod2(_%s_main[_%s_main_index_pointer + _i1])>_peak[_i1]){\n", fieldName, fieldName); fprintf(outfile, " _temp_error=mod(_%s_main[_%s_main_index_pointer + _i1]-_checkfield[_%s_main_index_pointer + _i1])/(mod(_%s_main[_%s_main_index_pointer + _i1])+1e-20);\n", fieldName, fieldName, fieldName, fieldName, fieldName); } @@ -352,7 +353,7 @@ fprintf(outfile, " for (unsigned long _i1=0; _i1<_%s_main_ncomponents; _i1++){\n", fieldName); - if (strcmp(typeName, "complex") == 0){ + if (std::strcmp(typeName, "complex") == 0){ fprintf(outfile, " _temp_error=mod(_%s_main[_i1]-_checkfield[_i1])/(mod(_%s_main[_i1])+1e-20);\n", fieldName, fieldName); } else{ diff -Nru xmds-1.6.5/source/xmds_integrate_ark89ex.cc xmds-1.6.6/source/xmds_integrate_ark89ex.cc --- xmds-1.6.5/source/xmds_integrate_ark89ex.cc 2008-02-25 21:32:18.000000000 -0600 +++ xmds-1.6.6/source/xmds_integrate_ark89ex.cc 2008-07-03 20:38:23.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 + Copyright (C) 2000-2008 Code contributed by Greg Collecutt, Joseph Hope and Paul Cochrane @@ -21,7 +21,7 @@ */ /* - $Id: xmds_integrate_ark89ex.cc 1599 2007-11-17 13:42:49Z paultcochrane $ + $Id: xmds_integrate_ark89ex.cc 1885 2008-03-18 15:24:56Z paultcochrane $ */ /*! @file xmds_integrate_ark89ex.cc diff -Nru xmds-1.6.5/source/xmds_integrate_ark89ip.cc xmds-1.6.6/source/xmds_integrate_ark89ip.cc --- xmds-1.6.5/source/xmds_integrate_ark89ip.cc 2008-02-25 21:32:18.000000000 -0600 +++ xmds-1.6.6/source/xmds_integrate_ark89ip.cc 2008-07-03 20:38:23.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 + Copyright (C) 2000-2008 Code contributed by Greg Collecutt, Joseph Hope and Paul Cochrane @@ -21,7 +21,7 @@ */ /* - $Id: xmds_integrate_ark89ip.cc 1599 2007-11-17 13:42:49Z paultcochrane $ + $Id: xmds_integrate_ark89ip.cc 1885 2008-03-18 15:24:56Z paultcochrane $ */ /*! @file xmds_integrate_ark89ip.cc diff -Nru xmds-1.6.5/source/xmds_integrate.cc xmds-1.6.6/source/xmds_integrate.cc --- xmds-1.6.5/source/xmds_integrate.cc 2008-02-25 21:32:18.000000000 -0600 +++ xmds-1.6.6/source/xmds_integrate.cc 2008-07-03 20:38:23.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 + Copyright (C) 2000-2008 Code contributed by Greg Collecutt, Joseph Hope and Paul Cochrane @@ -21,7 +21,7 @@ */ /* - $Id: xmds_integrate.cc 1706 2008-01-29 04:42:30Z gmcmanus $ + $Id: xmds_integrate.cc 1885 2008-03-18 15:24:56Z paultcochrane $ */ /*! @file xmds_integrate.cc diff -Nru xmds-1.6.5/source/xmds_integrate_ex.cc xmds-1.6.6/source/xmds_integrate_ex.cc --- xmds-1.6.5/source/xmds_integrate_ex.cc 2008-02-25 21:32:17.000000000 -0600 +++ xmds-1.6.6/source/xmds_integrate_ex.cc 2008-07-03 20:38:23.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 + Copyright (C) 2000-2008 Code contributed by Greg Collecutt, Joseph Hope and Paul Cochrane @@ -21,7 +21,7 @@ */ /* - $Id: xmds_integrate_ex.cc 1659 2008-01-19 16:16:21Z paultcochrane $ + $Id: xmds_integrate_ex.cc 1924 2008-03-28 02:23:27Z grahamdennis $ */ /*! @file xmds_integrate_ex.cc @@ -247,11 +247,8 @@ simulation()->field()->vectors2space(outfile, fullSpace, *KVectorNamesList(), ""); fprintf(outfile, "unsigned long _k_operator_index_pointer=0;\n"); - list tempVectorNamesList = *KVectorNamesList(); - tempVectorNamesList.push_back("_k_operator_index_pointer"); - threadPrivateVariables.push_back("_k_operator_index_pointer"); - simulation()->field()->openLoops(outfile, fullSpace, *KVectorNamesList(), PARALLELISE_LOOP, threadPrivateVariables); + simulation()->field()->openLoops(outfile, fullSpace, *KVectorNamesList(), DO_NOT_PARALLELISE_LOOP); char indent[64]; for (i=0; i\", encodingStr.c_str());\n", precision.c_str()); + // The program needs to mangle the filename in case the user used the -o switch... // get the xsil filename, rip off the extension if it equals '.xsil' // otherwise, leave it alone - XMLString xsilFilename = simulation()->output()->getOutputFileName(); - XMLString xsilExtension; - xsilExtension += ".xsil"; - XMLString testExtension; - xsilFilename.subString(testExtension, xsilFilename.length()-5, xsilFilename.length()); - if (testExtension == xsilExtension) { - xsilFilename.deleteData(xsilFilename.length()-5, 5); - } - fprintf(outfile, "fprintf(_outfile, \"\\n%s_mg%li%s\\n\");\n", xsilFilename.c_str(), myGroupNumber+1, ".dat"); + fprintf(outfile, "std::string BinDatFnameStr = _output_filename;\n"); + fprintf(outfile, "if (BinDatFnameStr.length() > 4) {\n"); + fprintf(outfile, " std::string myTempStr = BinDatFnameStr.substr(BinDatFnameStr.length() - 5, 5);\n"); + fprintf(outfile, " if (myTempStr == \".xsil\") { // note: it's case sensitive! \n"); + fprintf(outfile, " BinDatFnameStr = BinDatFnameStr.substr(0,BinDatFnameStr.length() - 5);\n"); + fprintf(outfile, " }\n"); + fprintf(outfile, "}\n"); + + fprintf(outfile, "char BinDatFnameCstr[BinDatFnameStr.length() + 12];\n"); + fprintf(outfile, "sprintf(BinDatFnameCstr, \"%%s_mg%li.dat\",BinDatFnameStr.c_str());\n", myGroupNumber+1); + + + fprintf(outfile, "fprintf(_outfile, \"\\n%%s\\n\",BinDatFnameCstr);\n"); fprintf(outfile, "FILE *fpBinary;\n"); - fprintf(outfile, "if ((fpBinary = fopen(\"%s_mg%li%s\", \"wb\")) == NULL) {\n", xsilFilename.c_str(), myGroupNumber+1, ".dat"); - fprintf(outfile, " printf(\"Unable to open output file %s_mg%li%s\\n\");\n", xsilFilename.c_str(), myGroupNumber+1, ".dat"); + fprintf(outfile, "if ((fpBinary = fopen(BinDatFnameCstr, \"wb\")) == NULL) {\n"); + fprintf(outfile, " printf(\"Unable to open output file %%s\\n\",BinDatFnameCstr);\n"); fprintf(outfile, " printf(\"Chucking a spack....\\n\");\n"); fprintf(outfile, " exit(255);\n}\n"); + //fprintf(outfile, "delete BinDatFnameCstr;\n"); fprintf(outfile, "vector<%s> ", precisionString.c_str()); for (i=0; igetOutputFileName().c_str()); xmdsElement::writeGlobals(outfile); fprintf(outfile, "\n"); diff -Nru xmds-1.6.5/source/xmds_simulation.h xmds-1.6.6/source/xmds_simulation.h --- xmds-1.6.5/source/xmds_simulation.h 2008-02-25 21:32:18.000000000 -0600 +++ xmds-1.6.6/source/xmds_simulation.h 2008-07-03 20:38:23.000000000 -0500 @@ -21,7 +21,7 @@ */ /* - $Id: xmds_simulation.h 1577 2007-11-11 20:19:36Z paultcochrane $ + $Id: xmds_simulation.h 1964 2008-04-09 00:42:11Z paultcochrane $ */ /*! @file xmds_simulation.h @@ -40,6 +40,8 @@ #include #include +#include + // ***************************************************************************** // ***************************************************************************** // xmdsSimulation diff -Nru xmds-1.6.5/source/xmds_utils.cc xmds-1.6.6/source/xmds_utils.cc --- xmds-1.6.5/source/xmds_utils.cc 2008-02-25 21:32:17.000000000 -0600 +++ xmds-1.6.6/source/xmds_utils.cc 2008-07-03 20:38:23.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 + Copyright (C) 2000-2008 Code contributed by Greg Collecutt, Joseph Hope and Paul Cochrane @@ -21,7 +21,7 @@ */ /* - $Id: xmds_utils.cc 1658 2008-01-19 16:11:28Z paultcochrane $ + $Id: xmds_utils.cc 1885 2008-03-18 15:24:56Z paultcochrane $ */ /*! @file xmds_utils.cc diff -Nru xmds-1.6.5/source/xmds_vector.cc xmds-1.6.6/source/xmds_vector.cc --- xmds-1.6.5/source/xmds_vector.cc 2008-02-25 21:32:17.000000000 -0600 +++ xmds-1.6.6/source/xmds_vector.cc 2008-07-03 20:38:23.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 + Copyright (C) 2000-2008 Code contributed by Greg Collecutt, Joseph Hope and Paul Cochrane @@ -21,7 +21,7 @@ */ /* - $Id: xmds_vector.cc 1659 2008-01-19 16:16:21Z paultcochrane $ + $Id: xmds_vector.cc 1885 2008-03-18 15:24:56Z paultcochrane $ */ /*! @file xmds_vector.cc diff -Nru xmds-1.6.5/source/xmds_vector_element.cc xmds-1.6.6/source/xmds_vector_element.cc --- xmds-1.6.5/source/xmds_vector_element.cc 2008-02-25 21:32:18.000000000 -0600 +++ xmds-1.6.6/source/xmds_vector_element.cc 2008-07-03 20:38:23.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 + Copyright (C) 2000-2008 Code contributed by Greg Collecutt, Joseph Hope and Paul Cochrane @@ -21,7 +21,7 @@ */ /* - $Id: xmds_vector_element.cc 1658 2008-01-19 16:11:28Z paultcochrane $ + $Id: xmds_vector_element.cc 1885 2008-03-18 15:24:56Z paultcochrane $ */ /*! @file xmds_vector_element.cc diff -Nru xmds-1.6.5/source/xml_basics.cc xmds-1.6.6/source/xml_basics.cc --- xmds-1.6.5/source/xml_basics.cc 2008-02-25 21:32:17.000000000 -0600 +++ xmds-1.6.6/source/xml_basics.cc 2008-07-03 20:38:23.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 + Copyright (C) 2000-2008 Code contributed by Greg Collecutt, Joseph Hope, Andrew Reid and Paul Cochrane @@ -21,7 +21,7 @@ */ /* - $Id: xml_basics.cc 1658 2008-01-19 16:11:28Z paultcochrane $ + $Id: xml_basics.cc 1885 2008-03-18 15:24:56Z paultcochrane $ */ /*! @file xml_basics.h diff -Nru xmds-1.6.5/source/xml_parser.cc xmds-1.6.6/source/xml_parser.cc --- xmds-1.6.5/source/xml_parser.cc 2008-02-25 21:32:17.000000000 -0600 +++ xmds-1.6.6/source/xml_parser.cc 2008-07-03 20:38:23.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 + Copyright (C) 2000-2008 Code contributed by Greg Collecutt, Joseph Hope and Paul Cochrane @@ -21,7 +21,7 @@ */ /* - $Id: xml_parser.cc 1597 2007-11-17 13:41:38Z paultcochrane $ + $Id: xml_parser.cc 1885 2008-03-18 15:24:56Z paultcochrane $ */ /*! @file xml_parser.cc diff -Nru xmds-1.6.5/source/xsil2graphics.cc xmds-1.6.6/source/xsil2graphics.cc --- xmds-1.6.5/source/xsil2graphics.cc 2008-02-25 21:32:18.000000000 -0600 +++ xmds-1.6.6/source/xsil2graphics.cc 2008-07-03 20:38:23.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 + Copyright (C) 2000-2008 Code contributed by Greg Collecutt, Joseph Hope, Andrew Reid and Paul Cochrane @@ -21,7 +21,7 @@ */ /* - $Id: xsil2graphics.cc 1759 2008-02-06 21:37:44Z paultcochrane $ + $Id: xsil2graphics.cc 1993 2008-04-16 23:59:10Z andyferris $ */ /*! @file xsil2graphics.cc @@ -40,6 +40,7 @@ #include #include #include +#include // ********************************************************************** @@ -50,9 +51,9 @@ cout << VERSION; cout << "\n" "\n" - "Usage: xsil2graphics [options] infile\n" + "Usage: xsil2graphics [options] infile(s)\n" "Options:\n" - " infile: required, the input xsil file\n" + " infile(s): required, the input xsil file or files\n" " -h/--help: optional, display this information\n" " -m/--matlab: optional, produce matlab/octave output (default)\n" " -s/--scilab: optional, produce scilab output\n" @@ -61,7 +62,7 @@ " -g/--gnuplot: optional, produce gnuplot output\n" " -r/--R: optional, produce R output\n" " -p/--plot: optional, generate plotting output (matlab/octave)\n" - " -o/--outfile: optional, alternate output file name\n" + " -o/--outfile: optional, alternate output file name (one input file only)\n" " -v/--verbose: optional, verbose output\n" "\n" "For further help, please see http://www.xmds.org\n"; @@ -83,6 +84,7 @@ bool verbose = 0; XMLString inFileName; + XMLString * inFileNames; XMLString outFileName = ""; XMLString outFileNameBase; outputFormatEnum outFormat = FORMAT_NONE; @@ -154,190 +156,199 @@ } } + int fnameCount; // process non-option command line elements if (optind_xmds < argc) { - int fnameCount = 0; + fnameCount = argc - optind_xmds; + inFileNames = new XMLString[fnameCount]; + int i = 0; while (optind_xmds < argc) { - fnameCount++; - if (fnameCount > 1) { - // error, input file name already exists - cerr << "Error: multiple input files not allowed\n\n"; - display_usage(); - return 0; - } - inFileName = argv[optind_xmds++]; + inFileNames[i] = argv[optind_xmds]; + optind_xmds++; + i++; } } - - if (inFileName.length() == 0) { + else { // error, no input file was specified cerr << "Error: no input file specified.\nExiting.\n"; display_usage(); return 1; } + if (fnameCount > 1 && outFileName.length() != 0) { + // error, input file name already exists + cerr << "Error: multiple input files not allowed when specifying output filename\n\n"; + display_usage(); + return 0; + } + // set matlab to be the default output if (outFormat == FORMAT_NONE) { cout << "Output file format defaulting to matlab.\n"; outFormat = FORMAT_MATLAB; } - // create the XMLParser - XMLParser myXMLParser; + // If multiple files are specified then we repeat for each one + for (int j=0; j 0) { - inFileName.subString(outFileName, 0, lastdot); + try { + theDocument = myXMLParser.parseFromFile(inFileName.c_str()); } - else { - outFileName = inFileName; + catch(XMLParserException XMLRoutinesErr) { + cerr << "Could not load Document\n" + << "due to the following XMLParserException:\n" + << XMLRoutinesErr.getError() + << "Exiting.\n"; + return 1; } - // keep the base file name for use in xsilfield - outFileNameBase = outFileName; + if (outFileName.length() == 0) { + // Create default output file name + unsigned long lastdot = 0; + for (unsigned long i=0; i 0) { + inFileName.subString(outFileName, 0, lastdot); + } + else { + outFileName = inFileName; + } + + // keep the base file name for use in xsilfield + outFileNameBase = outFileName; + + if (outFormat == FORMAT_MATLAB) { + cout << "Generating output for matlab\n"; + outFileName += ".m"; + } + else if (outFormat == FORMAT_SCILAB) { + cout << "Generating output for scilab\n"; + outFileName += ".sci"; + } + else if (outFormat == FORMAT_MATHEMATICA5) { + cout << "Generating output for Mathematica 5.x\n"; + outFileName += ".nb"; + } + else if (outFormat == FORMAT_MATHEMATICA) { + cout << "Generating output for Mathematica\n"; + outFileName += ".nb"; + } + else if (outFormat == FORMAT_GNUPLOT) { + cout << "Generating output for Gnuplot\n"; + outFileName += ".gnu"; + } + else if (outFormat == FORMAT_R) { + cout << "Generating output for R\n"; + outFileName += ".R"; + } + else { + cerr << "Error: unspecified output format\n"; + cerr << "I got " << outFileName.c_str() << " as the format\n"; + } + + cout << "Output file name defaulting to '" << outFileName.c_str() << "'\n"; } else { - cerr << "Error: unspecified output format\n"; - cerr << "I got " << outFileName.c_str() << " as the format\n"; + // display what the output filename is + cout << "Output file name set to '" << outFileName.c_str() << "'\n"; } - cout << "Output file name defaulting to '" << outFileName.c_str() << "'\n"; - } - else { - // display what the output filename is - cout << "Output file name set to '" << outFileName.c_str() << "'\n"; - } + // ************************************ + // find and process xsil children + // ************************************ - // ************************************ - // find and process xsil children - // ************************************ + const NodeList* candidateElements; + list xsilNodeList; - const NodeList* candidateElements; - list xsilNodeList; + if (*theDocument->documentElement()->nodeName() == "simulation") { - if (*theDocument->documentElement()->nodeName() == "simulation") { + candidateElements = theDocument->documentElement()->getElementsByTagName("XSIL", 0); - candidateElements = theDocument->documentElement()->getElementsByTagName("XSIL", 0); + if (candidateElements->length() < 1) { + cerr << "Error: no elements from within element.\n" + "Exiting.\n"; + return 1; + } - if (candidateElements->length() < 1) { - cerr << "Error: no elements from within element.\n" + for (unsigned long i=0; ilength(); i++) { + xsilNodeList.push_back(candidateElements->item(i)); + } + } + else if (*theDocument->documentElement()->nodeName() == "XSIL") { + xsilNodeList.push_back(theDocument->documentElement()); + } + else { + cerr << "Error: expecting root element to be or .\n" "Exiting.\n"; return 1; } - for (unsigned long i=0; ilength(); i++) { - xsilNodeList.push_back(candidateElements->item(i)); - } - } - else if (*theDocument->documentElement()->nodeName() == "XSIL") { - xsilNodeList.push_back(theDocument->documentElement()); - } - else { - cerr << "Error: expecting root element to be or .\n" - "Exiting.\n"; - return 1; - } + list::const_iterator ppNode = xsilNodeList.begin(); - list::const_iterator ppNode = xsilNodeList.begin(); + FILE* outfile = fopen(outFileName.c_str(), "w"); - FILE* outfile = fopen(outFileName.c_str(), "w"); + if (outfile == 0) { + cerr << "Error: Could not open file '" << outFileName.c_str() + << "' for writing.\nExiting.\n"; + return 1; + } - if (outfile == 0) { - cerr << "Error: Could not open file '" << outFileName.c_str() - << "' for writing.\nExiting.\n"; - return 1; - } + for (unsigned long i=0; i (*ppNode); - const Element* nextElement = dynamic_cast (*ppNode); + const DOMString *mgName = nextElement->getAttribute("Name"); + int mgNumber = i+1; + if (std::strcmp("breakpoint", mgName->c_str()) == 0) { + mgNumber = 1; + } + else { + sscanf(mgName->c_str(), "moment_group_%i", &mgNumber); + } - const DOMString *mgName = nextElement->getAttribute("Name"); - int mgNumber = i+1; - if (strcmp("breakpoint", mgName->c_str()) == 0) { - mgNumber = 1; - } - else { - sscanf(mgName->c_str(), "moment_group_%i", &mgNumber); - } + cout << "Processing xsil data container " << mgNumber << " ...\n"; - cout << "Processing xsil data container " << mgNumber << " ...\n"; + xsilField myxsilField; - xsilField myxsilField; + try { + myxsilField.processElement(nextElement); + } + catch(xmdsException xmdsErr) { + cerr << "Could not load data container\n" + << "due to the following xsilException:\n" + << xmdsErr.getError() + << "Exiting.\n"; + fclose(outfile); + return 1; + } - try { - myxsilField.processElement(nextElement); - } - catch(xmdsException xmdsErr) { - cerr << "Could not load data container\n" - << "due to the following xsilException:\n" - << xmdsErr.getError() - << "Exiting.\n"; - fclose(outfile); - return 1; - } + cout << "Writing data container " << i+1 << " to file ...\n"; - cout << "Writing data container " << i+1 << " to file ...\n"; + myxsilField.writeAsFormat(outfile, outFormat, mgNumber, outFileNameBase.c_str(), plotFlag); - myxsilField.writeAsFormat(outfile, outFormat, mgNumber, outFileNameBase.c_str(), plotFlag); + ppNode++; + } - ppNode++; + fclose(outfile); + outFileName = ""; // Clear this to generate the default output filename for the next input file } - fclose(outfile); - return 0; } diff -Nru xmds-1.6.5/source/xsil_field.cc xmds-1.6.6/source/xsil_field.cc --- xmds-1.6.5/source/xsil_field.cc 2008-02-25 21:32:18.000000000 -0600 +++ xmds-1.6.6/source/xsil_field.cc 2008-07-03 20:38:23.000000000 -0500 @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 + Copyright (C) 2000-2008 Code contributed by Greg Collecutt, Joseph Hope and Paul Cochrane Modifications to output in Mathematica format by Andrew Reid @@ -22,7 +22,7 @@ */ /* - $Id: xsil_field.cc 1759 2008-02-06 21:37:44Z paultcochrane $ + $Id: xsil_field.cc 1955 2008-04-07 09:54:11Z paultcochrane $ */ /*! @file xsil_field.cc @@ -1159,6 +1159,8 @@ fprintf(outfile, "%% can't yet plot more than two independent variables\n"); } + // give the thing a title + fprintf(outfile, "title('%s')\n", datFileNameBase); } }