slic
diff -u -r1.42 -r1.43
--- aclocal.m4 9 Jun 2011 01:51:18 -0000 1.42
+++ aclocal.m4 29 Jun 2011 21:43:41 -0000 1.43
@@ -1,4 +1,4 @@
-]dnl $Header: /cvs/lcd/slic/aclocal.m4,v 1.42 2011/06/09 01:51:18 jeremy Exp $
+]dnl $Header: /cvs/lcd/slic/aclocal.m4,v 1.43 2011/06/29 21:43:41 jeremy Exp $
dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
dnl Autoconf macros for SLIC and its dependencies.
@@ -50,7 +50,8 @@
AC_MSG_RESULT(yes)
dnl debugging symbols
- CXXFLAGS="${CXXFLAGS} -g -ggdb"
+ CXXFLAGS="${CXXFLAGS} -g -ggdb -O0"
+
else
AC_MSG_RESULT(no)
fi
@@ -592,10 +593,68 @@
AC_HELP_STRING([--enable-exceptions], [yes to enable exception handling; no to disable]))
if test "${enable_package_info}" != "no"; then
- AC_DEFINE(SLIC_CATCH_STD_EXCEPTIONS)
- AC_MSG_RESULT(yes)
+ AC_DEFINE(SLIC_CATCH_STD_EXCEPTIONS)
+ AC_MSG_RESULT(yes)
else
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT(no)
+fi
+
+])
+
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
+dnl Macro to select shared libraries. This will turn OFF static lib.
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
+
+AC_DEFUN(AC_SLIC_SHARED, [
+
+AC_MSG_CHECKING(whether to build a shared library)
+
+AC_ARG_ENABLE(shared,
+ AC_HELP_STRING([--enable-shared], [yes to enable shared lib; no for static]))
+
+if test "${enable_shared}" == "yes"; then
+ AC_MSG_RESULT(yes)
+ G4LIB_BUILD_SHARED=1
+ G4LIB_BUILD_STATIC=
+else
+ AC_MSG_RESULT(no)
+ G4LIB_BUILD_SHARED=
+ G4LIB_BUILD_STATIC=1
fi
+AC_SUBST(G4LIB_BUILD_STATIC)
+AC_SUBST(G4LIB_BUILD_SHARED)
+
+])
+
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
+dnl Macro to set the variable which OS uses for locating shared libs at runtime.
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
+AC_DEFUN(AC_SLIC_SHARED_LIB_VAR, [
+
+AC_MSG_CHECKING(for platform shared library variable)
+
+dnl echo "host_os=$host_os"
+
+host_os_lower=$(echo $host_os | tr '[A-Z]' '[a-z]')
+dnl echo "host_os_lower=$host_os_lower"
+
+case "$host_os_lower" in
+ linux* )
+ OS_SHARED_LIBS_VAR=LD_LIBRARY_PATH
+ ;;
+ cygwin* )
+ OS_SHARED_LIBS_VAR=PATH
+ ;;
+ darwin* )
+ OS_SHARED_LIBS_VAR=DYLD_LIBRARY_PATH
+ ;;
+esac
+
+dnl echo OS_SHARED_LIBS_VAR=$OS_SHARED_LIBS_VAR
+
+AC_MSG_RESULT($OS_SHARED_LIBS_VAR)
+
+AC_SUBST(OS_SHARED_LIBS_VAR)
+
])
slic
diff -u -r1.157 -r1.158
--- configure 20 Jun 2011 20:53:00 -0000 1.157
+++ configure 29 Jun 2011 21:43:41 -0000 1.158
@@ -312,7 +312,7 @@
#endif"
ac_default_prefix=$SLIC_BASE
-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 CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC SET_MAKE CPP EGREP G4_PREFIX G4WORKDIR G4SYSTEM GEANT4_FULL_VERSION GEANT4_MAJOR_VERSION GEANT4_MINOR_VERSION GEANT4_PATCH_VERSION CLHEP_PREFIX CLHEP_MAJOR_VERSION XERCES_PREFIX XERCES_LIBNAME GDML_PREFIX LCDD_PREFIX LCIO_PREFIX USE_HEPPDT HEPPDT_PREFIX SLIC_PREFIX DOXYGEN PACKAGE_AUTHORS PACKAGE_FULLNAME PACKAGE_INSTITUTION PACKAGE_DATE PACKAGE_WWW 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 CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC SET_MAKE CPP EGREP G4_PREFIX G4WORKDIR G4SYSTEM GEANT4_FULL_VERSION GEANT4_MAJOR_VERSION GEANT4_MINOR_VERSION GEANT4_PATCH_VERSION CLHEP_PREFIX CLHEP_MAJOR_VERSION XERCES_PREFIX XERCES_LIBNAME GDML_PREFIX LCDD_PREFIX LCIO_PREFIX USE_HEPPDT HEPPDT_PREFIX SLIC_PREFIX G4LIB_BUILD_STATIC G4LIB_BUILD_SHARED OS_SHARED_LIBS_VAR DOXYGEN PACKAGE_AUTHORS PACKAGE_FULLNAME PACKAGE_INSTITUTION PACKAGE_DATE PACKAGE_WWW LIBOBJS LTLIBOBJS'
ac_subst_files='G4PHYSLISTSINC G4PHYSLISTSBUILD'
# Initialize some variables set by options.
@@ -841,6 +841,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
@@ -859,6 +863,7 @@
--enable-profiling enable profiling using gprof; default = no
--enable-log enable logging; disabling will turn off most console
output; default = yes
+ --enable-shared yes to enable shared lib; no for static
--enable-exceptions yes to enable exception handling; no to disable
--enable-compile-verbose
use verbose compilation and linking flags
@@ -1339,9 +1344,92 @@
+# Setup Autoconf host vars.
+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/'`
-# Checks for programs.
+
+
+# Set source dir.
+
+
+# Checks for required programs.
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -1898,10 +1986,6 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-# no default flags from env; use debug symbols
-CXXFLAGS="-g"
-
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2661,6 +2745,10 @@
fi
+# no default flags from env (!!!!); use debug symbols
+CXXFLAGS="-g"
+
+# Check for getopt.
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -3307,7 +3395,6 @@
-
echo "$as_me:$LINENO: checking for supported OS" >&5
echo $ECHO_N "checking for supported OS... $ECHO_C" >&6
@@ -3851,7 +3938,8 @@
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
- CXXFLAGS="${CXXFLAGS} -g -ggdb"
+ CXXFLAGS="${CXXFLAGS} -g -ggdb -O0"
+
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
@@ -3900,6 +3988,62 @@
+echo "$as_me:$LINENO: checking whether to build a shared library" >&5
+echo $ECHO_N "checking whether to build a shared library... $ECHO_C" >&6
+
+# Check whether --enable-shared or --disable-shared was given.
+if test "${enable_shared+set}" = set; then
+ enableval="$enable_shared"
+
+fi;
+
+if test "${enable_shared}" == "yes"; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ G4LIB_BUILD_SHARED=1
+ G4LIB_BUILD_STATIC=
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ G4LIB_BUILD_SHARED=
+ G4LIB_BUILD_STATIC=1
+fi
+
+
+
+
+
+
+
+
+echo "$as_me:$LINENO: checking for platform shared library variable" >&5
+echo $ECHO_N "checking for platform shared library variable... $ECHO_C" >&6
+
+
+host_os_lower=$(echo $host_os | tr 'A-Z' 'a-z')
+
+case "$host_os_lower" in
+ linux* )
+ OS_SHARED_LIBS_VAR=LD_LIBRARY_PATH
+ ;;
+ cygwin* )
+ OS_SHARED_LIBS_VAR=PATH
+ ;;
+ darwin* )
+ OS_SHARED_LIBS_VAR=DYLD_LIBRARY_PATH
+ ;;
+esac
+
+
+echo "$as_me:$LINENO: result: $OS_SHARED_LIBS_VAR" >&5
+echo "${ECHO_T}$OS_SHARED_LIBS_VAR" >&6
+
+
+
+
+
+
+
echo "$as_me:$LINENO: checking whether to enable exception handling" >&5
echo $ECHO_N "checking whether to enable exception handling... $ECHO_C" >&6
@@ -3910,14 +4054,14 @@
fi;
if test "${enable_package_info}" != "no"; then
- cat >>confdefs.h <<\_ACEOF
+ cat >>confdefs.h <<\_ACEOF
#define SLIC_CATCH_STD_EXCEPTIONS 1
_ACEOF
- echo "$as_me:$LINENO: result: yes" >&5
+ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
- echo "$as_me:$LINENO: result: no" >&5
+ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -4685,6 +4829,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,@CXX@,$CXX,;t t
s,@CXXFLAGS@,$CXXFLAGS,;t t
s,@LDFLAGS@,$LDFLAGS,;t t
@@ -4715,6 +4867,9 @@
s,@USE_HEPPDT@,$USE_HEPPDT,;t t
s,@HEPPDT_PREFIX@,$HEPPDT_PREFIX,;t t
s,@SLIC_PREFIX@,$SLIC_PREFIX,;t t
+s,@G4LIB_BUILD_STATIC@,$G4LIB_BUILD_STATIC,;t t
+s,@G4LIB_BUILD_SHARED@,$G4LIB_BUILD_SHARED,;t t
+s,@OS_SHARED_LIBS_VAR@,$OS_SHARED_LIBS_VAR,;t t
s,@DOXYGEN@,$DOXYGEN,;t t
s,@PACKAGE_AUTHORS@,$PACKAGE_AUTHORS,;t t
s,@PACKAGE_FULLNAME@,$PACKAGE_FULLNAME,;t t
@@ -4992,15 +5147,3 @@
# completion mesg
-echo "Done."
-echo
-echo "Now source your Geant4 setup script to get the correct UI and graphics settings "
-echo "for Geant4's build system."
-echo
-echo " source $G4INSTALL/.config/bin/$G4SYSTEM/env.sh"
-echo
-echo "Finally, to build SLIC."
-echo
-echo " gmake all"
-echo
-echo "The executable should be found at $SLIC_BASE/bin/$G4SYSTEM/slic once the build completes."
slic
diff -u -r1.138 -r1.139
--- configure.ac 20 Jun 2011 20:53:00 -0000 1.138
+++ configure.ac 29 Jun 2011 21:43:41 -0000 1.139
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/configure.ac,v 1.138 2011/06/20 20:53:00 jeremy Exp $
+# $Header: /cvs/lcd/slic/configure.ac,v 1.139 2011/06/29 21:43:41 jeremy Exp $
#
# Process this file with autoconf to produce a configure script for SLIC.
#
@@ -20,25 +20,32 @@
v2r10p5,
[log in to unmask])
-AC_CONFIG_SRCDIR([slic.cc])
+# Setup Autoconf host vars.
+AC_CANONICAL_HOST
-# Checks for programs.
-AC_PROG_CXX
+dnl echo "host_os=$host_os"
+dnl echo "host_vendor=$host_vendor"
+dnl echo "host_cpu=$host_cpu"
-# no default flags from env; use debug symbols
-CXXFLAGS="-g"
+# Set source dir.
+AC_CONFIG_SRCDIR([slic.cc])
+# Checks for required programs.
+AC_PROG_CXX
AC_PROG_CC
AC_PROG_MAKE_SET
-AC_CHECK_HEADERS(getopt.h,,AC_MSG_ERROR(getopt was not found))
+# no default flags from env (!!!!); use debug symbols
+dnl FIXME: setting should not be hard-coded here
+CXXFLAGS="-g"
-dnl check for dependent packages
+# Check for getopt.
+AC_CHECK_HEADERS(getopt.h,,AC_MSG_ERROR(getopt was not found))
dnl set OS string
CHECK_OS
-dnl Setup Default CPPFLAGS
+dnl Setup Default CPPFLAGS.
SIM_SETUP_DEF_CPPFLAGS
dnl G4
@@ -68,6 +75,12 @@
dnl SLIC
SIM_SETUP_SLIC
+dnl Config lib type.
+AC_SLIC_SHARED
+
+dnl Shared library variable e.g. LD_LIBRARY_PATH on Linux.
+AC_SLIC_SHARED_LIB_VAR
+
dnl Config exception handling.
AC_SLIC_EXCEPTIONS
@@ -104,15 +117,15 @@
AC_OUTPUT
# completion mesg
-echo "Done."
-echo
-echo "Now source your Geant4 setup script to get the correct UI and graphics settings "
-echo "for Geant4's build system."
-echo
-echo " source $G4INSTALL/.config/bin/$G4SYSTEM/env.sh"
-echo
-echo "Finally, to build SLIC."
-echo
-echo " gmake all"
-echo
-echo "The executable should be found at $SLIC_BASE/bin/$G4SYSTEM/slic once the build completes."
+dnl echo "Done."
+dnl echo
+dnl echo "Now source your Geant4 setup script to get the correct UI and graphics settings "
+dnl echo "for Geant4's build system."
+dnl echo
+dnl echo " source $G4INSTALL/.config/bin/$G4SYSTEM/env.sh"
+dnl echo
+dnl echo "Finally, to build SLIC."
+dnl echo
+dnl echo " gmake all"
+dnl echo
+dnl echo "The executable should be found at $SLIC_BASE/bin/$G4SYSTEM/slic once the build completes."
