lcdd
diff -u -r1.3 -r1.4
--- GNUmakefile.local.in 30 Mar 2006 19:45:48 -0000 1.3
+++ GNUmakefile.local.in 29 Jun 2011 21:43:35 -0000 1.4
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/lcdd/GNUmakefile.local.in,v 1.3 2006/03/30 19:45:48 jeremy Exp $
+# $Header: /cvs/lcd/lcdd/GNUmakefile.local.in,v 1.4 2011/06/29 21:43:35 jeremy Exp $
#
# Local build settings generated by configure
#
@@ -20,6 +20,10 @@
G4SYSTEM = @G4SYSTEM@
G4WORKDIR = @G4WORKDIR@
+# Geant4 lib config.
+G4LIB_BUILD_STATIC = @G4LIB_BUILD_STATIC@
+G4LIB_BUILD_SHARED = @G4LIB_BUILD_SHARED@
+
# CLHEP base dir
CLHEP_BASE_DIR = @CLHEP_PREFIX@
lcdd
diff -u -r1.13 -r1.14
--- aclocal.m4 5 Nov 2009 01:03:58 -0000 1.13
+++ aclocal.m4 29 Jun 2011 21:43:35 -0000 1.14
@@ -1,4 +1,4 @@
-dnl $Header: /cvs/lcd/lcdd/aclocal.m4,v 1.13 2009/11/05 01:03:58 jeremy Exp $
+dnl $Header: /cvs/lcd/lcdd/aclocal.m4,v 1.14 2011/06/29 21:43:35 jeremy Exp $
dnl
dnl local m4 macros for SLIC autoconf
dnl
@@ -365,3 +365,29 @@
])
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
+dnl Macro to select shared libraries. This will turn OFF static lib.
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
+
+AC_DEFUN(AC_LCDD_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)
+
+])
+
lcdd
diff -u -r1.48 -r1.49
--- configure 9 Dec 2010 21:45:49 -0000 1.48
+++ configure 29 Jun 2011 21:43:35 -0000 1.49
@@ -274,7 +274,7 @@
[log in to unmask]
ac_unique_file="src/volumeExtendedSubscriber.cc"
-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 G4_PREFIX G4WORKDIR G4SYSTEM CLHEP_PREFIX XERCES_PREFIX XERCES_LIBNAME GDML_PREFIX GDML_PLATFORM LCDD_PREFIX SCHEMA_INSTALL_DIR DOXYGEN 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 CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC SET_MAKE G4_PREFIX G4WORKDIR G4SYSTEM CLHEP_PREFIX XERCES_PREFIX XERCES_LIBNAME GDML_PREFIX GDML_PLATFORM LCDD_PREFIX G4LIB_BUILD_STATIC G4LIB_BUILD_SHARED SCHEMA_INSTALL_DIR DOXYGEN LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -812,6 +812,7 @@
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-nist=<yes|no> Enable NIST material lookup in Geant4.
+ --enable-shared yes to enable shared lib; no for static
--enable-verbose set G4VERBOSE
--enable-version=<yes|no>
Rewrite the VERSION file.
@@ -2960,6 +2961,35 @@
+# Config shared or static lib.
+
+
+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
+
+
+
+
+
+
# schema install
@@ -3744,6 +3774,8 @@
s,@GDML_PREFIX@,$GDML_PREFIX,;t t
s,@GDML_PLATFORM@,$GDML_PLATFORM,;t t
s,@LCDD_PREFIX@,$LCDD_PREFIX,;t t
+s,@G4LIB_BUILD_STATIC@,$G4LIB_BUILD_STATIC,;t t
+s,@G4LIB_BUILD_SHARED@,$G4LIB_BUILD_SHARED,;t t
s,@SCHEMA_INSTALL_DIR@,$SCHEMA_INSTALL_DIR,;t t
s,@DOXYGEN@,$DOXYGEN,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
@@ -4013,15 +4045,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 LCDD."
-echo
-echo " gmake"
-echo
-echo "The library should be found at $LCDD_BASE/lib/$G4SYSTEM/liblcdd.a when the build completes."
lcdd
diff -u -r1.44 -r1.45
--- configure.ac 9 Dec 2010 21:45:49 -0000 1.44
+++ configure.ac 29 Jun 2011 21:43:35 -0000 1.45
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/lcdd/configure.ac,v 1.44 2010/12/09 21:45:49 jeremy Exp $
+# $Header: /cvs/lcd/lcdd/configure.ac,v 1.45 2011/06/29 21:43:35 jeremy Exp $
#
# Process this file with autoconf to produce a configure script for LCDD.
#
@@ -52,6 +52,9 @@
# LCDD
SIM_SETUP_LCDD
+# Config shared or static lib.
+AC_LCDD_SHARED
+
# schema install
LCDD_WITH_SCHEMA_INSTALL_DIR
@@ -79,15 +82,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 LCDD."
-echo
-echo " gmake"
-echo
-echo "The library should be found at $LCDD_BASE/lib/$G4SYSTEM/liblcdd.a when 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 LCDD."
+dnl echo
+dnl echo " gmake"
+dnl echo
+dnl echo "The library should be found at $LCDD_BASE/lib/$G4SYSTEM/liblcdd.a when the build completes."
