--- avida-2.0b7.orig/aclocal.m4 +++ avida-2.0b7/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.7.4 -*- Autoconf -*- +# generated automatically by aclocal 1.7.9 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. @@ -163,7 +163,7 @@ # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.7.4])]) + [AM_AUTOMAKE_VERSION([1.7.9])]) # Helper functions for option handling. -*- Autoconf -*- @@ -545,18 +545,32 @@ # 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 + : > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf case $depmode in nosideeffect) @@ -574,11 +588,12 @@ # 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 -o conftest.o conftest.c \ + 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 conftest.h 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 # icc doesn't choke on unknown options, it will just issue warnings # (even with -Werror). So we grep stderr for any message @@ -713,7 +728,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003 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 @@ -738,8 +753,9 @@ 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]) @@ -767,9 +783,9 @@ _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 ]) --- avida-2.0b7.orig/configure +++ avida-2.0b7/configure @@ -1,9 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.57. +# Generated by GNU Autoconf 2.59. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -20,9 +19,10 @@ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset else as_unset=false @@ -41,7 +41,7 @@ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + 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 @@ -218,16 +218,17 @@ if mkdir -p . 2>/dev/null; then as_mkdir_p=: else + test -d ./-p && rmdir ./-p as_mkdir_p=false fi as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" # IFS @@ -668,7 +669,7 @@ # Be sure to have absolute paths. for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir + localstatedir libdir includedir oldincludedir infodir mandir do eval ac_val=$`echo $ac_var` case $ac_val in @@ -708,10 +709,10 @@ # Try the directory containing this script, then its parent. ac_confdir=`(dirname "$0") 2>/dev/null || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$0" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -811,9 +812,9 @@ cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -916,12 +917,45 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + +# 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 cd $ac_dir # Check for guested configure; otherwise get Cygnus style configure. @@ -932,13 +966,13 @@ echo $SHELL $ac_srcdir/configure --help=recursive elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then + test -f $ac_srcdir/configure.in; then echo $ac_configure --help else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi - cd $ac_popdir + cd "$ac_popdir" done fi @@ -946,8 +980,7 @@ if $ac_init_version; then cat <<\_ACEOF -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -Free Software Foundation, Inc. +Copyright (C) 2003 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -959,7 +992,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.57. Invocation command line was +generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1036,19 +1069,19 @@ 2) ac_configure_args1="$ac_configure_args1 '$ac_arg'" if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. + ac_must_keep_next=false # Got value, back to normal. else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac fi ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" # Get rid of the leading space. @@ -1082,12 +1115,12 @@ case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in *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" + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } @@ -1116,7 +1149,7 @@ for ac_var in $ac_subst_files do eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + echo "$ac_var='"'"'$ac_val'"'"'" done | sort echo fi @@ -1135,7 +1168,7 @@ echo "$as_me: caught signal $ac_signal" echo "$as_me: exit $exit_status" } >&5 - rm -f core core.* *.core && + rm -f core *.core && rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 @@ -1215,7 +1248,7 @@ # 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 + sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; 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" @@ -1232,13 +1265,13 @@ ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + ac_cache_corrupted=: fi;; esac # Pass precious variables to config.status. @@ -1325,6 +1358,7 @@ # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # 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 @@ -1341,6 +1375,7 @@ case $as_dir/ in ./ | .// | /cC/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -1348,20 +1383,20 @@ # 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 $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. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi + if $as_executable_p "$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. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi done done ;; @@ -1505,7 +1540,7 @@ 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_,'` +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 $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2029,7 +2064,6 @@ (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2049,8 +2083,8 @@ # 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" >&5 -echo $ECHO_N "checking for C compiler default output... $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 @@ -2070,23 +2104,23 @@ 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. - ;; + # This is the source file. + ;; [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; + # 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 - 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 + break;; * ) - break;; + break;; esac done else @@ -2160,8 +2194,8 @@ case $ac_file in *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext - break;; + export ac_cv_exeext + break;; * ) break;; esac done @@ -2186,7 +2220,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2237,7 +2270,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2257,11 +2289,20 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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' + { 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=$? @@ -2274,7 +2315,7 @@ ac_compiler_gnu=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi @@ -2290,7 +2331,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2307,11 +2347,20 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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' + { 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=$? @@ -2324,7 +2373,7 @@ ac_cv_prog_cc_g=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 @@ -2351,7 +2400,6 @@ ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2379,6 +2427,16 @@ va_end (v); return s; } + +/* 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 + 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. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; @@ -2405,11 +2463,20 @@ CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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' + { 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=$? @@ -2422,7 +2489,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext +rm -f conftest.err conftest.$ac_objext done rm -f conftest.$ac_ext conftest.$ac_objext CC=$ac_save_CC @@ -2450,19 +2517,27 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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' + { 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 \ - ''\ - '#include ' \ + '' \ '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 ();' \ @@ -2470,14 +2545,13 @@ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include $ac_declaration +#include int main () { @@ -2488,11 +2562,20 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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' + { 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=$? @@ -2505,9 +2588,8 @@ continue fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2524,11 +2606,20 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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' + { 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=$? @@ -2540,7 +2631,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done rm -f conftest* if test -n "$ac_declaration"; then @@ -2554,7 +2645,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +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' @@ -2567,8 +2658,9 @@ 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 @@ -2643,18 +2735,32 @@ # 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 + : > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf case $depmode in nosideeffect) @@ -2672,11 +2778,12 @@ # 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 -o conftest.o conftest.c \ + 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 conftest.h 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 # icc doesn't choke on unknown options, it will just issue warnings # (even with -Werror). So we grep stderr for any message @@ -2834,7 +2941,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2854,11 +2960,20 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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' + { 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=$? @@ -2871,7 +2986,7 @@ ac_compiler_gnu=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi @@ -2887,7 +3002,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2904,11 +3018,20 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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' + { 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=$? @@ -2921,7 +3044,7 @@ ac_cv_prog_cxx_g=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +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 @@ -2941,8 +3064,7 @@ fi fi for ac_declaration in \ - ''\ - '#include ' \ + '' \ '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 ();' \ @@ -2950,14 +3072,13 @@ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include $ac_declaration +#include int main () { @@ -2968,11 +3089,20 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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' + { 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=$? @@ -2985,9 +3115,8 @@ continue fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3004,11 +3133,20 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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' + { 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=$? @@ -3020,7 +3158,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done rm -f conftest* if test -n "$ac_declaration"; then @@ -3053,18 +3191,32 @@ # 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 + : > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf case $depmode in nosideeffect) @@ -3082,11 +3234,12 @@ # 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 -o conftest.o conftest.c \ + 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 conftest.h 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 # icc doesn't choke on unknown options, it will just issue warnings # (even with -Werror). So we grep stderr for any message @@ -3151,7 +3304,6 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3162,7 +3314,7 @@ #else # include #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -3174,6 +3326,7 @@ (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 @@ -3194,7 +3347,6 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3212,6 +3364,7 @@ (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 @@ -3258,7 +3411,6 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3269,7 +3421,7 @@ #else # include #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -3281,6 +3433,7 @@ (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 @@ -3301,7 +3454,6 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3319,6 +3471,7 @@ (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 @@ -3488,7 +3641,7 @@ enableval="$enable_debug" CPPFLAGS="-g -Wall -pedantic -DDEBUG"; qmake_debug="debug" else - CPPFLAGS="-O3 -ffast-math"; qmake_debug="release" + CPPFLAGS="-O2"; qmake_debug="release" fi; # Check whether --enable-gnu-debug or --disable-gnu-debug was given. @@ -3500,7 +3653,7 @@ # Check whether --enable-opt-debug or --disable-opt-debug was given. if test "${enable_opt_debug+set}" = set; then enableval="$enable_opt_debug" - CPPFLAGS="-g -DDEBUG -O3 -ffast-math"; qmake_debug="debug" + CPPFLAGS="-g -DDEBUG -O2"; qmake_debug="debug" fi; @@ -3649,7 +3802,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3670,11 +3822,20 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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' + { 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=$? @@ -3687,12 +3848,11 @@ ac_cv_header_stdc=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f 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. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3714,7 +3874,6 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3739,7 +3898,6 @@ : else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3751,9 +3909,9 @@ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else # define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) #endif @@ -3764,7 +3922,7 @@ int i; for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) + || toupper (i) != TOUPPER (i)) exit(2); exit (0); } @@ -3789,7 +3947,7 @@ ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi @@ -3814,7 +3972,7 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.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 @@ -3823,7 +3981,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3835,11 +3992,20 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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' + { 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=$? @@ -3852,7 +4018,7 @@ eval "$as_ac_Header=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext +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 @@ -3877,7 +4043,6 @@ ac_func_search_save_LIBS=$LIBS ac_cv_search_getch=no cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3901,11 +4066,20 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&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 -s conftest$ac_exeext' + { 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=$? @@ -3917,12 +4091,12 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test "$ac_cv_search_getch" = no; then for ac_lib in ncurses; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3946,11 +4120,20 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&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 -s conftest$ac_exeext' + { 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=$? @@ -3963,7 +4146,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext done fi LIBS=$ac_func_search_save_LIBS @@ -3989,7 +4173,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 -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4000,11 +4183,20 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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' + { 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=$? @@ -4017,7 +4209,7 @@ ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +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 @@ -4025,7 +4217,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 -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4043,6 +4234,7 @@ (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 @@ -4062,33 +4254,32 @@ echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + no:yes:* ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 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 bug-autoconf@gnu.org. ## -## ------------------------------------ ## +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -4099,7 +4290,7 @@ if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - eval "$as_ac_Header=$ac_header_preproc" + 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 @@ -4292,13 +4483,13 @@ # `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" + "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" + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } | @@ -4328,13 +4519,13 @@ # 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[ ]*=/{ + ac_vpsub='/^[ ]*VPATH[ ]*=/{ s/:*\$(srcdir):*/:/; s/:*\${srcdir}:*/:/; s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; +s/^\([^=]*=[ ]*\):*/\1/; s/:*$//; -s/^[^=]*=[ ]*$//; +s/^[^=]*=[ ]*$//; }' fi @@ -4348,13 +4539,13 @@ cat >confdef2opt.sed <<\_ACEOF t clear : clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g t quote -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g t quote d : quote -s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +s,[ `~#$^&*(){}\\|;'"<>?],\\&,g s,\[,\\&,g s,\],\\&,g s,\$,$$,g @@ -4376,7 +4567,7 @@ 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$//'` + 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' @@ -4497,9 +4688,10 @@ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset else as_unset=false @@ -4518,7 +4710,7 @@ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + 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 @@ -4697,16 +4889,17 @@ if mkdir -p . 2>/dev/null; then as_mkdir_p=: else + test -d ./-p && rmdir ./-p as_mkdir_p=false fi as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" # IFS @@ -4733,7 +4926,7 @@ cat >&5 <<_CSEOF This file was extended by $as_me, which was -generated by GNU Autoconf 2.57. Invocation command line was +generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -4777,7 +4970,7 @@ -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] - instantiate the configuration file FILE + instantiate the configuration file FILE Configuration files: $config_files @@ -4791,11 +4984,10 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.57, +configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright (C) 2003 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 @@ -5098,9 +5290,9 @@ (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" + 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" + 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 @@ -5118,21 +5310,21 @@ # 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,:.*,,'` ;; + 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=`echo "$ac_file" | sed 's,:.*,,'` ;; * ) ac_file_in=$ac_file.in ;; esac # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. 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 || + 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; } @@ -5148,10 +5340,10 @@ 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 || + 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; } @@ -5189,12 +5381,45 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + +# 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 $INSTALL in @@ -5202,11 +5427,6 @@ *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac - 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. */ @@ -5216,7 +5436,7 @@ configure_input="$ac_file. " fi configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." + sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. @@ -5225,26 +5445,32 @@ 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 + # 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;; + 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 + 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;; + fi;; esac done` || { (exit 1); exit 1; } + + 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 _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub @@ -5284,16 +5510,41 @@ 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 || + 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 @@ -5319,12 +5570,45 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + +# 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 { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 @@ -5342,10 +5626,10 @@ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then dirpart=`(dirname "$mf") 2>/dev/null || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -5381,10 +5665,10 @@ test -f "$dirpart/$file" && continue fdir=`(dirname "$file") 2>/dev/null || $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -5400,10 +5684,10 @@ 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 || + 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; } --- avida-2.0b7.orig/configure.in +++ avida-2.0b7/configure.in @@ -52,7 +52,7 @@ AC_ARG_ENABLE(debug, [ --enable-debug: Compile with debugging symbols], [CPPFLAGS="-g -Wall -pedantic -DDEBUG"; qmake_debug="debug"], - [CPPFLAGS="-O3 -ffast-math"; qmake_debug="release"]) + [CPPFLAGS="-O2"; qmake_debug="release"]) AC_ARG_ENABLE(gnu-debug, [ --enable-gnu-debug: Compile with special debugging symbols for the gnu debugger gdb], @@ -60,7 +60,7 @@ AC_ARG_ENABLE(opt-debug, [ --enable-opt-debug: Compile with both debugging symbols and optimizations], - [CPPFLAGS="-g -DDEBUG -O3 -ffast-math"; qmake_debug="debug"]) + [CPPFLAGS="-g -DDEBUG -O2"; qmake_debug="debug"]) AM_CONDITIONAL(QMAKE_DEBUG, test x$qmake_debug = xdebug) --- avida-2.0b7.orig/doc/glossary/Makefile.in +++ avida-2.0b7/doc/glossary/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7.4 from Makefile.am. +# Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @@ -192,7 +192,7 @@ DIST_SOURCES = DATA = $(glossaryhtml_DATA) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am all: all-am .SUFFIXES: @@ -264,7 +264,6 @@ installdirs: $(mkinstalldirs) $(DESTDIR)$(glossaryhtmldir) - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -276,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: @@ -284,7 +283,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -294,7 +293,7 @@ clean-am: clean-generic mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic dvi: dvi-am @@ -316,7 +315,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am --- avida-2.0b7.orig/doc/Makefile.in +++ avida-2.0b7/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7.4 from Makefile.am. +# Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @@ -180,7 +180,7 @@ all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am DIST_SUBDIRS = $(SUBDIRS) all: all-recursive @@ -396,7 +396,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: @@ -405,7 +405,7 @@ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -415,7 +415,7 @@ clean-am: clean-generic mostlyclean-am distclean: distclean-recursive - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive @@ -437,7 +437,7 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive --- avida-2.0b7.orig/Makefile.in +++ avida-2.0b7/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7.4 from Makefile.am. +# Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @@ -152,9 +152,9 @@ all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive -DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ - Makefile.in NEWS aclocal.m4 configure configure.in depcomp \ - install-sh missing mkinstalldirs +DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \ + COPYING ChangeLog INSTALL Makefile.am NEWS aclocal.m4 configure \ + configure.in depcomp install-sh missing mkinstalldirs DIST_SUBDIRS = $(SUBDIRS) all: all-recursive @@ -442,7 +442,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: @@ -450,7 +450,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -461,6 +461,7 @@ distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive @@ -483,7 +484,8 @@ 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 --- avida-2.0b7.orig/source/cpu/Makefile.in +++ avida-2.0b7/source/cpu/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7.4 from Makefile.am. +# Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @@ -190,7 +190,7 @@ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(libcpu_a_SOURCES) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am SOURCES = $(libcpu_a_SOURCES) all: all-am @@ -230,9 +230,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cpu.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_util.Po@am__quote@ -distclean-depend: - -rm -rf ./$(DEPDIR) - .cc.o: @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ @@ -346,7 +343,6 @@ all-am: Makefile $(LIBRARIES) installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -358,7 +354,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: @@ -366,7 +362,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -376,9 +372,10 @@ clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am distclean: distclean-am - -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-tags + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags dvi: dvi-am @@ -399,7 +396,8 @@ installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -rf ./$(DEPDIR) + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -418,14 +416,13 @@ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-noinstLIBRARIES ctags distclean distclean-compile \ - distclean-depend distclean-generic distclean-tags 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 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-info-am + distclean-generic distclean-tags 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 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-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- avida-2.0b7.orig/source/event/Makefile.in +++ avida-2.0b7/source/event/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7.4 from Makefile.am. +# Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @@ -189,7 +189,7 @@ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(libevent_a_SOURCES) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am SOURCES = $(libevent_a_SOURCES) all: $(BUILT_SOURCES) @@ -224,9 +224,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event_list.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/population_event_factory.Po@am__quote@ -distclean-depend: - -rm -rf ./$(DEPDIR) - .cc.o: @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ @@ -341,9 +338,6 @@ all-am: Makefile $(LIBRARIES) installdirs: - - $(MAKE) $(AM_MAKEFLAGS) install-recursive - install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am @@ -356,7 +350,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: @@ -365,7 +359,7 @@ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -376,9 +370,10 @@ clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am distclean: distclean-am - -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-tags + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags dvi: dvi-am @@ -399,7 +394,8 @@ installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -rf ./$(DEPDIR) + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -418,14 +414,13 @@ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-noinstLIBRARIES ctags distclean distclean-compile \ - distclean-depend distclean-generic distclean-tags 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 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-info-am + distclean-generic distclean-tags 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 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-info-am #$(srcdir)/cPopulation_enums_auto.ci: $(srcdir)/cPopulation.events --- avida-2.0b7.orig/source/main/functional_testsuites/Makefile.in +++ avida-2.0b7/source/main/functional_testsuites/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7.4 from Makefile.am. +# Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @@ -146,7 +146,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = DIST_SOURCES = -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am all: all-am .SUFFIXES: @@ -234,7 +234,6 @@ all-am: Makefile installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -246,7 +245,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: @@ -254,7 +253,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -264,7 +263,7 @@ clean-am: clean-generic mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-DEJAGNU distclean-generic dvi: dvi-am @@ -286,7 +285,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am --- avida-2.0b7.orig/source/main/Makefile.in +++ avida-2.0b7/source/main/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7.4 from Makefile.am. +# Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @@ -287,7 +287,7 @@ all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am DIST_SUBDIRS = . functional_testsuites SOURCES = $(libmain_a_SOURCES) $(primitive_SOURCES) @@ -379,9 +379,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stats.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tasks.Po@am__quote@ -distclean-depend: - -rm -rf ./$(DEPDIR) - .cc.o: @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ @@ -591,7 +588,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: @@ -599,7 +596,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -610,9 +607,10 @@ mostlyclean-am distclean: distclean-recursive - -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-tags + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags dvi: dvi-recursive @@ -633,7 +631,8 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive - + -rm -rf ./$(DEPDIR) + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive @@ -655,20 +654,20 @@ .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \ clean-recursive ctags ctags-recursive distclean \ - distclean-compile distclean-depend distclean-generic \ - distclean-recursive distclean-tags distdir dvi dvi-am \ - dvi-recursive info info-am info-recursive install install-am \ - install-binPROGRAMS install-data install-data-am \ - install-data-recursive install-exec install-exec-am \ - install-exec-recursive install-info install-info-am \ - install-info-recursive install-man install-recursive \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am installdirs-recursive maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-recursive \ - pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ - tags-recursive uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-info-am uninstall-info-recursive uninstall-recursive + distclean-compile distclean-generic distclean-recursive \ + distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ + info-recursive install install-am install-binPROGRAMS \ + install-data install-data-am install-data-recursive \ + install-exec install-exec-am install-exec-recursive \ + install-info install-info-am install-info-recursive install-man \ + install-recursive install-strip installcheck installcheck-am \ + installdirs installdirs-am installdirs-recursive \ + maintainer-clean maintainer-clean-generic \ + maintainer-clean-recursive mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-recursive pdf pdf-am \ + pdf-recursive ps ps-am ps-recursive tags tags-recursive \ + uninstall uninstall-am uninstall-binPROGRAMS uninstall-info-am \ + uninstall-info-recursive uninstall-recursive # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- avida-2.0b7.orig/source/Makefile.in +++ avida-2.0b7/source/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7.4 from Makefile.am. +# Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @@ -138,9 +138,9 @@ @VIEWER_FALSE@SUBDIRS_VIEWERS = $(SUBDIRS_PRIMITIVE) @VIEWER_TRUE@SUBDIRS_VIEWERS = $(SUBDIRS_PRIMITIVE) viewers +@QT_VIEWER_FALSE@SUBDIRS = $(SUBDIRS_VIEWERS) @QT_VIEWER_TRUE@SUBDIRS = $(SUBDIRS_VIEWERS) qt-viewer -@QT_VIEWER_FALSE@SUBDIRS = $(SUBDIRS_VIEWERS) EXTRA_DIST = defs.hh modules.pri subdir = source @@ -154,7 +154,7 @@ all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am DIST_SUBDIRS = support third-party tools cpu event main viewers \ qt-viewer all: all-recursive @@ -352,7 +352,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: @@ -360,7 +360,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -370,7 +370,7 @@ clean-am: clean-generic mostlyclean-am distclean: distclean-recursive - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive @@ -392,7 +392,7 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive --- avida-2.0b7.orig/source/qt-viewer/Makefile.in +++ avida-2.0b7/source/qt-viewer/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7.4 from Makefile.am. +# Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @@ -306,7 +306,7 @@ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(qt_viewer_SOURCES) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am SOURCES = $(qt_viewer_SOURCES) all: $(BUILT_SOURCES) @@ -394,9 +394,6 @@ installdirs: $(mkinstalldirs) $(DESTDIR)$(bindir) - - $(MAKE) $(AM_MAKEFLAGS) install-recursive - install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am @@ -409,7 +406,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: @@ -418,7 +415,7 @@ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -429,7 +426,7 @@ clean-am: clean-binPROGRAMS clean-generic clean-local mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-local @@ -452,7 +449,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am --- avida-2.0b7.orig/source/qt-viewer/qt-viewer.pro +++ avida-2.0b7/source/qt-viewer/qt-viewer.pro @@ -2,11 +2,14 @@ AVIDA_SRC_DIR = .. TEMPLATE = app -TARGET = qt-viewer -DESTDIR = ../../work +TARGET = avida-qt-viewer +#DESTDIR = ../../work CONFIG *= qt thread CONFIG *= cpu event main trio tools +# Qt3 doesn't know its own header location, so take a guess: +INCLUDEPATH += /usr/include/qt3 + # These must be conditional on platform type. If they are active under # macx then the installation breaks. win32 { --- avida-2.0b7.orig/source/qt-viewer/wizard.ui +++ avida-2.0b7/source/qt-viewer/wizard.ui @@ -1,4 +1,4 @@ - + SetupAssistant @@ -8,12 +8,12 @@ 0 0 - 657 - 504 + 614 + 426 - Form1 + Avida Setup Assistant @@ -1196,7 +1196,7 @@ Sunken - + /usr/share/avida/organism.default AutoText @@ -1629,7 +1629,7 @@ Sunken - + /usr/share/avida/environment.cfg AutoText @@ -2425,7 +2425,7 @@ Sunken - + /usr/share/avida/inst_set.default AutoText @@ -2525,7 +2525,7 @@ Sunken - + /usr/share/avida/events.cfg AutoText @@ -2625,7 +2625,7 @@ Sunken - + /usr/share/avida/environment.cfg AutoText @@ -2725,7 +2725,7 @@ Sunken - + /usr/share/avida/organism.default AutoText @@ -4593,7 +4593,10 @@ TextEdit26 - [kgn 04] + Select or enter any options that you would like concerning genotype properties. + + + WidgetWidth true @@ -4796,7 +4799,10 @@ TextEdit27 - [kgn 05] + Here you can choose certain options related to overall species operation. + + + WidgetWidth true @@ -4968,7 +4974,10 @@ TextEdit28 - [kgn 01] + Choose which details you would like to store in the Avida log files. + + + WidgetWidth true @@ -5254,7 +5263,12 @@ TextEdit10_2 - [kgn 02] + Press 'Save world file' to choose where you'd like to store your new world file; often, this will be in a 'genesis' file inside your work directory. + +'Select work directory' will choose the work directory you'd like to use; this is where Avida will store any files it makes during operation. + + + WidgetWidth true @@ -5517,7 +5531,12 @@ TextEdit10_2_2 - [kgn 03 -- simple setup, save modified world and choose work directory] + Press 'Save world file' to choose where you'd like to store the modified world file; often, this will be in a 'genesis' file inside your work directory. + +'Select work directory' will choose to choose the work directory you'd like to use for your modified world. + + + WidgetWidth true --- avida-2.0b7.orig/source/support/genesis +++ avida-2.0b7/source/support/genesis @@ -21,7 +21,7 @@ MAX_CPU_THREADS 1 # Number of Threads CPUs can spawn ### Configuration Files ### -DEFAULT_DIR ../work/ # Directory in which config files are found +DEFAULT_DIR /usr/share/avida # Directory in which config files are found INST_SET inst_set.default # File containing instruction set EVENT_FILE events.cfg # File containing list of events during run ANALYZE_FILE analyze.cfg # File used for analysis mode --- avida-2.0b7.orig/source/support/Makefile.in +++ avida-2.0b7/source/support/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7.4 from Makefile.am. +# Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @@ -161,7 +161,7 @@ all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am DIST_SUBDIRS = $(SUBDIRS) all: all-recursive @@ -377,7 +377,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: @@ -386,7 +386,7 @@ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -396,7 +396,7 @@ clean-am: clean-generic mostlyclean-am distclean: distclean-recursive - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive @@ -418,7 +418,7 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive --- avida-2.0b7.orig/source/support/preset_organisms/Makefile.in +++ avida-2.0b7/source/support/preset_organisms/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7.4 from Makefile.am. +# Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @@ -148,7 +148,7 @@ DIST_SOURCES = DATA = $(presets_DATA) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am all: all-am .SUFFIXES: @@ -220,7 +220,6 @@ installdirs: $(mkinstalldirs) $(DESTDIR)$(presetsdir) - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -232,7 +231,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: @@ -240,7 +239,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -250,7 +249,7 @@ clean-am: clean-generic mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic dvi: dvi-am @@ -272,7 +271,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am --- avida-2.0b7.orig/source/third-party/Makefile.in +++ avida-2.0b7/source/third-party/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7.4 from Makefile.am. +# Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @@ -145,7 +145,7 @@ all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am DIST_SUBDIRS = $(SUBDIRS) all: all-recursive @@ -342,7 +342,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: @@ -350,7 +350,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -360,7 +360,7 @@ clean-am: clean-generic mostlyclean-am distclean: distclean-recursive - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive @@ -382,7 +382,7 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive --- avida-2.0b7.orig/source/third-party/trio-1.9/Makefile.in +++ avida-2.0b7/source/third-party/trio-1.9/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7.4 from Makefile.am. +# Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @@ -164,7 +164,7 @@ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(libtrio_a_SOURCES) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am SOURCES = $(libtrio_a_SOURCES) all: all-am @@ -196,9 +196,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trionan.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/triostr.Po@am__quote@ -distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ @@ -312,7 +309,6 @@ all-am: Makefile $(LIBRARIES) installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -324,7 +320,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: @@ -332,7 +328,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -342,9 +338,10 @@ clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am distclean: distclean-am - -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-tags + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags dvi: dvi-am @@ -365,7 +362,8 @@ installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -rf ./$(DEPDIR) + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -384,14 +382,13 @@ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-noinstLIBRARIES ctags distclean distclean-compile \ - distclean-depend distclean-generic distclean-tags 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 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-info-am + distclean-generic distclean-tags 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 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-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- avida-2.0b7.orig/source/tools/data_entry.hh +++ avida-2.0b7/source/tools/data_entry.hh @@ -94,19 +94,19 @@ DataSet(_funS), DataCompare(_funC) { ; } bool Print(std::ostream & fp) const { - if (target == NULL) return false; - fp << (target->*DataRetrieval)(); + if (this->target == NULL) return false; + fp << (this->target->*DataRetrieval)(); return true; } - //int Compare(T * other) const { return (target->*DataCompare)(other); } + //int Compare(T * other) const { return (this->target->*DataCompare)(other); } int Compare(T * other) const { - return (DataCompare)?((target->*DataCompare)(other)):(0); + return (DataCompare)?((this->target->*DataCompare)(other)):(0); } bool Set(const cString & value) { OUT new_value(0); if (DataSet == 0) return false; - (target->*DataSet)( cStringUtil::Convert(value, new_value) ); + (this->target->*DataSet)( cStringUtil::Convert(value, new_value) ); return true; } }; @@ -128,14 +128,14 @@ DataRetrieval(_funR), DataCompare(_funC), arg(_arg) { ; } bool Print(std::ostream & fp) const { - if (target == NULL) return false; - fp << (target->*DataRetrieval)(arg); + if (this->target == NULL) return false; + fp << (this->target->*DataRetrieval)(arg); return true; } //int Compare(T * other) const { return (target->*DataCompare)(other, arg); } int Compare(T * other) const { - return (DataCompare)?((target->*DataCompare)(other, arg)):(0); + return (DataCompare)?((this->target->*DataCompare)(other, arg)):(0); } }; --- avida-2.0b7.orig/source/tools/Makefile.in +++ avida-2.0b7/source/tools/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7.4 from Makefile.am. +# Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @@ -205,7 +205,7 @@ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(libtools_a_SOURCES) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am SOURCES = $(libtools_a_SOURCES) all: all-am @@ -251,9 +251,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tools.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weighted_index.Po@am__quote@ -distclean-depend: - -rm -rf ./$(DEPDIR) - .cc.o: @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ @@ -367,7 +364,6 @@ all-am: Makefile $(LIBRARIES) installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -379,7 +375,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: @@ -387,7 +383,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -397,9 +393,10 @@ clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am distclean: distclean-am - -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-tags + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags dvi: dvi-am @@ -420,7 +417,8 @@ installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -rf ./$(DEPDIR) + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -439,14 +437,13 @@ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-noinstLIBRARIES ctags distclean distclean-compile \ - distclean-depend distclean-generic distclean-tags 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 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-info-am + distclean-generic distclean-tags 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 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-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- avida-2.0b7.orig/source/viewers/Makefile.in +++ avida-2.0b7/source/viewers/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7.4 from Makefile.am. +# Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @@ -205,7 +205,7 @@ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(viewer_SOURCES) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am SOURCES = $(viewer_SOURCES) all: all-am @@ -266,9 +266,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/viewer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zoom_screen.Po@am__quote@ -distclean-depend: - -rm -rf ./$(DEPDIR) - .cc.o: @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ @@ -383,7 +380,6 @@ installdirs: $(mkinstalldirs) $(DESTDIR)$(bindir) - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -395,7 +391,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: @@ -403,7 +399,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -413,9 +409,10 @@ clean-am: clean-binPROGRAMS clean-generic mostlyclean-am distclean: distclean-am - -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-tags + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags dvi: dvi-am @@ -436,7 +433,8 @@ installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -rf ./$(DEPDIR) + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -455,11 +453,11 @@ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ clean-generic ctags distclean distclean-compile \ - distclean-depend distclean-generic distclean-tags distdir dvi \ - dvi-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ + distclean-generic distclean-tags distdir dvi dvi-am info \ + info-am install install-am install-binPROGRAMS install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man 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-info-am --- avida-2.0b7.orig/debian/changelog +++ avida-2.0b7/debian/changelog @@ -0,0 +1,45 @@ +avida (2.0b7-4ubuntu1) dapper; urgency=low + + * Add desktop file from Phil Bull (Closes Malone: #36364) + + -- Barry deFreese Mon, 10 Apr 2006 20:53:07 -0400 + +avida (2.0b7-4) unstable; urgency=low + + * Modified source/support/genesis to fix DEFAULT_DIR. Closes: #322864. + * Modified menu to place avida-qt-viewer under Apps/Science. Closes: #322863. + * Modified source/qt-viewer/wizard.ui to improve viewer functionality/aesthetics. + Closes: #322865. + * Thanks to Ryan Schultz for the patches. + * Modified debian/rules to remove config.sub and config.guess from the diff + file. Thanks to Anibal Monsalve Salazar . + * Added autotools-dev to dependencies. + + -- Miriam Ruiz Fri, 7 Oct 2005 21:52:55 +0200 + +avida (2.0b7-3.1) unstable; urgency=low + + * NMU for qt transition Closes #327931. + + -- Don Armstrong Mon, 26 Sep 2005 22:27:23 -0700 + +avida (2.0b7-3) unstable; urgency=low + + * Applied patch to solve compilation problem in amd64 architecture. + Thanks to Andreas Jochens for the patch. Closes #303882. + + -- Miriam Ruiz Sat, 9 Apr 2005 14:59:00 +0100 + +avida (2.0b7-2) unstable; urgency=low + + * Removed duplicated copies of the documentation. + * Modified debian/rules to use debhelper commands. + + -- Miriam Ruiz Fri, 1 Apr 2005 01:46:00 +0100 + +avida (2.0b7-1) unstable; urgency=low + + * Initial Release (Closes: #293647). + + -- Miriam Ruiz Fri, 26 Nov 2004 14:18:07 +0100 + --- avida-2.0b7.orig/debian/compat +++ avida-2.0b7/debian/compat @@ -0,0 +1 @@ +4 --- avida-2.0b7.orig/debian/dirs +++ avida-2.0b7/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/share --- avida-2.0b7.orig/debian/avida-qt-viewer.desktop +++ avida-2.0b7/debian/avida-qt-viewer.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Version=1.0 +Encoding=UTF-8 +Name=Avida Evolution Simulator +GenericName=Evolution Simulator +Comment=Study mutation and evolution in a virtual world +Type=Application +Exec=avida-qt-viewer +Icon=avida +Categories=Application;Science;Biology;Qt;Simulation; --- avida-2.0b7.orig/debian/avida-qt-viewer.menu +++ avida-2.0b7/debian/avida-qt-viewer.menu @@ -0,0 +1,3 @@ +?package(avida-qt-viewer):needs="x11" section="Apps/Science" \ + title="Avida Qt Viewer" command="/usr/bin/avida-qt-viewer" \ + icon="/usr/share/pixmaps/avida.xpm" --- avida-2.0b7.orig/debian/avida.xpm +++ avida-2.0b7/debian/avida.xpm @@ -0,0 +1,614 @@ +/* XPM */ +static char *avida[]={ +"32 32 579 2", +"Qt c None", +".U c #e3e5ee", +"ax c #dfedf8", +".A c #e5e5f0", +"e4 c #c8cad4", +"#5 c #eaedf1", +"fv c #c3bfc7", +"fW c #cbcbcf", +"fV c #d8d8da", +"gi c #d9d9db", +"e5 c #c6c6ce", +"gj c #d2d1d4", +"gF c #dddee0", +"gG c #d1d1d3", +"gY c #d9d9da", +"ea c #c8cbd3", +"ha c #dddddf", +"eC c #c3c7d6", +"gZ c #cfd0d1", +"g5 c #afb3c0", +"g4 c #b0b4c1", +"g6 c #b1b4bf", +"g3 c #b2b6c1", +"g7 c #b4b7bf", +"g2 c #b6b9c0", +"g8 c #bababf", +"g1 c #bbbdc0", +"g9 c #c1c1c3", +"g0 c #c5c4c6", +"h. c #ccccce", +"h# c #d5d5d6", +"gI c #bcbec4", +"gH c #c5c5c6", +"gX c #d0d1d1", +"#f c #e6e9f3", +".k c #e8e7f0", +"aw c #ecf0f2", +"gk c #c6c6c8", +"gE c #d3d3d4", +".z c #ebeaf0", +"aX c #dfebee", +"gl c #bdbfc6", +"gD c #c5c5c7", +".# c #eaebee", +"fX c #bfbbc1", +"gh c #cecfcf", +"gW c #c7c8c8", +"gJ c #bec1ca", +"fw c #b5a7b2", +"fU c #cacacd", +"bN c #20d75d", +"ao c #23cc5d", +"bI c #28dd67", +"dR c #28e36b", +"dS c #29e46b", +"ek c #2cd968", +"bJ c #2fdc6c", +"an c #33cc6b", +"ej c #33d56d", +"bM c #36db75", +"bO c #3bd373", +"be c #3cdc7b", +"cf c #3dce72", +"ap c #42cd79", +"bf c #49db84", +"ce c #4fce80", +"#X c #50d285", +"cg c #52cc83", +"dT c #56e090", +"#W c #5ad590", +"bH c #5adf95", +"el c #5bd38d", +"eY c #5cd892", +"ex c #64d897", +"ew c #6be2a3", +"ei c #6cdba1", +"bK c #6dcd9b", +"#Y c #6dcf9c", +"dQ c #78e3af", +"bd c #7adeb0", +"bg c #7cd4ac", +"eZ c #7dcfa4", +"cb c #7ebd96", +"do c #83deb4", +"dp c #8ad9b4", +"ey c #8dc9b3", +"bj c #8dd5ba", +"ca c #8eb89f", +"bi c #91d8bd", +"gv c #938cab", +"gu c #947f9e", +"f4 c #9490b1", +"gs c #957d9b", +"gt c #967695", +"gr c #9688a7", +"aO c #96c9bc", +"f9 c #978eae", +"gw c #987895", +"gq c #989bbd", +"e0 c #98c7ba", +"bP c #99ccbf", +"gx c #9a6d87", +"gy c #9b6c85", +"gz c #9b758f", +"f8 c #9b7996", +"aP c #9bc6bf", +"ga c #9c637e", +"f5 c #9c7694", +"aN c #9ccec3", +"gb c #9d6a84", +"g. c #9d7894", +"cc c #9dc5bd", +"f6 c #9e6b86", +"gQ c #9ea4bf", +"g# c #9f657f", +"f7 c #9f6c87", +"gR c #9f9fb7", +"gP c #9fa5c1", +"gO c #9fa7c3", +"e1 c #9fb1c1", +"am c #9fd0c8", +"ec c #a09dbe", +"gN c #a0a9c4", +"f3 c #a1849c", +"eF c #a285a0", +"gS c #a29ab0", +"dq c #a2d3c2", +"eE c #a39cb8", +"gM c #a3acc5", +"fs c #a3b0c0", +"ch c #a3c9c7", +"bk c #a3d1ca", +"e7 c #a57991", +"gT c #a599aa", +"gp c #a5a6c3", +"e2 c #a5a6c4", +"fE c #a6a0c0", +"ez c #a6b1c3", +"eA c #a7a7c6", +"gL c #a7afc7", +"fN c #a894b1", +"gA c #a8a9c1", +"dK c #a8adcc", +"fM c #a98ca7", +"gc c #aaa7c0", +"ed c #ab87a0", +"dL c #aba6c4", +"cd c #abd1cf", +"bL c #abd3d0", +"eM c #abd5ce", +"gU c #aca0ad", +"dg c #acadcc", +"c# c #acbdb9", +"#x c #accaca", +"fL c #ad8ba4", +"eb c #aeb3cb", +"fr c #afc7c9", +"fK c #b09bb5", +"ft c #b0afc2", +"eB c #b0b5d1", +"gK c #b1b7c9", +"fp c #b1d2cc", +"eG c #b293a8", +"fO c #b2b3cd", +"#y c #b2cecd", +"dn c #b2dad7", +"e8 c #b3869c", +"fF c #b389a2", +"fx c #b394a5", +"fJ c #b39eb9", +"#Z c #b3c6cd", +"#V c #b3ced6", +"eN c #b3d4d8", +"fD c #b4889e", +"e6 c #b4a7b4", +"aq c #b4c5d2", +"eL c #b4cfce", +"fT c #b5b7c4", +"eX c #b5d5d8", +"d9 c #b6adc9", +"fz c #b6b0c6", +"f2 c #b799ac", +"e3 c #b7b9c8", +"go c #b7bacf", +"e. c #b7c0e0", +"f1 c #b99eb2", +"fA c #b99fb3", +"f0 c #b9a9bd", +"f. c #b9afc6", +"fY c #b9b4c2", +"fZ c #b9b8cc", +"gn c #b9bed1", +"aM c #b9d3de", +"e9 c #ba99ad", +"fy c #ba9fb3", +"fq c #bad3d1", +"cJ c #bbaeb7", +"cO c #bbbad7", +"gB c #bbbbca", +"gm c #bbbfce", +"fB c #bc94a6", +"gV c #bcbec4", +"fo c #bcc8d6", +"bl c #bccbd8", +"df c #bdc0ce", +"cN c #bdc0cf", +"fn c #bec0db", +"fS c #bec2d1", +"fG c #bf6172", +"#P c #bf9fce", +"eD c #bfc1cb", +"fI c #c06f82", +"fC c #c096a8", +"eH c #c0a0b4", +"gC c #c0bfc7", +"dH c #c0c9e7", +"#Q c #c1a8d0", +"f# c #c1adc1", +"dh c #c1bfdc", +"gg c #c1c1c7", +"bh c #c1cfe1", +"#O c #c2aad0", +"#R c #c2b8d9", +"#w c #c2c5dc", +"fH c #c35c6c", +"bz c #c3aed1", +"gf c #c3c2ce", +"dI c #c3d2e3", +"#z c #c3d3da", +"ev c #c3d8e5", +"bA c #c4b0d4", +"#n c #c4bbd2", +"gd c #c4c2d4", +"ck c #c4c6d4", +"eK c #c4c8cf", +"e# c #c4cddc", +"bE c #c5a8d7", +"bD c #c5abd6", +"bF c #c5afd8", +"af c #c5b7d9", +"ag c #c5b9db", +"#r c #c5bedc", +"#9 c #c5c3d9", +"a. c #c5c3dc", +"aA c #c5c5dc", +"fm c #c5c5e1", +"dJ c #c5c7d0", +"cM c #c5c9da", +"de c #c5d1e1", +"cI c #c69fab", +"eI c #c6b3ca", +"#N c #c6c1df", +"cK c #c6c4db", +"#s c #c6c4e2", +"ee c #c76b7a", +"#p c #c7b2d6", +"#q c #c7b7d7", +"a# c #c7bad6", +"ae c #c7bbdb", +"#v c #c7c4e1", +"aZ c #c7c6dc", +"aQ c #c7c8e5", +"cj c #c7c9d9", +"dd c #c7c9e6", +"bp c #c7cbde", +"aa c #c8afca", +"ac c #c8b0cb", +"ah c #c8c3e3", +"#u c #c8c5e2", +"#t c #c8c5e3", +"a0 c #c8c6e3", +"ge c #c8c7d6", +"ab c #c9a9c2", +"bQ c #c9c7de", +"as c #c9c7df", +"aT c #c9c7e2", +"#I c #c9c8dc", +"a1 c #c9c8e6", +".6 c #c9c9dd", +"#8 c #c9cadf", +"bm c #c9cae0", +"fP c #c9cbdd", +"d8 c #ca8fa3", +"dG c #caafc9", +"by c #cab7d6", +"a9 c #cab7de", +"#o c #cabad8", +"bB c #cac0e2", +"ar c #cac6e3", +"cl c #cac7e2", +"#S c #cac7e6", +"bq c #cac8e5", +".5 c #cac9dd", +"bT c #cac9e0", +".7 c #cacade", +"aU c #cacae0", +"bG c #cacee9", +"#J c #cb9fb0", +"bb c #cbb1dc", +"aB c #cbc7e6", +"dU c #cbc8d7", +"aS c #cbc8e6", +"#T c #cbc8e7", +"br c #cbc9e7", +"a2 c #cbc9e8", +".4 c #cbcadc", +"az c #cbd1e5", +"aG c #ccbee0", +"ad c #ccc6e4", +"#U c #ccc8e8", +"aC c #ccc9e8", +"aR c #ccc9ea", +".8 c #ccccdf", +"at c #cccce1", +"bR c #cccfe1", +"#M c #cd5f6c", +"a7 c #cdabdc", +"c3 c #cdafdd", +"d5 c #cdb0b8", +"aE c #cdb2dc", +"bU c #cdcae8", +"a3 c #cdcae9", +".3 c #cdcbdd", +"#0 c #cdcbe0", +"cL c #cdcbe7", +"bV c #cdcbe9", +"ai c #cdcbea", +"fu c #cdccd1", +"#H c #cdcde3", +"bS c #cdcfda", +"d6 c #ce919a", +"a8 c #ceafde", +"aF c #ceb5dd", +"ci c #cecbe7", +"a4 c #cecbe8", +"aj c #cecbeb", +"cP c #ceccea", +"ak c #cecceb", +"ba c #cfafde", +"c2 c #cfb0e1", +"dr c #cfcce2", +"a5 c #cfccea", +"al c #cfccec", +"fR c #cfd0de", +"#K c #d0636f", +"dM c #d07a8c", +"fa c #d08998", +"dv c #d0b4d7", +"aH c #d0cae8", +"cm c #d0cae9", +"bc c #d0caec", +"fl c #d0cdeb", +".9 c #d0cfe3", +"aY c #d0deec", +"bs c #d1bed8", +"eh c #d1c4da", +"bC c #d1c4e6", +".2 c #d1d0e2", +"c4 c #d2c6ec", +"eJ c #d2c7e1", +"bw c #d2c7e3", +"bx c #d2c9e7", +"#1 c #d2d1e6", +"fQ c #d2d3e0", +"dc c #d3b5ce", +"b# c #d3b5e1", +"a6 c #d3bbe1", +"aD c #d3c3e3", +"aL c #d3ceef", +".1 c #d3d0e3", +"#G c #d3d3eb", +"#. c #d3d4e7", +"du c #d4a9c9", +"c1 c #d4bce6", +"aJ c #d4c6e6", +"b. c #d4c8ea", +"aK c #d4cae9", +"d4 c #d4cee9", +"c. c #d4cfec", +"#A c #d4d7e6", +"#7 c #d4dbf2", +"#L c #d54951", +"cy c #d5b4e5", +"d3 c #d5b6d0", +"d2 c #d5bcd8", +"cQ c #d5c3df", +"cV c #d5c6df", +"aI c #d5c7e7", +"dw c #d5cdee", +"b9 c #d5cef2", +"fk c #d5d2f2", +"eW c #d5d4f3", +"bn c #d5dae8", +"bo c #d5dee8", +"d7 c #d68290", +"cU c #d693a7", +"cH c #d69bac", +"cr c #d6b8d2", +"d1 c #d6c7e6", +"eu c #d6d4f3", +"au c #d6daee", +"b0 c #d7a5bb", +"dB c #d7bad5", +"cA c #d7c8ed", +"eT c #d7cdec", +"b8 c #d7cef1", +"eV c #d7d4f4", +"eU c #d7d4f5", +"aV c #d7daee", +"c9 c #d8a8bf", +"cz c #d8b9e6", +"#j c #d8bdcf", +"b7 c #d8cef1", +"d0 c #d8d1f1", +"fj c #d8d3f2", +"et c #d8d4f5", +"#i c #d8d8f0", +"## c #d8d9ec", +"#m c #d95055", +"cG c #d9b6d0", +"cF c #d9bcd6", +"er c #d9c2df", +"cw c #d9c9ea", +"es c #d9d4f6", +"#g c #d9d8ee", +"#h c #d9d9f1", +"#F c #d9def1", +"ef c #da626e", +"dt c #daa5c2", +"dP c #daaac2", +"bv c #daadc4", +"fd c #dabbd4", +"cx c #dac1ea", +"fi c #dac6e3", +"b5 c #dac9e6", +"c0 c #dad0f4", +"b6 c #dad2f3", +"#2 c #dadcf2", +"eg c #db798a", +"cS c #db7c8c", +"eS c #db8b9e", +"cR c #db9baf", +"dZ c #dbc6e3", +"ay c #dbecf7", +"fb c #dc707c", +"cT c #dc7684", +"cW c #dc7e88", +"#k c #dc8b97", +"bW c #dc94a8", +"bt c #dc9eb1", +"dm c #dcadc6", +"em c #dcbbd2", +"cn c #dd8c9f", +"bu c #dd99ad", +"eO c #ddc6e4", +".V c #dddcef", +".Y c #dddcf4", +".W c #ddddf6", +"cZ c #de869a", +"di c #dea2b7", +".0 c #deb6c4", +".Z c #dec9dc", +"#B c #deddef", +".X c #dedff8", +"#l c #df6167", +"ds c #dfc1de", +".C c #dfddf4", +"#a c #dfdff1", +".J c #dfe1f3", +".I c #dfe1f5", +".K c #dfe2f3", +"#6 c #dfebf3", +"fh c #e0adc5", +".H c #e0e1f6", +".L c #e0e2f3", +".M c #e0e2f4", +"dx c #e19eb3", +".B c #e1e0ee", +"#C c #e1e0f7", +".m c #e1e1f3", +".G c #e1e2f9", +".N c #e1e3f6", +"dF c #e25a65", +"eQ c #e25a66", +"cX c #e25d65", +"eP c #e27f90", +"fe c #e2bbd5", +".D c #e2e1f9", +".F c #e2e3fb", +"eR c #e34952", +"dA c #e35c66", +".E c #e3e1fa", +".l c #e3e2ef", +".O c #e3e4f9", +"aW c #e3e8f1", +"av c #e3eaf6", +"cB c #e4aac2", +"#b c #e4e4f6", +"#D c #e4e7f8", +".c c #e4e8f0", +"#3 c #e4eaf8", +"cq c #e5444c", +"dy c #e56977", +"fc c #e5707c", +"fg c #e59baf", +"#e c #e5e6f6", +".b c #e5e8ef", +"cY c #e65b65", +"b1 c #e68d9b", +".a c #e6e8ee", +".n c #e6e9fb", +".h c #e6eaef", +"dz c #e75863", +"db c #e76571", +"#d c #e7e7fa", +".T c #e7e8f3", +".i c #e7e9ee", +".g c #e7ebf1", +".d c #e7ebf3", +"cv c #e8515b", +"eq c #e86874", +"dY c #e8889a", +"#c c #e8e8fa", +".P c #e8e8fc", +".y c #e8e9f0", +".e c #e8ecf3", +".f c #e8edf4", +"dC c #e96d79", +"b4 c #e9808f", +"c5 c #e98293", +"ff c #e992a4", +".o c #e9ebfd", +".q c #e9ecfd", +".j c #eaebef", +".p c #eaebfe", +".r c #eaedfd", +"co c #eb3f46", +"d. c #eb7784", +"cE c #eb7b8a", +".s c #ebeefe", +"#E c #ebeff5", +".S c #ecebfa", +".x c #ecedf6", +".t c #eceefe", +"#4 c #ecf0f3", +".R c #edeefd", +".Q c #edeefe", +".u c #edf0fe", +".v c #edf1fe", +"dD c #ee282c", +"dO c #ef2e32", +"cp c #ef3036", +"cs c #ef565f", +"dV c #ef8292", +".w c #eff1fd", +"dE c #f02124", +"bX c #f03237", +"dl c #f0535b", +"cD c #f05f6a", +"cC c #f1606a", +"bZ c #f22426", +"b3 c #f2515b", +"dN c #f32427", +"dj c #f34e55", +"c8 c #f42b2e", +"dk c #f43e44", +"dX c #f45762", +"bY c #f51617", +"b2 c #f53f45", +"cu c #f61b1d", +"da c #f62c2f", +"dW c #f64b54", +"ct c #f71719", +"d# c #f72326", +"en c #f74d54", +"c6 c #f82629", +"c7 c #fa181a", +"eo c #fc181a", +"ep c #fc1b1d", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQt.#.a.b.c.d.e.f.f.g.h.i.jQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQt.k.l.m.n.o.p.p.p.q.r.s.t.u.v.w.x.y.z.AQtQtQtQtQtQt", +"QtQtQtQtQtQt.B.C.D.E.F.G.H.I.J.K.L.L.M.N.O.P.Q.R.S.TQt.UQtQtQtQt", +"QtQtQtQtQt.V.W.X.Y.Z.0.1.2.3.4.5.6.7.8.9#.###a#b#c#d#e#fQtQtQtQt", +"QtQtQtQt#g#h#i#j#k#l#m#n#o#p#q#r#s#t#u#v#w#x#y#z#A#B#C#D#EQtQtQt", +"QtQtQt#F#G#H#I#J#K#L#M#N#O#P#Q#R#S#T#T#U#V#W#X#Y#Z#0#1#2#3#4#5Qt", +"QtQt#6#7#8#9a.a#aaabacadaeafagahaiajakalamanaoapaqarasatauavawQt", +"QtaxayazaA#v#t#SaB#TaCaDaEaFaGaHaIaJaKaLaMaNaOaPaQaRaSaTaUaVaWQt", +"QtaXaYaZa0a1#Ta2a3a4a5a6a7a8a9b.b#babbbcbdbebfbgbhbibjbkblbmbnQt", +"QtbobpbqbrbsbtbubvbwbxbybzbAbBbCbDbEbFbGbHbIbJbKbLbMbNbObPbQbRQt", +"QtbSbTbUbVbWbXbYbZb0b1b2b3b4b5b6b7b8b9c.c#cacbcccdcecfcgchcicjQt", +"Qtckcla5cmcncocpcqcrcsctcucvcwcxcyczcAcBcCcDcEcFcGcHcIcJcKcLcMQt", +"QtcNcOcPcQcRcScTcUcVcWcXcYcZc0c1c2c3c4c5c6c7c8c9d.d#dadbdcdddeQt", +"QtdfdgdhdidjdkdldmdndodpdqdrdsdtdudvdwdxdydzdAdBdCdDdEdFdGdHdIQt", +"QtdJdKdLdMdNc7dOdPdQdRdSdTdUdVdWdXdYdZd0d1d2d3d4d5d6d7d8d9e.e#Qt", +"QteaebecedeeefegeheiejekelemeneoepeqereseteteuevewexeyezeAeBeCQt", +"QtQteDeEeFeGeHeIeJeKeLeMeNeOePeQeReSeTeUeVeVeWeXeYeZe0e1e2e3e4Qt", +"QtQte5e6e7e8e9f.f#fafbfcfdfefffgfhfifjfkflfmfnfofpfqfrfsftfuQtQt", +"QtQtQtfvfwfxfyfzfAfBfCfDfEfFfGfHfIfJfKfLfMfNfOfPfQfRfSfTfUfVQtQt", +"QtQtQtQtfWfXfYfZf0f1f2f3f4f5f6f7f8f9g.g#gagbgcgdgegfggghgiQtQtQt", +"QtQtQtQtQtgjgkglgmgngogpgqgrgsgtgugvgwgxgygzgAgBgCgDgEgFQtQtQtQt", +"QtQtQtQtQtQtQtgGgHgIgJgKgLgMgNgOgPgQgRgSgTgUgVgWgXgYQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtgZg0g1g2g3g4g5g6g7g8g9h.h#haQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt"}; --- avida-2.0b7.orig/debian/avida.1 +++ avida-2.0b7/debian/avida.1 @@ -0,0 +1,101 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.TH "AVIDA" "1" "noviembre 23, 2004" "" "" +.SH "NAME" +avida \- Auto\-adaptive genetic system for Artificial Life research +.SH "SYNOPSIS" +.B avida\-primitive +.RI [ options ] + +.B avida\-viewer +.RI [ options ] + +.B avida\-qt\-viewer +.SH "DESCRIPTION" +Avida is an auto\-adaptive genetic system designed primarily +for use as a platform in Digital or Artificial Life research. +The Avida system is based on concepts similar to those employed +by the tierra program developed by Tom Ray. In lay terms, Avida +is a digital world in which simple computer programs mutate and +evolve. More technically, it is a population of self\-reproducing +strings with a Turing\-complete genetic basis subjected to +Poisson\-random mutations. The population adapts to the combination +of an intrinsic fitness landscape (self\-reproduction) and an +externally imposed (extrinsic) fitness function provided by the +researcher. +.PP +By studying this system, one can examine evolutionary adaptation, +general traits of living systems (such as self\-organization), and +other issues pertaining to theoretical or evolutionary biology and +dynamic systems. The power of Avida is that it gives us a +controllable digital system in which to study the theories of +evolutionary biology. Often, we can study elements of evolutionary +theory that are difficult or impossible in biological systems. +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. +.SH "OPTIONS" +.TP +\fB\-g[enesis] \fR +Set genesis file to be +.TP +\fB\-h[elp]\fR +Help on options (this listing) +.TP +\fB\-e[vents]\fR +Print a list of all known events +.TP +\fB\-s[eed] \fR +Set random seed to +.TP +\fB\-viewer \fR +Sets Viewer to +.TP +\fB\-v[ersion]\fR +Prints the version number +.TP +\fB\-set \fR +Overide the genesis file +.TP +\fB\-l[oad] \fR +Load a clone file +.TP +\fB\-loadpop \fR +Load a saved population file (precedence over load) +.TP +\fB\-a[nalyze]\fR +Process analyze.cfg instead of normal run. +.SH "AUTHOR" +Avida is a joint project of the Digital Life Laboratory, headed +by Chris Adami, at the California Institute of Technology +(http://dllab.caltech.edu/) and Richard Lenski's Microbial +Evolution laboratory at Michigan State university +(http://www.msu.edu/~lenski/). +For more info on these groups or their research, please visit +the links above. +.PP +This manual page was written by Miriam Ruiz , +for the Debian project (but may be used by others). +.SH "SEE ALSO" +There is a directory with some starting data you can use as a base +for your research in /usr/share/alive/. +You just have to copy the contents of that directory wherever you +want and start running avida\-viewer there. +You can find HTML documentation about avida in +/usr/share/doc/alive/html/. + +There are two viewer programs available, avida\-viewer, which is a text mode one, using ncurses library, and avida\-qt\-viewer, which is a graphics viewer using qt widgets under the X Windowing System. --- avida-2.0b7.orig/debian/avida-48x48.xpm +++ avida-2.0b7/debian/avida-48x48.xpm @@ -0,0 +1,1022 @@ +/* XPM */ +static char *avida[]={ +"48 48 971 2", +"Qt c None", +"cp c #18d757", +"f# c #1ce15d", +"fa c #1ce35d", +"av c #1dd35b", +"ck c #1fde60", +"fS c #21dd61", +"cq c #22d75e", +"cV c #24cd5d", +"aZ c #25c85c", +"bQ c #25dd68", +"au c #26d665", +"cl c #27df66", +"cW c #29d463", +"eF c #2be470", +"aY c #2cc762", +"a0 c #2ccb65", +"aw c #2fd56e", +"fb c #2fdd6d", +"fG c #32d46b", +"eG c #33e578", +"bR c #35de75", +"fF c #3ace70", +"cj c #3de27f", +"cU c #40d278", +"co c #40de81", +"fR c #49e98b", +"cr c #4cd082", +"fH c #4dcd80", +"f. c #50e892", +"fT c #54d288", +"eH c #55e995", +"cm c #56cd88", +"cX c #59c887", +"gh c #5ad691", +"bP c #5be299", +"fE c #5dd491", +"bS c #61d898", +"cR c #67c490", +"cQ c #7ac4a1", +"bV c #7ad8ac", +"eE c #80e5b7", +"cS c #88c3ac", +"gi c #8bcbae", +"fU c #8fb9b5", +"hS c #9085a3", +"aX c #90d1bb", +"#1 c #90d4bc", +"bW c #90d4be", +"bU c #90dbbc", +"hp c #9293b5", +"hP c #937491", +"#2 c #93d0bc", +"hO c #9483a1", +"hT c #9487a5", +"hR c #956783", +"hQ c #956b89", +"cP c #95c9bb", +"hN c #969bbd", +"id c #969dbe", +"hu c #9786a4", +"ie c #9791b1", +"ic c #97a0c4", +"if c #988ba8", +"ia c #98a3c7", +"ig c #99859d", +"hv c #9996b7", +"ib c #99a0c2", +"hV c #9a647d", +"fy c #9a96b6", +"i# c #9aa5c8", +"hU c #9b637e", +"mM c #9b6dac", +"hX c #9b708b", +"mP c #9b70ab", +"mD c #9b7ca8", +"hy c #9c637e", +"hW c #9c657e", +"hq c #9c7997", +"i. c #9ca7ca", +"ih c #9d8c9f", +"gk c #9dbdbe", +"hz c #9e6a83", +"lX c #9e78ab", +"f0 c #9e7b97", +"ax c #9ec4c0", +"hx c #9f637e", +"hr c #9f6985", +"kN c #9f6fb1", +"jP c #9f73ae", +"e3 c #9f9ebf", +"h9 c #9faacc", +"hw c #a06b85", +"lA c #a084ab", +"fx c #a0a3c6", +"hs c #a16c86", +"ht c #a16e88", +"g0 c #a1a2c3", +"gO c #a1babf", +"l8 c #a265b9", +"lK c #a268b6", +"gp c #a27a92", +"ho c #a27e94", +"at c #a2d2cb", +"j0 c #a369b9", +"j. c #a370b6", +"fW c #a3a3c4", +"k4 c #a46ab9", +"j# c #a46fba", +"hY c #a4a5c2", +"ms c #a56bbb", +"hM c #a5a3c0", +"fV c #a5a6c4", +"gl c #a5a7c7", +"#3 c #a5cbc6", +"i3 c #a66eba", +"g9 c #a689a5", +"h. c #a693b1", +"fz c #a699b2", +"gm c #a6a6c1", +"mG c #a769be", +"mh c #a795af", +"ml c #a796ad", +"ew c #a7aacb", +"kx c #a88bb2", +"hA c #a8a5be", +"ex c #a8a7c4", +"d1 c #a8a8c7", +"fZ c #a8acc4", +"f1 c #a9849b", +"g8 c #a9869f", +"e4 c #a996b1", +"h8 c #a9b3cc", +"gq c #aa758c", +"gS c #aa90a1", +"g6 c #aab2d1", +"dq c #aac4cb", +"bX c #aad2cf", +"kT c #ab7cbc", +"jt c #ab92b6", +"ft c #abaccd", +"jA c #ac6dc3", +"kg c #ac92b5", +"ir c #acb0bc", +"e2 c #acb5d3", +"kE c #ad6cc4", +"kB c #ad6cc5", +"j7 c #ad6dc4", +"mL c #ad75c0", +"g1 c #ad93ae", +"is c #adb0bd", +"jw c #ae6dc5", +"fs c #aeaac4", +"it c #aeb1ba", +"iq c #aeb2bf", +"dr c #aec4ce", +"gj c #aecec9", +"mg c #af75c6", +"m9 c #afa6b4", +"mn c #afa9b1", +"l0 c #afa9b2", +"ip c #afb3bd", +"mb c #b06fc8", +"i6 c #b071c8", +"ja c #b073c6", +"g7 c #b08ba2", +"lZ c #b0a9b2", +"l1 c #b0aab2", +"h# c #b0b1cb", +"ii c #b0b2bc", +"bp c #b0c4cf", +"n. c #b1a9b6", +"mS c #b26eca", +"gZ c #b2899f", +"mo c #b2a6b5", +"he c #b2b5c7", +"lq c #b372cb", +"kl c #b376c9", +"jE c #b392be", +"nh c #b3a8b8", +"mm c #b3adb6", +"iu c #b3b6bb", +"a1 c #b3c4d2", +"l2 c #b489c5", +"gV c #b4b5cc", +"io c #b4b7bd", +"fX c #b4b9cf", +"lO c #b56ecf", +"mz c #b571cd", +"lS c #b574cd", +"mk c #b576cc", +"mN c #b5a5ba", +"hi c #b5acb6", +"mI c #b671d0", +"lt c #b67bcc", +"le c #b6a8bc", +"fw c #b6bcca", +"kt c #b779cf", +"lP c #b77acc", +"hn c #b794a6", +"gs c #b799ac", +"lY c #b7b1ba", +"gt c #b7b7d0", +"hL c #b7b9d1", +"hI c #b7bac7", +"eZ c #b7bad5", +"h7 c #b7bbc9", +"jJ c #b871cf", +"jk c #b871d4", +"ka c #b872d0", +"i9 c #b874d1", +"l3 c #b875d1", +"gU c #b8a5ba", +"hj c #b8b5ca", +"iv c #b8b8bb", +"fu c #b8c3e2", +"bo c #b8cad9", +"jF c #b972d3", +"lT c #b974d1", +"kP c #b976d1", +"kh c #b976d3", +"jp c #b977d2", +"kX c #b978cf", +"jR c #b97bd1", +"hm c #b998ab", +"hl c #b9a0b3", +"mZ c #b9afbc", +"l9 c #b9b3bb", +"hk c #b9b8cf", +"hf c #b9b9c0", +"in c #b9babc", +"h6 c #b9bbc2", +"gJ c #b9bbd6", +"hK c #b9bed6", +"hJ c #b9bfd4", +"eI c #b9d9de", +"lu c #ba71d5", +"k1 c #ba72d6", +"ko c #ba75d3", +"ld c #ba77d4", +"jK c #ba78d3", +"g5 c #ba7c8f", +"lR c #ba80cf", +"lQ c #ba81cd", +"ls c #ba81ce", +"lr c #ba81cf", +"gW c #ba96aa", +"al c #ba9ac9", +"li c #baa4c2", +"m8 c #baacbc", +"km c #baafbe", +"gP c #bab9c2", +"hZ c #babace", +"bn c #bad0dd", +"fp c #bad9e0", +"g2 c #bb6172", +"kJ c #bb74d5", +"gX c #bb95a7", +"f2 c #bba3b6", +"an c #bbabcf", +"h0 c #bbbac7", +"hE c #bbbbc6", +"#4 c #bbc5d0", +"gN c #bbd1d2", +"l7 c #bc73d5", +"jV c #bc74d5", +"gr c #bc93a7", +"gT c #bc97a9", +"dw c #bcbbd6", +"h1 c #bcbcbf", +"ij c #bcbdbe", +"lp c #bd79d7", +"mA c #bd99ca", +"ak c #bda5cb", +"f3 c #bdacc1", +"mY c #bdb3c1", +"hH c #bdbec0", +"e0 c #bdcced", +"fo c #bddde1", +"ll c #be7cd7", +"fA c #be8d9e", +"jQ c #be91ce", +"mp c #be91cf", +"mR c #be9bcb", +"nc c #beb1c2", +"m5 c #beb2c1", +"m2 c #beb7c1", +"gK c #bec4d7", +"#0 c #becadc", +"gL c #bed1d5", +"iY c #bf7ad7", +"ly c #bf82d8", +"kf c #bf84d4", +"mK c #bf88d3", +"gY c #bf9bad", +"ca c #bfb5d9", +"gR c #bfbdc2", +"d0 c #bfc2ce", +"dv c #bfc2cf", +"dp c #bfc4d7", +"bm c #bfd5e3", +"g3 c #c05765", +"lh c #c080d7", +"mJ c #c087d5", +"cf c #c0a1d2", +"am c #c0a3cd", +"gu c #c0a4b4", +"eg c #c0abd3", +"#V c #c0aed0", +"kK c #c0afc7", +"cb c #c0b1d7", +"h5 c #c0c1c1", +"et c #c0cbe8", +"jj c #c182d8", +"iU c #c185d6", +"mC c #c189d4", +"lm c #c198cf", +"k# c #c19ad0", +"kO c #c19cce", +"lv c #c1a0cf", +"go c #c1c0c5", +"aH c #c1c0d3", +"iw c #c1c1c1", +"ad c #c1c1d1", +"gI c #c1c1dc", +"#q c #c2b4c7", +"mt c #c2b9c5", +"hF c #c2c3c4", +"du c #c2c6d4", +"g4 c #c35667", +"kW c #c396d1", +"ki c #c39fd0", +"ch c #c3afd6", +"ee c #c3afd8", +"cc c #c3b7db", +"n# c #c3bdc5", +"ae c #c3c0d6", +"#A c #c3c0d9", +"#B c #c3c1d4", +"b# c #c3c3d7", +"gM c #c3d6d8", +"ag c #c47888", +"js c #c48bd9", +"#T c #c4a2d2", +"kp c #c4a6d0", +"k2 c #c4abcc", +"ef c #c4acd8", +"hB c #c4c2d4", +"az c #c4c2d6", +"#R c #c4c2dc", +"im c #c4c3c4", +"f4 c #c4c4dc", +"mE c #c4c5c4", +"cT c #c4d2e6", +"gg c #c4d3e3", +"ai c #c58092", +"lz c #c58dda", +"lx c #c58fd7", +"af c #c596aa", +"bI c #c5aad5", +"#z c #c5c2dd", +"#v c #c5c3e1", +"bA c #c5c4d8", +"a4 c #c5c4da", +"gn c #c5c6ca", +"ev c #c5c7cf", +"c1 c #c5c8d2", +"c0 c #c5c9d5", +"b2 c #c5cbdb", +"dZ c #c5d2de", +"eu c #c5d6e2", +"e. c #c5d9e7", +"cg c #c6a7d6", +"lk c #c6becb", +"lL c #c6c1c8", +"#y c #c6c3df", +"#w c #c6c3e0", +"aI c #c6c4de", +"ct c #c6c5d8", +"#W c #c6c5e4", +"bY c #c6c6dd", +"dY c #c6c6e3", +"kw c #c78edb", +"ks c #c793d9", +"jW c #c7a5d2", +"#U c #c7a9d4", +"bN c #c7aed9", +"ce c #c7afd5", +"my c #c7bbca", +"mV c #c7beca", +"c# c #c7c0e0", +"#x c #c7c4e1", +"aJ c #c7c4e2", +"hD c #c7c6d5", +"hh c #c7c7c9", +"fc c #c7d3e6", +"ah c #c86672", +"jb c #c88edd", +"mO c #c899d8", +"fr c #c8c0d8", +"aQ c #c8c1e0", +"ay c #c8c4df", +"aj c #c8c4e3", +"kF c #c8c5c9", +"ba c #c8c5e3", +"aK c #c8c5e4", +"nd c #c8c6cb", +"bu c #c8c6e0", +"aR c #c8c6e5", +"d2 c #c8c7e4", +"mv c #c8c8c8", +"bv c #c8c8db", +"bC c #c8c8e6", +"hd c #c8cada", +"ha c #c8cadd", +"fq c #c8d2e5", +"kn c #c9becd", +"#s c #c9bed8", +"ni c #c9c2ca", +"k5 c #c9c3c9", +"jD c #c9c3cb", +"#X c #c9c5e4", +"kV c #c9c6cc", +"bB c #c9c6e3", +"#Y c #c9c6e5", +"mQ c #c9c9c9", +"cw c #c9c9dd", +"bZ c #c9cadf", +"a5 c #c9cbdd", +"fv c #c9ccd3", +"aG c #c9cce0", +"m1 c #cabccf", +"#r c #cac1d8", +"#t c #cac1db", +"#u c #cac4de", +"aL c #cac6e5", +"l. c #cac7cb", +"a3 c #cac7e5", +"#Z c #cac7e6", +"b3 c #cac8e4", +"aM c #cac8e7", +"jf c #cb92df", +"#S c #cbb6d8", +"aP c #cbc4e1", +"k8 c #cbc7cc", +"lE c #cbc7cd", +"j8 c #cbc8cc", +"b4 c #cbc8e6", +"bb c #cbc8e7", +"ao c #cbc9e8", +"bq c #cbc9e9", +"hC c #cbcada", +"mw c #cbcbcb", +"mu c #cbcccb", +".8 c #cbcddb", +"jo c #cc9edd", +"bG c #ccaadb", +"lG c #ccc8cd", +"kC c #ccc8ce", +"bt c #ccc8e7", +"a2 c #ccc8e8", +"c2 c #ccc9e3", +"cx c #ccc9e7", +"ap c #ccc9e8", +"bs c #ccc9e9", +"bc c #cccae8", +"es c #cccbe8", +"h2 c #cccccc", +"#C c #ccccdc", +"ik c #cccdcc", +"m3 c #cccdcd", +".9 c #cccddc", +"#. c #cccedb", +".7 c #cccfdc", +"b. c #ccd5e6", +"f9 c #ccd5ee", +"ci c #ccd8ee", +"fD c #ccd9ed", +"bL c #cda9dc", +"be c #cdabd9", +"ed c #cdc0e4", +"aO c #cdc6e3", +"cs c #cdc9e8", +"ar c #cdc9e9", +"gH c #cdcae8", +"aq c #cdcae9", +"as c #cdcaea", +"br c #cdcaeb", +"mx c #cdcccd", +"ac c #cdcce2", +"cy c #cdccea", +"fY c #cdcdcf", +"## c #cdcfdc", +"d9 c #cdd8ec", +"lW c #ce9ce1", +"iZ c #ceabdd", +"bM c #ceadde", +"bg c #ceb5db", +"mc c #cec8d0", +"aN c #cec9e5", +"cZ c #cecbe4", +"aS c #cecbea", +"bD c #cecce8", +"ds c #ceccea", +"aT c #cecceb", +"il c #cecece", +"#M c #cecee1", +"e# c #ced0e5", +"cu c #ced3e4", +"gv c #cf7682", +"bf c #cfafdc", +"mT c #cfc5d4", +"ey c #cfc9e4", +"cY c #cfc9ec", +"j1 c #cfcbd0", +"c3 c #cfcbe9", +"dt c #cfcce7", +"c4 c #cfcceb", +"aU c #cfccec", +"aV c #cfcded", +"dX c #cfceeb", +"h4 c #cfcfcf", +"cn c #cfcfea", +"cv c #cfd2db", +"dA c #d07f91", +"dz c #d09cb2", +"jl c #d0b6da", +"lj c #d0ccd1", +"bE c #d0ccea", +"bT c #d0ccec", +"dx c #d0cdeb", +"hG c #d0cfd0", +"e1 c #d0d0d2", +".6 c #d0d4e1", +"fB c #d18598", +"eY c #d19eb6", +"dM c #d1b1e0", +"bH c #d1b1e1", +"mH c #d1b3dc", +"kA c #d1b4db", +"do c #d1c2da", +"c5 c #d1c7e4", +"b9 c #d1ccea", +"c. c #d1cdec", +"aW c #d1cdee", +"ng c #d1cfd3", +"kG c #d1d1d1", +"lB c #d1d1d2", +"#a c #d1d3df", +"cO c #d1d6f1", +"dC c #d28596", +"eS c #d28c9e", +"eR c #d29cb3", +"jG c #d2afe1", +"eQ c #d2b3ce", +"j3 c #d2b6dc", +"cD c #d2bad4", +"lU c #d2c9d6", +"dy c #d2cae8", +"j4 c #d2ced4", +"d3 c #d2cfef", +"d. c #d2d0ed", +"mi c #d2d1d4", +"j9 c #d2d2d2", +"#5 c #d2d2df", +"ab c #d2d4ec", +"fQ c #d2d6ef", +"bz c #d2e4f1", +"lN c #d3aae1", +"jg c #d3b2df", +"ma c #d3b4dd", +"lF c #d3b5dd", +"k9 c #d3b5de", +"em c #d3bdd8", +"m7 c #d3ccd5", +"jB c #d3cfd5", +"bJ c #d3cfef", +"bl c #d3d0f1", +"aA c #d3d2e7", +"bO c #d3d2f2", +"ne c #d3d3d2", +"ix c #d3d3d3", +"fC c #d4a6bf", +"kD c #d4b6df", +"k7 c #d4b7de", +"bF c #d4bbe1", +"ea c #d4c3dd", +"l4 c #d4cfd7", +"cN c #d4cff3", +"kU c #d4d0d6", +"gG c #d4d1f1", +"hb c #d4d3e1", +"m6 c #d4d4d4", +"hc c #d4d4e2", +"e9 c #d4d7f4", +"dK c #d5b0e6", +"df c #d5b3e5", +"dg c #d5b6e4", +"bi c #d5c1e4", +"dd c #d5c3e2", +"bd c #d5c3e3", +"bj c #d5c6e5", +"kI c #d5c7db", +"gd c #d5c7e4", +"eD c #d5c8e6", +"dn c #d5cbea", +"kQ c #d5ced8", +"eT c #d5cfee", +"cM c #d5d0f2", +"jC c #d5d3d5", +"k6 c #d5d4d4", +"f8 c #d5d5f0", +"#Q c #d6373d", +"dB c #d66a78", +"er c #d68b9e", +"kS c #d6a7e6", +"fN c #d6a8bd", +"dL c #d6b2e5", +"b5 c #d6b7ce", +"eb c #d6c0de", +"l6 c #d6c5dd", +"mj c #d6c8db", +"eP c #d6c9e5", +"bk c #d6cbea", +"di c #d6cef0", +"cd c #d6d0f1", +"nb c #d6d3d7", +"fP c #d6d4f3", +"k. c #d6d5d7", +"fn c #d6d5f3", +"kz c #d6d6d6", +"#K c #d6d6ee", +"ky c #d6d7d7", +".5 c #d6dae9", +"#N c #d77d84", +"#o c #d797a1", +"dR c #d7a3ba", +"j6 c #d7b9e2", +"bK c #d7bde4", +"fm c #d7d4f3", +"gf c #d7d4f4", +"ge c #d7d4f5", +"na c #d7d6d7", +"#J c #d7d7f0", +"#L c #d7d8f0", +"a6 c #d7daf2", +"b0 c #d7ddea", +"aF c #d7e1f9", +"ga c #d87a8b", +"lD c #d8bbe2", +"b8 c #d8bcd4", +"jv c #d8bce2", +"f5 c #d8c6e3", +"d8 c #d8c8e7", +"bh c #d8cbe8", +"#n c #d8d0e4", +"gF c #d8d3f2", +"cL c #d8d3f4", +"fl c #d8d4f5", +"fk c #d8d4f6", +"gE c #d8d5f4", +"eh c #d8d7f6", +"hg c #d8d8d7", +"l# c #d8d8d8", +"mX c #d8d8d9", +"lM c #d8d9d8", +"mW c #d8d9d9", +"#b c #d8d9e8", +"jO c #d9b1e8", +"k3 c #d9bfe2", +"dD c #d9c8e6", +"k0 c #d9cade", +"fO c #d9d4f6", +"fj c #d9d5f7", +"fi c #d9d6f7", +"kH c #d9d9d9", +"aB c #d9dbf3", +"bw c #d9dcf3", +"b1 c #d9e2ec", +"#p c #da6569", +"cI c #dac3df", +"mU c #dad0de", +"cK c #dad4f4", +"dI c #dad4f8", +"kY c #dad5de", +"eO c #dad6f7", +"ku c #dad7dc", +"j2 c #dadada", +"#i c #dadae9", +"gc c #db5059", +"gb c #db6270", +"g# c #dba1b8", +"b7 c #dba6bd", +"m# c #dbbee5", +"jz c #dbbee6", +"kb c #dbd3de", +"cJ c #dbd5f5", +"fI c #dbd9f9", +".E c #dbdae9", +"#j c #dbdaf2", +"gQ c #dbdbdb", +"#m c #dbe0f7", +"dW c #dc99ab", +"gy c #dcb3cb", +"kM c #dcb9e9", +"dh c #dcc0e9", +"g. c #dcd8fa", +"ec c #dcd9fb", +"jS c #dcdadc", +"md c #dcdade", +".Y c #dcdaf1", +"nf c #dcdcdd", +"#I c #dce0ed", +"aa c #dce3f8", +"gw c #dd5c64", +"lJ c #ddbde8", +"de c #ddcdef", +"f7 c #ddd0ef", +"jx c #ddd9df", +"#7 c #dddbf5", +"h3 c #dddddd", +"#k c #ddddf5", +"#l c #dddff9", +"b6 c #de97a7", +"iT c #debdec", +"#6 c #dedcf2", +".X c #dedee8", +"#c c #dee1f1", +".4 c #dee2f4", +"dJ c #dfc7ec", +"gD c #dfc8e6", +"eN c #dfcbe8", +"lc c #dfd5e2", +"lf c #dfdedf", +".Z c #dfdff8", +"a9 c #dff4fd", +"eV c #e04249", +"fh c #e08798", +"mf c #e0c2eb", +"i5 c #e0c5e8", +"gz c #e0c6e1", +".F c #e0def6", +".0 c #e0dff9", +"m0 c #e0e0e0", +".m c #e0e0ec", +".n c #e0e1f2", +".1 c #e0e2fb", +"aE c #e0f0f4", +"eU c #e18c9c", +"jc c #e1c5e8", +"i8 c #e1c5eb", +"m4 c #e1dae3", +"mq c #e1e0e0", +"lC c #e1e1e1", +".3 c #e1e7fa", +"i2 c #e2c2ed", +"jU c #e2d5e7", +"#F c #e2e1f8", +"j5 c #e2e2e2", +".2 c #e2e2fa", +"by c #e2eced", +"#O c #e32729", +"e8 c #e34b53", +"f6 c #e3c3de", +"jI c #e3c4ee", +"jZ c #e3c6ee", +".G c #e3e1fa", +".H c #e3e2fb", +"mB c #e3e3e2", +"ln c #e3e3e3", +".c c #e3e7ed", +"bx c #e3e9ef", +"eW c #e42f34", +"dS c #e49fb2", +"gC c #e4b3ca", +"eJ c #e4c2dc", +"jL c #e4dfe6", +"i4 c #e4e0e6", +"jq c #e4e1e6", +".I c #e4e4fc", +"kq c #e4e5e4", +".b c #e4e7ed", +"#8 c #e4eafb", +"a# c #e4ebed", +"e5 c #e52e32", +"dH c #e53d43", +"#D c #e5e4f7", +"kj c #e5e5e4", +"la c #e5e5e5", +".V c #e5e5f0", +".B c #e5e6ed", +".J c #e5e6fd", +".i c #e5e9ed", +".h c #e5e9ee", +"cE c #e694a1", +"dj c #e6aec5", +"mr c #e6ceee", +".Q c #e6e5fd", +"jX c #e6e7e6", +".a c #e6e7ec", +".P c #e6e7fd", +"#h c #e6e8f9", +"#d c #e6e8fb", +".O c #e6e8fc", +".K c #e6e8fd", +".d c #e6eaf1", +"c9 c #e7373c", +"eM c #e7afc6", +"lg c #e7dcea", +"#E c #e7e5f8", +"ju c #e7e6e6", +"lw c #e7e7e7", +".j c #e7e8ec", +".L c #e7eafd", +"aD c #e7ecec", +"a7 c #e7f0fa", +"aC c #e7f0fd", +"#P c #e81b1b", +"cz c #e8656f", +"kv c #e8e5e9", +".N c #e8e9fd", +".M c #e8eafd", +".o c #e8ebfc", +".e c #e8ecf2", +".f c #e8edf2", +".g c #e8edf3", +"#G c #e8eef3", +"eX c #e92527", +"gx c #e9555d", +"dm c #e994a6", +"gB c #e998ab", +"iz c #e9d6ef", +"iQ c #e9d6f2", +"iJ c #e9d9f0", +"me c #e9e2eb", +"i7 c #e9e4eb", +".R c #e9e8fd", +"m. c #e9e9e9", +"#f c #e9e9fc", +"dE c #ea4046", +"d7 c #ea8998", +"d4 c #ea8d9a", +"kr c #eaeaea", +".C c #eaeaed", +".k c #eaeaee", +"#g c #eaeafc", +".# c #eaebed", +".s c #eaecfd", +".t c #eaedfd", +".p c #eaedfe", +"dl c #eb7a89", +"eL c #eb96a9", +"lb c #ebeaeb", +"#e c #ebeafd", +"l5 c #ebebeb", +".W c #ebecef", +".r c #ebecfe", +".q c #ebedfe", +".u c #ebeefe", +"#9 c #ebeff2", +"en c #ec7c89", +"kZ c #ecebeb", +".D c #ecebee", +".l c #ecebef", +"jy c #ececec", +".A c #ecedf5", +".v c #eceffe", +"dF c #ed1e1f", +"d6 c #ed6a74", +"cH c #ed7884", +"gA c #ed8e9f", +"lo c #eddcf2", +"lH c #edeced", +"jm c #ededed", +".w c #edf0fe", +"iG c #eeddf5", +"iM c #eedff4", +"iH c #eee6f1", +".S c #eef0fe", +"iN c #efe0f4", +".U c #efeefd", +"a8 c #eff1f0", +".T c #eff1fe", +".x c #eff2fe", +".y c #eff4ff", +"ei c #f05760", +"dk c #f06a74", +"dN c #f0707d", +"iD c #f0dff6", +"mF c #f0f0f0", +".z c #f0f3fd", +"dc c #f12224", +"c6 c #f1373a", +"d5 c #f15359", +"fd c #f18391", +"eK c #f18796", +"kk c #f1e4f5", +"iX c #f1e6f4", +"jM c #f1f0f0", +"kc c #f1f0f1", +"dG c #f21d1d", +"eC c #f22224", +"cC c #f22527", +"cG c #f25761", +"iV c #f2f0f2", +"jH c #f2f1f1", +"jY c #f2f3f1", +"iO c #f3e9f6", +"iI c #f3edf6", +"kL c #f3f2f3", +"jT c #f3f3f3", +"#H c #f3f3f4", +"ej c #f41f21", +"el c #f42424", +"dV c #f4454b", +"cF c #f4464c", +"d# c #f44f57", +"ji c #f4ebf7", +"ke c #f4eff7", +"lI c #f4f5f4", +"cA c #f51315", +"cB c #f51616", +"iL c #f5eef8", +"jd c #f5f5f6", +"jh c #f5f6f6", +"c7 c #f61719", +"eq c #f61d1e", +"dU c #f62b2f", +"fJ c #f65960", +"iR c #f6f3f6", +"iK c #f6f4f7", +"i0 c #f6f6f6", +"a. c #f6f6f7", +"dT c #f7292b", +"iE c #f7f1f9", +"iC c #f7f1fa", +"jr c #f7f2fa", +"jn c #f7f7f7", +"e6 c #f81819", +"ek c #f81e20", +"ez c #f8383e", +"iy c #f8f2fa", +"je c #f8f4fa", +"ep c #f91618", +"eo c #f9181a", +"c8 c #f91b1d", +"dQ c #f91d1e", +"iF c #f9f5fa", +"iP c #f9f7fa", +"kd c #f9f9f9", +"eA c #fa1214", +"da c #fa1417", +"db c #fa1619", +"e7 c #fa1e1e", +"fM c #fa1e20", +"fe c #fb1517", +"eB c #fb1619", +"lV c #fbf9fc", +"iW c #fbfbfa", +"dP c #fc1416", +"dO c #fc1517", +"fK c #fc191c", +"fL c #fc1a1b", +"kR c #fcfbfb", +"iA c #fcfcfb", +"ff c #fd1317", +"fg c #fd1d1f", +"jN c #fdfcfd", +"iS c #fdfdfc", +"i1 c #fdfdfd", +"iB c #fefefd", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.#.a.b.c.d.e.f.g.f.h.i.j.kQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQt.l.m.n.o.p.q.r.r.s.t.u.v.w.x.y.z.A.B.CQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQt.D.E.F.G.G.H.H.I.J.K.L.L.M.N.O.P.Q.R.S.T.U.V.WQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQt.X.Y.Z.0.1.2.3.4.5.6.7.8.9#.###a#b#c#d#e#f#g#g#h.bQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQt#i#j#k#l#m#n#o#p#q#r#s#t#u#v#w#x#y#z#A#B#C#i#D#E#F.O#G#HQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQt#I#J#K#L#M#N#O#P#Q#R#S#T#U#V#W#X#Y#Y#Z#0#1#2#3#4#5#6#7#8#9a.QtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQta#aaabacadaeafagahaiajakalamanaoapaqarasatauavawaxayazaAaBaCaDQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtaEaFaGaHaIaJaKaL#ZaMaNaOaPaQaRaSaTaUaVaWaXaYaZa0a1a2a3a4a5a6a7a8QtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQta9b.b#baba#YbbbbapbcbdbebfbgaqbhbibjbkblbmbnbobpbqbrbsbtbubvbwbxQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtbybzbAbBbCbbaobcaqbDbEbFbGbHbIbJbKbLbMbNbObPbQbRbSbTbUbVbWbXbYbZb0QtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtb1b2b3b4apb5b6b7b8b9c.c#cacbcccdcecfcgchcicjckclcmcncocpcqcrcsctcuQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtcvcwcxaqcyczcAcBcCcDcEcFcGcHcIcJcKcLcMcNcOcPcQcRcScTcUcVcWcXcYcZc0QtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtc1c2c3c4c5c6c7c8c9d.d#dadbdcdddedfdgdhdidjdkdldmcIdndodpdqdrdsdtduQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtdvdwdxdxdydzdAdBdCdDdEdFdGdHdIdJdKdLdMcNdNdOdPdQdRdSdTdUdVdWdXdYdZQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtd0d1d2d3d4d5d6d7d8d9e.e#eaebecedeeefegeheiejekelemeneoepeqereseteuQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtevewexeyezeAeBeCeDeEeFeGeHeIeJeKeLeMeNeOePeQeReSeTeUeVeWeXeYeZe0dZQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQte1e2e3e4e5e6e7e8e9f.f#fafbfcfdfefffgfhfifjfkflfmfnfofpfqfrfsftfufvQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtfwfxfyfzfAfBfCfDfEfFfGfHfIfJfKfLfMfNfOflflflfPfQfRfSfTfUfVfWfXQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtfYfZf0f1f2f3f4f5f6f7f8f9g.g#gagbgcgdgegfgfgfgfggghgigjgkglgmgnQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtgogpgqgrgsgtgugvgwgxgygzgAgBgCgDgEgFgGgHgIgJgKgLgMgNgOgmgPgQQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtgRgSgTgUgVgWgXgYgZg0g1g2g3g4g5g6g7g8g9h.h#hahbhchdhehfhgQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQthhhihjhkhlhmhnhohphqhrhshthuhvhwhxhyhzhAhBhChDhEhFhgQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQthGhHhIhJhKhLhMhNhOhPhQhRhShThUhVhWhXhYhZh0h1h2h3QtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQth4h5h6h7h8h9i.i#iaibicidieifigihiiijikhgQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtiliminioipiqirisitiuiviwh2ixh3QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtiyiziAQtiBiCiDiEQtQtQtQtiFiGiHiIiJiKQtiLiMiMiNiOiPQtQtQtQtQtQtQtiQiRQtQtQtQtQtQtQt", +"QtQtQtQtQtQtiSiTiUiVQtiWiXiYiZi0QtQti1i2i3i4i5i6i7i0i8i9j.j#jajbjcjdQtQtQtQtjejfjgjhQtQtQtQtQtQt", +"QtQtQtQtQtQtjijjjkjljmQtjnjojpjqQtQtjrjsjtjujvjwjxjyjzjAjBjCjDjEjFjGjHQtQti1jIjJjKjLjMQtQtQtQtQt", +"QtQtQtQtQtjNjOjPjQjRjSQtjTjUjVjWjXjYjZj0j1j2j3jwj4j5j6j7j8h4j9k.k#kakbkckdkekfkgkhkikjQtQtQtQtQt", +"QtQtQtQtQtkkklkmknkokpkqQtkrksktkukvkwkxkykzkAkBkCgQkDkEkFkGkHh3kIkJkKjXkLkMkNe1kOkPkQjyQtQtQtQt", +"QtQtQtQtkRkSkTkUkVkWkXkYQtkZk0k1k2k3k4k5k6j2k7kBk8kHk9kEl.l#lalblcldlelflglhliljlklllmlnQtQtQtQt", +"QtQtQtQtlolplqlrlsltlulvj5QtlwlxlylzlAlBQtlClDkBlEkHlFkElGh3lHlIlJlKlLlMlNlOlPlQlRlSlTlUlbQtQtQt", +"QtQtQtlVlWlXlYlZl0l1l2l3l4Qtl5l6l7l8l9ilQtm.m#kBlEkHmambmcmdmemfmgmhmimjmkmlmmmnl0mokPmpmqQtQtQt", +"QtQtQtmrmsmtmumvmwmxmymzmAmBQtlamCmDmEkGQtmFjzmGlEkHmHmImJmKmLmMmNmimimOmPh4mQmQh2mwmRmSmTl5QtQt", +"QtQtQtmUmVmWQtQtQtQtmXmYmZm0Qtjym1m2m3QtQtQtm4m5m6Qtm7m8m9n.n#nakyQtnbncndneQtQtQtnfngnhniQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt"}; --- avida-2.0b7.orig/debian/avida-base.files +++ avida-2.0b7/debian/avida-base.files @@ -0,0 +1,4 @@ +/usr/bin/avida-primitive +/usr/share/doc/avida/data/* +/usr/share/doc/avida/html/* +/usr/share/doc/avida/html/glossary/* --- avida-2.0b7.orig/debian/copyright +++ avida-2.0b7/debian/copyright @@ -0,0 +1,27 @@ +This package was debianized by Miriam Ruiz on +Fri, 26 Nov 2004 14:18:07 +0100. + +It was downloaded from http://dllab.caltech.edu/avida/ + +Copyright Holder: California Institute of Technology + +Copyright (C) 1993 - 2003 California Institute of Technology + +License: + + This package 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; version 2 dated June, 1991. + + This package 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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. --- avida-2.0b7.orig/debian/control +++ avida-2.0b7/debian/control @@ -0,0 +1,45 @@ +Source: avida +Section: science +Priority: optional +Maintainer: Miriam Ruiz +Build-Depends: debhelper (>= 4.0.0), autotools-dev, libncurses5-dev, libqt3-mt-dev, qt3-dev-tools, libqt3-headers, libqt3-compat-headers +Standards-Version: 3.6.2 + +Package: avida-base +Architecture: any +Depends: ${shlibs:Depends} +Description: Auto-adaptive genetic system for Artificial Life research + Avida is an auto-adaptive genetic system designed + primarily for use as a platform in Digital or + Artificial Life research. In lay terms, Avida is a + digital world in which simple computer programs + mutate and evolve. + . + Avida allows us to study questions and perform + experiments in evolutionalry dynamics and + theoretical biology that are intractable in real + biological system. + . + Homepage http://dllab.caltech.edu/avida/ + +Package: avida-viewer +Architecture: any +Depends: ${shlibs:Depends}, avida-base (= ${Source-Version}) +Description: ncurses viewer for avida + avida-viewer is a text viewer for the + auto-adaptive genetic system Avida. Avida is a + digital world in which simple computer programs + mutate and evolve. + . + Homepage http://dllab.caltech.edu/avida/ + +Package: avida-qt-viewer +Architecture: any +Depends: ${shlibs:Depends}, avida-base (= ${Source-Version}) +Description: qt viewer for avida + avida-qt-viewer is a graphics viewer for the + auto-adaptive genetic system Avida. Avida is a + digital world in which simple computer programs + mutate and evolve. + . + Homepage http://dllab.caltech.edu/avida/ --- avida-2.0b7.orig/debian/rules +++ avida-2.0b7/debian/rules @@ -0,0 +1,94 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +config.status: configure + dh_testdir + CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --exec-prefix=/usr --enable-standard-prefix --prefix=/usr/share --datadir=/usr/share/avida/ --mandir=/usr/share/man --infodir=/usr/share/info --program-prefix="avida-" --enable-viewer --enable-qt-viewer QTDIR=/usr/share/qt3 --includedir=/usr/include/qt3/ + + +build: build-stamp + +build-stamp: config.status + dh_testdir + +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + + $(MAKE) + #docbook-to-man debian/avida.sgml > avida.1 + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + rm -fr source/main/functional_testsuites/{default.md5sum,default.tail,tedious.tail}/CVS + -rm -f config.sub config.guess config.log + -$(MAKE) distclean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install DESTDIR=$(CURDIR)/debian/avida-base + dh_installdirs -pavida-viewer usr/bin + mv $(CURDIR)/debian/avida-base/usr/bin/avida-viewer $(CURDIR)/debian/avida-viewer/usr/bin/ + dh_installdirs -pavida-qt-viewer usr/bin + dh_install -pavida-qt-viewer source/qt-viewer/avida-qt-viewer usr/bin + dh_installdirs -pavida-qt-viewer usr/share/pixmaps + dh_install -pavida-qt-viewer debian/avida.xpm usr/share/pixmaps + dh_link -pavida-base usr/share/avida/doc_html usr/share/doc/avida/html + dh_installdirs -pavida-qt-viewer usr/share/applications + dh_install -pavida-qt-viewer debian/avida-qt-viewer.desktop usr/share/applications + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples + dh_installmenu + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- avida-2.0b7.orig/debian/docs +++ avida-2.0b7/debian/docs @@ -0,0 +1,2 @@ +NEWS +README --- avida-2.0b7.orig/debian/source.lintian-overrides +++ avida-2.0b7/debian/source.lintian-overrides @@ -0,0 +1,7 @@ +# Upstream distributes it like this, repacking would be overkill though, so +# tell lintian to not complain. +# See http://lists.debian.org/debian-lint-maint/2004/07/msg00187.html + +avida source: source-contains-CVS-dir source/main/functional_testsuites/default.md5sum/CVS +avida source: source-contains-CVS-dir source/main/functional_testsuites/default.tail/CVS +avida source: source-contains-CVS-dir source/main/functional_testsuites/tedious.tail/CVS --- avida-2.0b7.orig/debian/avida-base.manpages +++ avida-2.0b7/debian/avida-base.manpages @@ -0,0 +1,2 @@ +debian/avida.1 +debian/avida-primitive.1 --- avida-2.0b7.orig/debian/avida-viewer.file +++ avida-2.0b7/debian/avida-viewer.file @@ -0,0 +1 @@ +/usr/bin/avida-viewer --- avida-2.0b7.orig/debian/avida-qt-viewer.files +++ avida-2.0b7/debian/avida-qt-viewer.files @@ -0,0 +1 @@ +/usr/bin/avida-qt-viewer --- avida-2.0b7.orig/debian/avida-primitive.1 +++ avida-2.0b7/debian/avida-primitive.1 @@ -0,0 +1 @@ +.so man1/avida.1 --- avida-2.0b7.orig/debian/avida-qt-viewer.1 +++ avida-2.0b7/debian/avida-qt-viewer.1 @@ -0,0 +1,68 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.TH "AVIDA" "1" "noviembre 23, 2004" "" "" +.SH "NAME" +avida \- Auto\-adaptive genetic system for Artificial Life research +.SH "SYNOPSIS" +.B avida\-qt\-viewer +.SH "DESCRIPTION" +This is the graphical viewer for the Avida auto\-adaptive genetic system. + +The Avida system is based on concepts similar to those employed +by the tierra program developed by Tom Ray. In lay terms, Avida +is a digital world in which simple computer programs mutate and +evolve. More technically, it is a population of self\-reproducing +strings with a Turing\-complete genetic basis subjected to +Poisson\-random mutations. The population adapts to the combination +of an intrinsic fitness landscape (self\-reproduction) and an +externally imposed (extrinsic) fitness function provided by the +researcher. +.PP +By studying this system, one can examine evolutionary adaptation, +general traits of living systems (such as self\-organization), and +other issues pertaining to theoretical or evolutionary biology and +dynamic systems. The power of Avida is that it gives us a +controllable digital system in which to study the theories of +evolutionary biology. Often, we can study elements of evolutionary +theory that are difficult or impossible in biological systems. +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. +.SH "USAGE" +Make a new working directory for the experiment you want to run, and put the starting data in it. You can copy standard starting data and modify it with: + +cp /usr/share/avida/* . \-r + +You can run the program from inside that directory, or select your working directory once started. +.SH "AUTHOR" +Avida is a joint project of the Digital Life Laboratory, headed +by Chris Adami, at the California Institute of Technology +(http://dllab.caltech.edu/) and Richard Lenski's Microbial +Evolution laboratory at Michigan State university +(http://www.msu.edu/~lenski/). +For more info on these groups or their research, please visit +the links above. +.PP +This manual page was written by Miriam Ruiz , +for the Debian project (but may be used by others). +.SH "SEE ALSO" +There is a directory with some starting data you can use as a base +for your research in /usr/share/doc/alive/data/. +You just have to copy the contents of that directory wherever you +want and start running avida\-viewer there. +You can find HTML documentation about avida in +/usr/share/doc/alive/html/. --- avida-2.0b7.orig/debian/avida-viewer.1 +++ avida-2.0b7/debian/avida-viewer.1 @@ -0,0 +1,102 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.TH "AVIDA" "1" "noviembre 23, 2004" "" "" +.SH "NAME" +avida \- Auto\-adaptive genetic system for Artificial Life research +.SH "SYNOPSIS" +.B avida\-viewer +.RI [ options ] +.SH "DESCRIPTION" +This is the text\-screen viewer for the Avida auto\-adaptive genetic system. + +Avida is an auto\-adaptive genetic system designed primarily +for use as a platform in Digital or Artificial Life research. +The Avida system is based on concepts similar to those employed +by the tierra program developed by Tom Ray. In lay terms, Avida +is a digital world in which simple computer programs mutate and +evolve. More technically, it is a population of self\-reproducing +strings with a Turing\-complete genetic basis subjected to +Poisson\-random mutations. The population adapts to the combination +of an intrinsic fitness landscape (self\-reproduction) and an +externally imposed (extrinsic) fitness function provided by the +researcher. +.PP +By studying this system, one can examine evolutionary adaptation, +general traits of living systems (such as self\-organization), and +other issues pertaining to theoretical or evolutionary biology and +dynamic systems. The power of Avida is that it gives us a +controllable digital system in which to study the theories of +evolutionary biology. Often, we can study elements of evolutionary +theory that are difficult or impossible in biological systems. +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. +.SH "OPTIONS" +.TP +\fB\-g[enesis] \fR +Set genesis file to be +.TP +\fB\-h[elp]\fR +Help on options (this listing) +.TP +\fB\-e[vents]\fR +Print a list of all known events +.TP +\fB\-s[eed] \fR +Set random seed to +.TP +\fB\-viewer \fR +Sets Viewer to +.TP +\fB\-v[ersion]\fR +Prints the version number +.TP +\fB\-set \fR +Overide the genesis file +.TP +\fB\-l[oad] \fR +Load a clone file +.TP +\fB\-loadpop \fR +Load a saved population file (precedence over load) +.TP +\fB\-a[nalyze]\fR +Process analyze.cfg instead of normal run. +.SH "USAGE" +Make a new working directory for the experiment you want to run, and put the starting data in it. You can copy standard starting data and modify it with: + +cp /usr/share/avida/* . \-r + +You should run the program from inside that directory. +.SH "AUTHOR" +Avida is a joint project of the Digital Life Laboratory, headed +by Chris Adami, at the California Institute of Technology +(http://dllab.caltech.edu/) and Richard Lenski's Microbial +Evolution laboratory at Michigan State university +(http://www.msu.edu/~lenski/). +For more info on these groups or their research, please visit +the links above. +.PP +This manual page was written by Miriam Ruiz , +for the Debian project (but may be used by others). +.SH "SEE ALSO" +There is a directory with some starting data you can use as a base +for your research in /usr/share/doc/alive/data/. +You just have to copy the contents of that directory wherever you +want and start running avida\-viewer there. +You can find HTML documentation about avida in +/usr/share/doc/alive/html/. --- avida-2.0b7.orig/debian/avida-qt-viewer.manpages +++ avida-2.0b7/debian/avida-qt-viewer.manpages @@ -0,0 +1 @@ +debian/avida-qt-viewer.1 --- avida-2.0b7.orig/debian/avida-viewer.manpages +++ avida-2.0b7/debian/avida-viewer.manpages @@ -0,0 +1 @@ +debian/avida-viewer.1