Commit in slic on MAIN
VERSION+1-11.90 -> 1.91
configure+407-2201.115 -> 1.116
configure.ac+2-21.102 -> 1.103
include/PackageInfo.hh+3-31.74 -> 1.75
config/doxygen/slic_doxygen.cfg+1-11.33 -> 1.34
+414-227
5 modified files
JM: update for SLIC v2r6p0
slic
VERSION 1.90 -> 1.91
diff -u -r1.90 -r1.91
--- VERSION	28 Jul 2009 22:34:35 -0000	1.90
+++ VERSION	7 Aug 2009 20:10:43 -0000	1.91
@@ -1 +1 @@

-SLIC v2r5p6

+SLIC v2r6p0
slic
configure 1.115 -> 1.116
diff -u -r1.115 -r1.116
--- configure	28 Jul 2009 22:34:35 -0000	1.115
+++ configure	7 Aug 2009 20:10:43 -0000	1.116
@@ -1,11 +1,10 @@

 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.

-# Generated by GNU Autoconf 2.57 for SLIC v2r5p6.

+# Generated by GNU Autoconf 2.59 for SLIC v2r6p0.

 #
 # Report bugs to <[log in to unmask]>.
 #

-# 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.
 ## --------------------- ##

@@ -22,9 +21,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

@@ -43,7 +43,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

@@ -220,16 +220,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

@@ -268,8 +269,8 @@

 # Identity of this package.
 PACKAGE_NAME='SLIC'
 PACKAGE_TARNAME='slic'

-PACKAGE_VERSION='v2r5p6'
-PACKAGE_STRING='SLIC v2r5p6'

+PACKAGE_VERSION='v2r6p0'
+PACKAGE_STRING='SLIC v2r6p0'

 [log in to unmask]
 
 ac_unique_file="slic.cc"

@@ -670,7 +671,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

@@ -710,10 +711,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; }

@@ -788,7 +789,7 @@

   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF

-\`configure' configures SLIC v2r5p6 to adapt to many kinds of systems.

+\`configure' configures SLIC v2r6p0 to adapt to many kinds of systems.

 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 

@@ -813,9 +814,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

@@ -845,7 +846,7 @@

 
 if test -n "$ac_init_help"; then
   case $ac_init_help in

-     short | recursive ) echo "Configuration of SLIC v2r5p6:";;

+     short | recursive ) echo "Configuration of SLIC v2r6p0:";;

    esac
   cat <<\_ACEOF
 

@@ -929,12 +930,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.

@@ -945,7 +979,7 @@

       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

@@ -958,11 +992,10 @@

 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF

-SLIC configure v2r5p6
-generated by GNU Autoconf 2.57

+SLIC configure v2r6p0
+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.
 _ACEOF

@@ -973,8 +1006,8 @@

 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 

-It was created by SLIC $as_me v2r5p6, which was
-generated by GNU Autoconf 2.57.  Invocation command line was

+It was created by SLIC $as_me v2r6p0, which was
+generated by GNU Autoconf 2.59.  Invocation command line was

 
   $ $0 $@
 

@@ -1051,19 +1084,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.

@@ -1097,12 +1130,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;
 }

@@ -1131,7 +1164,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

@@ -1150,7 +1183,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

@@ -1230,7 +1263,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"

@@ -1247,13 +1280,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.

@@ -1427,7 +1460,6 @@

   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF

-#line $LINENO "configure"

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext

@@ -1447,8 +1479,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

@@ -1468,23 +1500,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

@@ -1558,8 +1590,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

@@ -1584,7 +1616,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

@@ -1635,7 +1666,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

@@ -1655,11 +1685,21 @@

 _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=$?

@@ -1672,7 +1712,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

@@ -1688,7 +1728,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

@@ -1705,11 +1744,21 @@

 _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=$?

@@ -1722,7 +1771,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

@@ -1742,8 +1791,7 @@

   fi
 fi
 for ac_declaration in \

-   ''\
-   '#include <stdlib.h>' \

+   '' \

    '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 ();' \

@@ -1751,14 +1799,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 <stdlib.h>

 $ac_declaration

+#include <stdlib.h>

 int
 main ()
 {

@@ -1769,11 +1816,21 @@

 _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=$?

@@ -1786,9 +1843,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

@@ -1805,11 +1861,21 @@

 _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=$?

@@ -1821,7 +1887,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

@@ -2181,7 +2247,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

@@ -2201,11 +2266,21 @@

 _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=$?

@@ -2218,7 +2293,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

@@ -2234,7 +2309,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

@@ -2251,11 +2325,21 @@

 _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=$?

@@ -2268,7 +2352,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

@@ -2295,7 +2379,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

@@ -2323,6 +2406,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);};

@@ -2349,11 +2442,21 @@

   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=$?

@@ -2366,7 +2469,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

@@ -2394,19 +2497,28 @@

 _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 <stdlib.h>' \

+   '' \

    '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 ();' \

@@ -2414,14 +2526,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 <stdlib.h>

 $ac_declaration

+#include <stdlib.h>

 int
 main ()
 {

@@ -2432,11 +2543,21 @@

 _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=$?

@@ -2449,9 +2570,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

@@ -2468,11 +2588,21 @@

 _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=$?

@@ -2484,7 +2614,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

@@ -2498,7 +2628,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'

@@ -2508,7 +2638,7 @@

 #AC_PROG_INSTALL
 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

@@ -2565,7 +2695,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

@@ -2576,7 +2705,7 @@

 #else
 # include <assert.h>
 #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

@@ -2588,6 +2717,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

@@ -2608,7 +2738,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

@@ -2626,6 +2755,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

@@ -2672,7 +2802,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

@@ -2683,7 +2812,7 @@

 #else
 # include <assert.h>
 #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

@@ -2695,6 +2824,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

@@ -2715,7 +2845,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

@@ -2733,6 +2862,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

@@ -2793,7 +2923,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

@@ -2814,11 +2943,21 @@

 _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=$?

@@ -2831,12 +2970,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

@@ -2858,7 +2996,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

@@ -2883,7 +3020,6 @@

   :
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line $LINENO "configure"

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext

@@ -2895,9 +3031,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
 

@@ -2908,7 +3044,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);
 }

@@ -2933,7 +3069,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
[truncated at 1000 lines; 464 more skipped]
slic
configure.ac 1.102 -> 1.103
diff -u -r1.102 -r1.103
--- configure.ac	28 Jul 2009 22:34:35 -0000	1.102
+++ configure.ac	7 Aug 2009 20:10:43 -0000	1.103
@@ -1,4 +1,4 @@

-# $Header: /cvs/lcd/slic/configure.ac,v 1.102 2009/07/28 22:34:35 jeremy Exp $

+# $Header: /cvs/lcd/slic/configure.ac,v 1.103 2009/08/07 20:10:43 jeremy Exp $

 #
 # Process this file with autoconf to produce a configure script for SLIC.
 #

@@ -18,7 +18,7 @@

 AC_PREREQ(2.57)
 
 AC_INIT(SLIC,

-	v2r5p6,

+	v2r6p0,

 	[log in to unmask])
 
 AC_CONFIG_SRCDIR([slic.cc])
slic/include
PackageInfo.hh 1.74 -> 1.75
diff -u -r1.74 -r1.75
--- PackageInfo.hh	28 Jul 2009 22:34:35 -0000	1.74
+++ PackageInfo.hh	7 Aug 2009 20:10:44 -0000	1.75
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/include/PackageInfo.hh,v 1.74 2009/07/28 22:34:35 jeremy Exp $

+// $Header: /cvs/lcd/slic/include/PackageInfo.hh,v 1.75 2009/08/07 20:10:44 jeremy Exp $

 #ifndef SLIC_PACKAGE_INFO_HH
 #define SLIC_PACKAGE_INFO_HH 1
 

@@ -12,7 +12,7 @@

 
     static std::string& getVersionString()
     {

-      static std::string ver_str = "v2r5p6";

+      static std::string ver_str = "v2r6p0";

       return ver_str;
     }
 

@@ -42,7 +42,7 @@

 
     static std::string& getChangeDateString()
     {

-      static std::string inst_str = "Tue Jul 28 15:34:34 PDT 2009";

+      static std::string inst_str = "Fri Aug  7 13:10:41 PDT 2009";

       return inst_str;
     }
slic/config/doxygen
slic_doxygen.cfg 1.33 -> 1.34
diff -u -r1.33 -r1.34
--- slic_doxygen.cfg	28 Jul 2009 22:34:35 -0000	1.33
+++ slic_doxygen.cfg	7 Aug 2009 20:10:44 -0000	1.34
@@ -1,5 +1,5 @@

 PROJECT_NAME           = "Simulator for the Linear Collider"

-PROJECT_NUMBER         = v2r5p6

+PROJECT_NUMBER         = v2r6p0

 OUTPUT_DIRECTORY       = $(SLIC_BASE)/doc
 OUTPUT_LANGUAGE        = English
 BRIEF_MEMBER_DESC      = YES
CVSspam 0.2.8