SimDist
diff -u -r1.31 -r1.32
--- configure 19 May 2006 00:36:25 -0000 1.31
+++ configure 25 May 2006 01:06:04 -0000 1.32
@@ -273,7 +273,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 CVS have_java JAVA have_wget WGET have_scp SCP host_os slic_binname platform compiler os_shared_libs_var sim_dist_dir_basename 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_version_dot clhep clhep_version clhep_package_dir clhep_base_dir clep_build_dir clhep_tgz_local clhep_dir_orig clhep_download clhep_config_opts gdml gdml_version gdml_package_dir gdml_base_dir gdml_build_dir gdml_tgz_local gdml_di!
r_orig gdml_download gdml_config_opts g4system ac_geant4_terminal geant4_version_download geant4 geant4_version geant4_package_dir geant4_base_dir geant4_build_dir geant4_tgz_local geant4_dir_orig geant4_download lcdd lcdd_version lcdd_package_dir lcdd_base_dir lcdd_build_dir lcdd_cvsroot lcio lcio_version lcio_package_dir lcio_base_dir lcio_build_dir lcio_cvsroot lcphys lcphys_version lcphys_package_dir lcphys_base_dir lcphys_cvsmodule lcphys_cvsroot slic slic_version slic_package_dir slic_base_dir slic_cvsroot mokka mokka_version mokka_package_dir mokka_base_dir mokka_build_dir mokka_download mokka_dir_orig mokka_tgz_local xerces_configure_args xerces_version_underscore xerces xerces_version xerces_package_dir xerces_base_dir xerces_build_dir xerces_config xerces_tgz_local xerces_config_opts xerces_download xerces_dir_orig dist_tarball dist_tarball_current dist_version bin_tarball_current bin_tarball dist_dir 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA have_wget WGET have_scp SCP slic_binname platform compiler os_shared_libs_var sim_dist_dir_basename 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_version_dot clhep clhep_version clhep_package_dir clhep_base_dir clep_build_dir clhep_tgz_local clhep_dir_orig clhep_download clhep_config_opts gdml gdml_version gdml_p!
ackage_dir gdml_base_dir gdml_build_dir gdml_tgz_local gdml_dir_orig gdml_download gdml_config_opts g4system ac_geant4_terminal geant4_version_download geant4 geant4_version geant4_package_dir geant4_base_dir geant4_build_dir geant4_tgz_local geant4_dir_orig geant4_download lcdd lcdd_version lcdd_package_dir lcdd_base_dir lcdd_build_dir lcdd_cvsroot lcio lcio_version lcio_package_dir lcio_base_dir lcio_build_dir lcio_cvsroot lcphys lcphys_version lcphys_package_dir lcphys_base_dir lcphys_cvsmodule lcphys_cvsroot slic slic_version slic_package_dir slic_base_dir slic_cvsroot mokka mokka_version mokka_package_dir mokka_base_dir mokka_build_dir mokka_download mokka_dir_orig mokka_tgz_local xerces_configure_args xerces_version_underscore xerces xerces_version xerces_package_dir xerces_base_dir xerces_build_dir xerces_config xerces_tgz_local xerces_config_opts xerces_download xerces_dir_orig MYSQL_BASEDIR MYSQL_INCLUDEDIR MYSQL_LIBDIR dist_tarball dist_tarball_current dist_versio!
n bin_tarball_current bin_tarball dist_dir LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -730,6 +730,18 @@
ac_env_CPPFLAGS_value=$CPPFLAGS
ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ac_env_MYSQL_BASEDIR_set=${MYSQL_BASEDIR+set}
+ac_env_MYSQL_BASEDIR_value=$MYSQL_BASEDIR
+ac_cv_env_MYSQL_BASEDIR_set=${MYSQL_BASEDIR+set}
+ac_cv_env_MYSQL_BASEDIR_value=$MYSQL_BASEDIR
+ac_env_MYSQL_INCLUDEDIR_set=${MYSQL_INCLUDEDIR+set}
+ac_env_MYSQL_INCLUDEDIR_value=$MYSQL_INCLUDEDIR
+ac_cv_env_MYSQL_INCLUDEDIR_set=${MYSQL_INCLUDEDIR+set}
+ac_cv_env_MYSQL_INCLUDEDIR_value=$MYSQL_INCLUDEDIR
+ac_env_MYSQL_LIBDIR_set=${MYSQL_LIBDIR+set}
+ac_env_MYSQL_LIBDIR_value=$MYSQL_LIBDIR
+ac_cv_env_MYSQL_LIBDIR_set=${MYSQL_LIBDIR+set}
+ac_cv_env_MYSQL_LIBDIR_value=$MYSQL_LIBDIR
#
# Report the --help message.
@@ -790,6 +802,10 @@
_ACEOF
cat <<\_ACEOF
+
+System types:
+ --build=BUILD configure for building on BUILD [guessed]
+ --host=HOST cross-compile to build programs to run on HOST [BUILD]
_ACEOF
fi
@@ -804,6 +820,12 @@
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-cvsuser=<path> SLAC CVS user name. (Default is anonymous)
--with-prefix=<path> binary installation base area
+ --with-mysql-basedir=<path>
+ absolute path to mysql base directory
+ --with-mysql-includedir=<path>
+ absolute path to mysql headers dir
+ --with-mysql-libdir=<path>
+ absolute path to mysql library dir
--with-distdir=<path> Set SCP-style dist directory in form
username@host:dir
@@ -814,6 +836,12 @@
nonstandard directory <lib dir>
CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
headers in a nonstandard directory <include dir>
+ MYSQL_BASEDIR
+ base mysql directory
+ MYSQL_INCLUDEDIR
+ directory containing mysql headers directory
+ MYSQL_LIBDIR
+ directory containing mysql libraries
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1265,9 +1293,89 @@
-#AC_CANONICAL_BUILD
-#AC_CANONICAL_HOST
-#AC_CANONICAL_TARGET
+ac_aux_dir=
+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+ if test -f $ac_dir/install-sh; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install-sh -c"
+ break
+ elif test -f $ac_dir/install.sh; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install.sh -c"
+ break
+ elif test -f $ac_dir/shtool; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/shtool install -c"
+ break
+ fi
+done
+if test -z "$ac_aux_dir"; then
+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
+
+# Make sure we can run config.sub.
+$ac_config_sub sun4 >/dev/null 2>&1 ||
+ { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
+echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+ { (exit 1); exit 1; }; }
+
+echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6
+if test "${ac_cv_build+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_build_alias=$build_alias
+test -z "$ac_cv_build_alias" &&
+ ac_cv_build_alias=`$ac_config_guess`
+test -z "$ac_cv_build_alias" &&
+ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+ { (exit 1); exit 1; }; }
+ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+ { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6
+build=$ac_cv_build
+build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+
+echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6
+if test "${ac_cv_host+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_host_alias=$host_alias
+test -z "$ac_cv_host_alias" &&
+ ac_cv_host_alias=$ac_cv_build_alias
+ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+ { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6
+host=$ac_cv_host
+host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+
+
+echo "host_cpu=$host_cpu"
+echo "host_vendor=$host_vendor"
+echo "host_os=$host_os"
# check for required progs
@@ -3749,6 +3857,113 @@
#AC_CLHEP
+
+
+
+ echo "$as_me:$LINENO: checking for MYSQL_BASEDIR" >&5
+echo $ECHO_N "checking for MYSQL_BASEDIR... $ECHO_C" >&6
+
+ if test -z "$MYSQL_BASEDIR"
+ then
+
+# Check whether --with-mysql-basedir or --without-mysql-basedir was given.
+if test "${with_mysql_basedir+set}" = set; then
+ withval="$with_mysql_basedir"
+
+ if test "$withval" != "yes"
+ then
+ MYSQL_BASEDIR="$withval"
+ fi
+
+
+fi;
+ fi
+
+ echo "$as_me:$LINENO: result: $MYSQL_BASEDIR" >&5
+echo "${ECHO_T}$MYSQL_BASEDIR" >&6
+
+
+
+
+
+
+ echo "$as_me:$LINENO: checking for MYSQL_INCLUDEDIR" >&5
+echo $ECHO_N "checking for MYSQL_INCLUDEDIR... $ECHO_C" >&6
+
+ if test -z "$MYSQL_INCLUDEDIR"
+ then
+
+
+# Check whether --with-mysql-includedir or --without-mysql-includedir was given.
+if test "${with_mysql_includedir+set}" = set; then
+ withval="$with_mysql_includedir"
+
+ if test "$withval" != "yes"
+ then
+ MYSQL_INCLUDEDIR="$withval"
+ fi
+
+
+fi;
+ fi
+
+ if test -z "$MYSQL_INCLUDEDIR"
+ then
+ if test -n "$MYSQL_BASEDIR"
+ then
+ MYSQL_INCLUDEDIR="$MYSQL_BASEDIR"
+ fi
+ fi
+
+
+ echo "$as_me:$LINENO: result: $MYSQL_INCLUDEDIR" >&5
+echo "${ECHO_T}$MYSQL_INCLUDEDIR" >&6
+
+
+
+
+
+
+ echo "$as_me:$LINENO: checking for MYSQL_LIBDIR" >&5
+echo $ECHO_N "checking for MYSQL_LIBDIR... $ECHO_C" >&6
+
+ if test -z "$MYSQL_LIBDIR"
+ then
+
+# Check whether --with-mysql-libdir or --without-mysql-libdir was given.
+if test "${with_mysql_libdir+set}" = set; then
+ withval="$with_mysql_libdir"
+
+ if test "$withval" != "yes"
+ then
+ MYSQL_LIBDIR="$withval"
+ fi
+
+
+fi;
+ fi
+
+
+ if test -z "$MYSQL_LIBDIR"
+ then
+ if test -n "$MYSQL_BASEDIR"
+ then
+ MYSQL_LIBDIR="$MYSQL_BASEDIR/lib/mysql"
+ fi
+ fi
+
+
+ echo "$as_me:$LINENO: result: $MYSQL_LIBDIR" >&5
+echo "${ECHO_T}$MYSQL_LIBDIR" >&6
+
+
+
+
+
+
+
+
+
# setup name of tarball
@@ -4504,6 +4719,14 @@
s,@ECHO_N@,$ECHO_N,;t t
s,@ECHO_T@,$ECHO_T,;t t
s,@LIBS@,$LIBS,;t t
+s,@build@,$build,;t t
+s,@build_cpu@,$build_cpu,;t t
+s,@build_vendor@,$build_vendor,;t t
+s,@build_os@,$build_os,;t t
+s,@host@,$host,;t t
+s,@host_cpu@,$host_cpu,;t t
+s,@host_vendor@,$host_vendor,;t t
+s,@host_os@,$host_os,;t t
s,@SET_MAKE@,$SET_MAKE,;t t
s,@CXX@,$CXX,;t t
s,@CXXFLAGS@,$CXXFLAGS,;t t
@@ -4520,7 +4743,6 @@
s,@WGET@,$WGET,;t t
s,@have_scp@,$have_scp,;t t
s,@SCP@,$SCP,;t t
-s,@host_os@,$host_os,;t t
s,@slic_binname@,$slic_binname,;t t
s,@platform@,$platform,;t t
s,@compiler@,$compiler,;t t
@@ -4611,6 +4833,9 @@
s,@xerces_config_opts@,$xerces_config_opts,;t t
s,@xerces_download@,$xerces_download,;t t
s,@xerces_dir_orig@,$xerces_dir_orig,;t t
+s,@MYSQL_BASEDIR@,$MYSQL_BASEDIR,;t t
+s,@MYSQL_INCLUDEDIR@,$MYSQL_INCLUDEDIR,;t t
+s,@MYSQL_LIBDIR@,$MYSQL_LIBDIR,;t t
s,@dist_tarball@,$dist_tarball,;t t
s,@dist_tarball_current@,$dist_tarball_current,;t t
s,@dist_version@,$dist_version,;t t