SimDist
diff -u -r1.6 -r1.7
--- aclocal.m4 30 Nov 2005 01:11:18 -0000 1.6
+++ aclocal.m4 30 Nov 2005 21:51:35 -0000 1.7
@@ -1,3 +1,4 @@
+dnl macro to add .in files for each package
AC_DEFUN(MAKE_CONFIG_FILES_LIST, [
if test -z "${packages_list}"; then
@@ -7,28 +8,28 @@
for p in $(echo ${packages_list})
do
- # Makefile
+ dnl Makefile
SIM_ADD_CONFIG_FILE(packages/$p/GNUmakefile)
- # variables for the build system
+ dnl variables for the build system
SIM_ADD_CONFIG_FILE(packages/$p/package.gmk)
- # vars required by the package itself (e.g. SLIC_BASE)
+ dnl vars required by the package itself (e.g. SLIC_BASE)
SIM_ADD_CONFIG_FILE(packages/$p/env.gmk)
- # download script if exists
+ dnl download script if exists
if test -e "$sim_packages_dir/$p/${download_script}.in"
then
SIM_ADD_CONFIG_FILE(packages/$p/${download_script})
fi
- # cvs script if exists
+ dnl cvs script if exists
if test -e "$sim_packages_dir/$p/${cvs_script}.in"
then
SIM_ADD_CONFIG_FILE(packages/$p/${cvs_script})
fi
- # patch script if exists
+ dnl patch script if exists
if test -e "$sim_packages_dir/$p/${patch_script}.in"
then
SIM_ADD_CONFIG_FILE(packages/$p/${patch_script})
@@ -38,6 +39,7 @@
])
+dnl macro to add a file to the list of .in files
AC_DEFUN(SIM_ADD_CONFIG_FILE, [
#echo "add config file: $1"
@@ -51,40 +53,62 @@
])
+dnl macro to check for necessary installation/build programs
AC_DEFUN(SIM_CHECK_PROGS, [
-# make
+dnl make
AC_PROG_MAKE_SET
-# g++
+dnl g++
AC_PROG_CXX
-# cvs
+dnl cvs
AC_CHECK_PROG(have_cvs, cvs, yes, no)
if test $have_cvs == "no"
then
AC_MSG_ERROR(cvs not found)
+else
+ CVS=cvs
+ AC_SUBST(CVS)
fi
-# java (for ant bundled with LCIO)
+dnl java (for ant bundled with LCIO)
AC_CHECK_PROG(have_java, java, yes, no)
if test $have_java == "no"
then
AC_MSG_ERROR(java not found)
+else
+ JAVA=java
+ AC_SUBST(JAVA)
fi
-# wget
+dnl wget
AC_CHECK_PROG(have_wget, wget, yes, no)
if test $have_wget == "no"
then
AC_MSG_ERROR(wget not found)
+else
+ WGET=wget
+ AC_SUBST(WGET)
+fi
+
+dnl scp
+AC_CHECK_PROG(have_scp, scp, yes, no)
+
+if test $have_scp == "no"
+then
+ AC_MSG_ERROR(scp not found)
+else
+ SCP=scp
+ AC_SUBST(SCP)
fi
])
+dnl macro to do top-level initialization of the build system and set some common variables and substitutions
AC_DEFUN(SIM_INIT, [
packages_dep_order="clhep geant4 lcphys xerces gdml lcio lcdd slic"
@@ -145,6 +169,7 @@
])
+dnl macro to do common configuration for each package
AC_DEFUN(SIM_CONFIG_PACKAGE_BASE, [
if test -z $1
@@ -152,12 +177,12 @@
AC_MSG_ERROR("Name of the package to configure is missing.")
fi
-# name of package is first arg
+dnl name of package is first arg
package_name="$1"
AC_MSG_CHECKING(for $package_name version)
-# root package area with no version tag
+dnl root package area with no version tag
package_root_dir=${sim_packages_dir}/${package_name}
if ! test -e ${package_root_dir}
@@ -165,7 +190,7 @@
AC_MSG_ERROR("$package_name root package area does not exist!")
fi
-# get the version string for this package from the default packages file
+dnl get the version string for this package from the default packages file
package_version=$(grep "^${package_name} " ${sim_package_default_versions_file} | awk '{print [$]2}')
if test -z $package_version
@@ -175,10 +200,11 @@
AC_MSG_RESULT($package_version)
fi
-# fully qualified base dir
+dnl fully qualified base dir
package_base_dir=${sim_packages_dir}/${package_name}/${package_version}
-# set package name, version, base dir and build dir for each dep
+dnl set package name, version, base dir and build dir for each dep
+dnl FIXME: should be a way to do this without explicitly naming each package here
case "$package_name" in
clhep )
@@ -212,6 +238,7 @@
AC_SUBST(lcphys_package_name, ${package_name})
AC_SUBST(lcphys_build_dir, ${package_base_dir});;
slic )
+ slic_version=${package_version} dnl save this for dist tarball naming
AC_SUBST(slic_base_dir, ${package_base_dir})
AC_SUBST(slic_version, ${package_version})
AC_SUBST(slic_package_name, ${package_name})
@@ -230,31 +257,37 @@
AC_DEFUN(SIM_CONFIG_PACKAGES, [
-# setup common helper vars for each package
+dnl setup common helper vars for each package
for p in $(echo ${packages_list})
do
SIM_CONFIG_PACKAGE_BASE($p)
done
-# extras for each package
-SIM_CONFIG_GEANT4
+dnl extras for each package
SIM_CONFIG_XERCES
+SIM_CONFIG_GEANT4
+
+])
+
+dnl macro to set the platform=os"-"compiler
+AC_DEFUN(SIM_CONFIG_PLATFORM, [
+
+platform=${host_os}"-"${CXX}
+
+AC_SUBST(platform)
])
+dnl macro to setup Geant4
AC_DEFUN(SIM_CONFIG_GEANT4, [
-if test $host_os == "CYGWIN"
-then
- g4system="WIN32-"${CXX}
-else
- g4system=${host_os}"-"${CXX}
-fi
+g4system=$platform
AC_SUBST(g4system)
])
+dnl macro to setup Xerces
AC_DEFUN(SIM_CONFIG_XERCES, [
if test $host_os == "Linux"
@@ -264,7 +297,7 @@
then
xerces_configure_args="-pcygwin -cgcc -xg++ -minmem -nsocket -tnative -rpthread -P \$(xerces_base_dir)"
elif test $host_os == "Darwin"
-then
+then
xerces_configure_args="-p macosx -nnative -tnative -P \$(xerces_base_dir)"
fi
@@ -272,6 +305,7 @@
])
+dnl macro to set the variable which OS uses for locating shared libs at runtime
AC_DEFUN(SIM_OS_SHARED_LIBS_VAR, [
if test $host_os == "Linux"
@@ -289,22 +323,22 @@
])
-# function to set string of host OS
+dnl macro to set string of host OS
AC_DEFUN(SIM_HOST_OS, [
AC_MSG_CHECKING(for supported OS)
-# to lowercase
+dnl to lowercase
host_os=`uname -s | tr [[:upper:]] [[:lower:]]`
supported_os=yes
case "$host_os" in
-# Linux flavor
+dnl Linux flavor
linux* ) host_os="Linux";;
-# Cygwin which is only supported Windows platform
+dnl Cygwin which is only supported Windows platform
cygwin* ) host_os="WIN32";;
-# Mac OSX
+dnl Mac OSX
darwin* ) host_os="Darwin";;
* ) supported_os=no;;
@@ -318,6 +352,7 @@
])
+dnl macro to configure OpenGL
AC_DEFUN(SIM_CONFIG_OGL, [
AC_MSG_CHECKING(for OpenGL)
@@ -337,7 +372,7 @@
if test -e $OGLHOME
then
- # check header file to see if OpenGL is installed
+ dnl check header file to see if OpenGL is installed
if test -e ${_ogldir}/include/gl.h}
then
HAVE_OGL=1
@@ -356,3 +391,42 @@
AC_MSG_RESULT(yes)
])
+
+dnl macro to set the name of the dist tarball
+AC_DEFUN(SIM_CONFIG_DIST_TARBALL, [
+
+dnl dist version is the same as slic version
+dist_version=$(echo ${slic_version} | sed -e 's/[[a-z]]/\_/g' -e 's/^_//g')
+
+dnl versioned tarball name
+dist_tarball="slic-"${dist_version}"-"${platform}"-bin".tar.gz
+
+dnl non-versioned tarball name
+dist_tarball_current="slic-current-"${platform}"-bin".tar.gz
+
+dnl substitute to common.gmk
+AC_SUBST(dist_tarball)
+AC_SUBST(dist_tarball_current)
+AC_SUBST(dist_version)
+
+])
+
+dnl macro to allow selection of where tarball should be copied; default to SLAC location
+AC_DEFUN(SIM_WITH_DIST_DIR, [
+
+AC_MSG_CHECKING(for dist directory)
+
+dnl This won't work for anyone but Jeremy McCormick (SLAC).
+slac_dist="[log in to unmask]:/nfs/slac/g/lcd/mc/prj/www/lcsim/dist/slic"
+
+dnl Set the SCP-style destination directory in form of username@host:dir
+AC_ARG_WITH(distdir,
+ AC_HELP_STRING([--with-distdir=<path>], [Set SCP-style dist directory in form username@host:dir]),
+ dist_dir=$with_distdir,
+ dist_dir=$slac_dist)
+
+AC_SUBST(dist_dir)
+
+AC_MSG_RESULT($dist_dir)
+
+])
\ No newline at end of file
SimDist
diff -u -r1.8 -r1.9
--- configure 30 Nov 2005 01:11:18 -0000 1.8
+++ configure 30 Nov 2005 21:51:35 -0000 1.9
@@ -1,10 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for SimDist v1r0p0.
+# Generated by GNU Autoconf 2.57 for SimDist v1r0p0.
#
# Report bugs to <[log in to unmask]>.
#
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
@@ -21,10 +22,9 @@
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 ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+if (FOO=FOO; unset FOO) >/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 -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
$as_unset $as_var
@@ -220,17 +220,16 @@
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="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+as_tr_cpp="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="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
# IFS
@@ -273,7 +272,7 @@
PACKAGE_STRING='SimDist v1r0p0'
[log in to unmask]
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs have_java have_wget packages_dep_order packages_reverse_dep_order download_script cvs_script patch_script gen_files sim_dist_dir sim_packages_dir sim_build_dir sim_scripts_dir USE_OGL OGLHOME clhep_base_dir clhep_version clhep_package_name clhep_build_dir gdml_base_dir gdml_version gdml_package_name gdml_build_dir geant4_base_dir geant4_version geant4_package_name geant4_build_dir lcdd_base_dir lcdd_version lcdd_package_name lcdd_build_dir lcio_base_dir lcio_version lcio_package_name lcio_build_dir lcphys_base_dir lcphys_version !
lcphys_package_name lcphys_build_dir slic_base_dir slic_version slic_package_name slic_build_dir xerces_base_dir xerces_version xerces_package_name xerces_build_dir g4system xerces_configure_args os_shared_libs_var LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA have_wget WGET have_scp SCP platform packages_dep_order packages_reverse_dep_order download_script cvs_script patch_script gen_files sim_dist_dir sim_packages_dir sim_build_dir sim_scripts_dir USE_OGL OGLHOME clhep_base_dir clhep_version clhep_package_name clhep_build_dir gdml_base_dir gdml_version gdml_package_name gdml_build_dir geant4_base_dir geant4_version geant4_package_name geant4_build_dir lcdd_base_dir lcdd_version lcdd_package_name lcdd_build_dir lcio_base_dir lcio_version lcio_package_name lcio_build_d!
ir lcphys_base_dir lcphys_version lcphys_package_name lcphys_build_dir slic_base_dir slic_version slic_package_name slic_build_dir xerces_base_dir xerces_version xerces_package_name xerces_build_dir xerces_configure_args g4system os_shared_libs_var dist_tarball dist_tarball_current dist_version dist_dir LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -632,7 +631,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
@@ -672,10 +671,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; }
@@ -763,9 +762,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
@@ -799,6 +798,12 @@
esac
cat <<\_ACEOF
+Optional Packages:
+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-distdir=<path> Set SCP-style dist directory in form
+ username@host:dir
+
Some influential environment variables:
CXX C++ compiler command
CXXFLAGS C++ compiler flags
@@ -844,45 +849,12 @@
ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
ac_top_srcdir=$ac_top_builddir$srcdir ;;
esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
- case "$ac_dir" in
- .) ac_abs_builddir=`pwd`;;
- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
- *) ac_abs_builddir=`pwd`/"$ac_dir";;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
- case ${ac_top_builddir}. in
- .) ac_abs_top_builddir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
- case $ac_srcdir in
- .) ac_abs_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
- case $ac_top_srcdir in
- .) ac_abs_top_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
- esac;;
-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`
cd $ac_dir
# Check for guested configure; otherwise get Cygnus style configure.
@@ -893,7 +865,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
@@ -907,9 +879,10 @@
if $ac_init_version; then
cat <<\_ACEOF
SimDist configure v1r0p0
-generated by GNU Autoconf 2.59
+generated by GNU Autoconf 2.57
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -921,7 +894,7 @@
running configure, to aid debugging if configure makes a mistake.
It was created by SimDist $as_me v1r0p0, which was
-generated by GNU Autoconf 2.59. Invocation command line was
+generated by GNU Autoconf 2.57. Invocation command line was
$ $0 $@
@@ -998,19 +971,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.
@@ -1044,12 +1017,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;
}
@@ -1078,7 +1051,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
@@ -1097,7 +1070,7 @@
echo "$as_me: caught signal $ac_signal"
echo "$as_me: exit $exit_status"
} >&5
- rm -f core *.core &&
+ rm -f core core.* *.core &&
rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
exit $exit_status
' 0
@@ -1177,7 +1150,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"
@@ -1194,13 +1167,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.
@@ -1260,10 +1233,9 @@
# check for required progs
-# make
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
@@ -1291,7 +1263,6 @@
fi
-# g++
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -1406,6 +1377,7 @@
(exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -1425,8 +1397,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 file name" >&5
-echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for C++ compiler default output" >&5
+echo $ECHO_N "checking for C++ compiler default output... $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
@@ -1446,23 +1418,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
@@ -1536,8 +1508,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
@@ -1562,6 +1534,7 @@
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
@@ -1612,6 +1585,7 @@
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
@@ -1631,21 +1605,11 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -1658,7 +1622,7 @@
ac_compiler_gnu=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
@@ -1674,6 +1638,7 @@
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
@@ -1690,21 +1655,11 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -1717,7 +1672,7 @@
ac_cv_prog_cxx_g=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f 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
@@ -1737,7 +1692,8 @@
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 ();' \
@@ -1745,13 +1701,14 @@
'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. */
-$ac_declaration
#include <stdlib.h>
+$ac_declaration
int
main ()
{
@@ -1762,21 +1719,11 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -1789,8 +1736,9 @@
continue
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -1807,21 +1755,11 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -1833,7 +1771,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
done
rm -f conftest*
if test -n "$ac_declaration"; then
@@ -1849,7 +1787,6 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-# cvs
# Extract the first word of "cvs", so it can be a program name with args.
set dummy cvs; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -1892,9 +1829,11 @@
{ { echo "$as_me:$LINENO: error: cvs not found" >&5
echo "$as_me: error: cvs not found" >&2;}
{ (exit 1); exit 1; }; }
+else
+ CVS=cvs
+
fi
-# java (for ant bundled with LCIO)
# Extract the first word of "java", so it can be a program name with args.
set dummy java; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -1937,9 +1876,11 @@
{ { echo "$as_me:$LINENO: error: java not found" >&5
echo "$as_me: error: java not found" >&2;}
{ (exit 1); exit 1; }; }
+else
+ JAVA=java
+
fi
-# wget
# Extract the first word of "wget", so it can be a program name with args.
set dummy wget; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -1982,6 +1923,56 @@
{ { echo "$as_me:$LINENO: error: wget not found" >&5
echo "$as_me: error: wget not found" >&2;}
{ (exit 1); exit 1; }; }
+else
+ WGET=wget
+
+fi
+
+# Extract the first word of "scp", so it can be a program name with args.
+set dummy scp; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_have_scp+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$have_scp"; then
+ ac_cv_prog_have_scp="$have_scp" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_have_scp="yes"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ test -z "$ac_cv_prog_have_scp" && ac_cv_prog_have_scp="no"
+fi
+fi
+have_scp=$ac_cv_prog_have_scp
+if test -n "$have_scp"; then
+ echo "$as_me:$LINENO: result: $have_scp" >&5
+echo "${ECHO_T}$have_scp" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+if test $have_scp == "no"
+then
+ { { echo "$as_me:$LINENO: error: scp not found" >&5
+echo "$as_me: error: scp not found" >&2;}
+ { (exit 1); exit 1; }; }
+else
+ SCP=scp
+
fi
@@ -1992,17 +1983,13 @@
echo "$as_me:$LINENO: checking for supported OS" >&5
echo $ECHO_N "checking for supported OS... $ECHO_C" >&6
-# to lowercase
host_os=`uname -s | tr [:upper:] [:lower:]`
supported_os=yes
case "$host_os" in
-# Linux flavor
linux* ) host_os="Linux";;
-# Cygwin which is only supported Windows platform
cygwin* ) host_os="WIN32";;
-# Mac OSX
darwin* ) host_os="Darwin";;
* ) supported_os=no;;
@@ -2019,6 +2006,15 @@
+# set the variable platform to host_os"-"compiler
+
+
+platform=${host_os}"-"${CXX}
+
+
+
+
+
# initialize required autoconf vars for sim setup
@@ -2102,7 +2098,6 @@
for p in $(echo ${packages_list})
do
- # Makefile
#echo "add config file: packages/$p/GNUmakefile"
@@ -2118,7 +2113,6 @@
- # variables for the build system
#echo "add config file: packages/$p/package.gmk"
@@ -2134,7 +2128,6 @@
- # vars required by the package itself (e.g. SLIC_BASE)
#echo "add config file: packages/$p/env.gmk"
@@ -2150,8 +2143,7 @@
- # download script if exists
- if test -e "$sim_packages_dir/$p/${download_script}.in"
+ if test -e "$sim_packages_dir/$p/${download_script}.in"
then
@@ -2169,8 +2161,7 @@
fi
- # cvs script if exists
- if test -e "$sim_packages_dir/$p/${cvs_script}.in"
+ if test -e "$sim_packages_dir/$p/${cvs_script}.in"
then
@@ -2188,8 +2179,7 @@
fi
- # patch script if exists
- if test -e "$sim_packages_dir/$p/${patch_script}.in"
+ if test -e "$sim_packages_dir/$p/${patch_script}.in"
then
@@ -2234,8 +2224,7 @@
if test -e $OGLHOME
then
- # check header file to see if OpenGL is installed
- if test -e ${_ogldir}/include/gl.h}
+ if test -e ${_ogldir}/include/gl.h}
then
HAVE_OGL=1
fi
@@ -2261,7 +2250,6 @@
# config the individual packages
-# setup common helper vars for each package
for p in $(echo ${packages_list})
do
@@ -2273,13 +2261,11 @@
{ (exit 1); exit 1; }; }
fi
-# name of package is first arg
package_name="$p"
echo "$as_me:$LINENO: checking for $package_name version" >&5
echo $ECHO_N "checking for $package_name version... $ECHO_C" >&6
-# root package area with no version tag
package_root_dir=${sim_packages_dir}/${package_name}
if ! test -e ${package_root_dir}
@@ -2289,7 +2275,6 @@
{ (exit 1); exit 1; }; }
fi
-# get the version string for this package from the default packages file
package_version=$(grep "^${package_name} " ${sim_package_default_versions_file} | awk '{print $2}')
if test -z $package_version
@@ -2302,10 +2287,8 @@
echo "${ECHO_T}$package_version" >&6
fi
-# fully qualified base dir
package_base_dir=${sim_packages_dir}/${package_name}/${package_version}
-# set package name, version, base dir and build dir for each dep
case "$package_name" in
clhep )
@@ -2363,7 +2346,7 @@
lcphys_build_dir=${package_base_dir}
;;
slic )
- slic_base_dir=${package_base_dir}
+ slic_version=${package_version} slic_base_dir=${package_base_dir}
slic_version=${package_version}
@@ -2390,19 +2373,6 @@
done
-# extras for each package
-
-
-if test $host_os == "CYGWIN"
-then
- g4system="WIN32-"${CXX}
-else
- g4system=${host_os}"-"${CXX}
-fi
-
-
-
-
if test $host_os == "Linux"
@@ -2421,6 +2391,13 @@
+g4system=$platform
+
+
+
+
+
+
# set which variable to use for runtime location of shared libs
@@ -2440,6 +2417,45 @@
+# setup name of tarball
+
+
+dist_version=$(echo ${slic_version} | sed -e 's/[a-z]/\_/g' -e 's/^_//g')
+
+dist_tarball="slic-"${dist_version}"-"${platform}"-bin".tar.gz
+
+dist_tarball_current="slic-current-"${platform}"-bin".tar.gz
+
+
+
+
+
+
+
+# select location for dist tarball
+
+
+echo "$as_me:$LINENO: checking for dist directory" >&5
+echo $ECHO_N "checking for dist directory... $ECHO_C" >&6
+
+slac_dist="[log in to unmask]:/nfs/slac/g/lcd/mc/prj/www/lcsim/dist/slic"
+
+
+# Check whether --with-distdir or --without-distdir was given.
+if test "${with_distdir+set}" = set; then
+ withval="$with_distdir"
+ dist_dir=$with_distdir
+else
+ dist_dir=$slac_dist
+fi;
+
+
+
+echo "$as_me:$LINENO: result: $dist_dir" >&5
+echo "${ECHO_T}$dist_dir" >&6
+
+
+
# add a few random input files
@@ -2506,13 +2522,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;
} |
@@ -2542,13 +2558,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
@@ -2562,13 +2578,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
@@ -2590,7 +2606,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'
@@ -2634,10 +2650,9 @@
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 ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
as_unset=unset
else
as_unset=false
@@ -2656,7 +2671,7 @@
LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
LC_TELEPHONE LC_TIME
do
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
$as_unset $as_var
@@ -2835,17 +2850,16 @@
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="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+as_tr_cpp="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="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
# IFS
@@ -2872,7 +2886,7 @@
cat >&5 <<_CSEOF
This file was extended by SimDist $as_me v1r0p0, which was
-generated by GNU Autoconf 2.59. Invocation command line was
+generated by GNU Autoconf 2.57. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -2916,7 +2930,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:
[truncated at 1000 lines; 201 more skipped]