5 modified files
SimDist
diff -u -r1.98 -r1.99
--- configure 22 Jun 2011 00:26:03 -0000 1.98
+++ configure 29 Jun 2011 21:40:20 -0000 1.99
@@ -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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os OS_SHARED_LIBS_VAR SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA JAVA_HOME JDK_HOME have_wget WGET have_scp SCP have_cmake CMAKE SLACCVSROOT SLACCVSUSER PACKAGE_NJOBS 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 SIMDIST_DISABLE_MALLOC_CHECK OGLHOME QTHOME clhep_version_dot CLHEP_BASEDIR CLHEP_BUILDDIR CLHEP_CONFIG_OPTS CLHEP_DIR_ORIG CLHEP_DOWNLOAD GDML_B!
ASEDIR GDML_BUILDDIR GDML_CONFIG_OPTS GDML_CVSMODULE GEANT4_VERSION_DOWNLOAD GEANT4_VERSION GEANT4_BUILDDIR GEANT4_DIR_ORIG GEANT4_DOWNLOAD G4NEUTRONHP_NEGLECT_DOPPLER G4SYSTEM G4INSTALL G4INCLUDE G4LIB G4LEVELGAMMADATA G4RADIOACTIVEDATA G4LEDATA G4ELASTICDATA G4DEBUG G4ANALYSIS_USE G4UI_BUILD_XAW_SESSION G4UI_USE_XAW G4UI_BUILD_XM_SESSION G4UI_USE_XM G4UI_BUILD_WIN32_SESSION G4UI_USE_WIN32 G4VIS_BUILD_DAWN_DRIVER G4VIS_BUILD_OPENGLX_DRIVER G4VIS_BUILD_OPENGLXM_DRIVER G4VIS_BUILD_OPENGLWIN32_DRIVER G4VIS_BUILD_OIX_DRIVER G4VIS_BUILD_RAYTRACERX_DRIVER G4VIS_BUILD_OIWIN32_DRIVER G4VIS_BUILD_VRML_DRIVER G4VIS_USE_DAWN G4VIS_USE_OPENGLX G4VIS_USE_OPENGLXM G4VIS_USE_OPENGLWIN32 G4VIS_USE_OIX G4VIS_USE_RAYTRACERX G4VIS_USE_OIWIN32 G4VIS_USE_VRML G4LIB_BUILD_G3TOG4 G4LIB_USE_G3TOG4 G4LIB_BUILD_ZLIB G4LIB_USE_ZLIB G4LIB_BUILD_SHARED G4LIB_BUILD_STATIC G4LIB_USE_GRANULAR G4UI_USE_TCSH G4WORKDIR G4UI_NONE G4VIS_NONE G4VIS_BUILD_OPENGL_DRVIER G4VIS_USE_OPENGL G4VIS_BUILD_OPENGL G4VERB!
OSE G4UI_BUILD_QT_SESSION G4UI_USE_QT G4VIS_BUILD_OPENGLQT_DRI!
VER G4VI
S_USE_OPENGLQT G4LIB_BUILD_GDML LCDD_BASEDIR LCDD_VERSION LCIO_BASEDIR LCIO_BUILDDIR SLIC_BINNAME SLIC_VERSION SLIC_BASEDIR xerces_version_dot XERCES_VERSION XERCES_BASEDIR XERCES_BUILDDIR XERCES_DIR_ORIG XERCES_DOWNLOAD XERCES_CONFIG XERCES_CONFIG_OPTS HEPPDT_CONFIG_OPTS HEPPDT_BASEDIR HEPPDT_BUILDDIR HEPPDT_DOWNLOAD HEPPDT_VERSION HEPPDT_DIR_ORIG LCDETECTORS_BASEDIR LCDETECTORS_VERSION dist_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 OS_SHARED_LIBS_VAR SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA JAVA_HOME JDK_HOME have_wget WGET have_scp SCP have_cmake CMAKE SLACCVSROOT SLACCVSUSER PACKAGE_NJOBS 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 SIMDIST_DISABLE_MALLOC_CHECK OGLHOME QTHOME clhep_version_dot CLHEP_BASEDIR CLHEP_BUILDDIR CLHEP_CONFIG_OPTS CLHEP_DIR_ORIG CLHEP_DOWNLOAD CLHEP_LI!
B_DIR CLHEP_VERSION GDML_BASEDIR GDML_BUILDDIR GDML_CONFIG_OPTS GDML_CVSMODULE GDML_VERSION GEANT4_VERSION_DOWNLOAD GEANT4_VERSION GEANT4_BUILDDIR GEANT4_DIR_ORIG GEANT4_DOWNLOAD G4NEUTRONHP_NEGLECT_DOPPLER G4SYSTEM G4INSTALL G4INCLUDE G4LIB G4LEVELGAMMADATA G4RADIOACTIVEDATA G4LEDATA G4ELASTICDATA G4DEBUG G4ANALYSIS_USE G4UI_BUILD_XAW_SESSION G4UI_USE_XAW G4UI_BUILD_XM_SESSION G4UI_USE_XM G4UI_BUILD_WIN32_SESSION G4UI_USE_WIN32 G4VIS_BUILD_DAWN_DRIVER G4VIS_BUILD_OPENGLX_DRIVER G4VIS_BUILD_OPENGLXM_DRIVER G4VIS_BUILD_OPENGLWIN32_DRIVER G4VIS_BUILD_OIX_DRIVER G4VIS_BUILD_RAYTRACERX_DRIVER G4VIS_BUILD_OIWIN32_DRIVER G4VIS_BUILD_VRML_DRIVER G4VIS_USE_DAWN G4VIS_USE_OPENGLX G4VIS_USE_OPENGLXM G4VIS_USE_OPENGLWIN32 G4VIS_USE_OIX G4VIS_USE_RAYTRACERX G4VIS_USE_OIWIN32 G4VIS_USE_VRML G4LIB_BUILD_G3TOG4 G4LIB_USE_G3TOG4 G4LIB_BUILD_ZLIB G4LIB_USE_ZLIB G4LIB_BUILD_SHARED G4LIB_BUILD_STATIC G4LIB_USE_GRANULAR G4UI_USE_TCSH G4WORKDIR G4UI_NONE G4VIS_NONE G4VIS_BUILD_OPENGL_DRVIER G4V!
IS_USE_OPENGL G4VIS_BUILD_OPENGL G4VERBOSE G4UI_BUILD_QT_SESSI!
ON G4UI_
USE_QT G4VIS_BUILD_OPENGLQT_DRIVER G4VIS_USE_OPENGLQT G4LIB_BUILD_GDML LCDD_BASEDIR LCDD_VERSION LCDD_CONFIG_OPTS LCIO_BASEDIR LCIO_BUILDDIR LCIO_VERSION SLIC_BINNAME SLIC_VERSION SLIC_BASEDIR SLIC_CONFIG_OPTS xerces_version_dot XERCES_VERSION XERCES_BASEDIR XERCES_BUILDDIR XERCES_DIR_ORIG XERCES_DOWNLOAD XERCES_CONFIG XERCES_CONFIG_OPTS HEPPDT_CONFIG_OPTS HEPPDT_BASEDIR HEPPDT_BUILDDIR HEPPDT_DOWNLOAD HEPPDT_VERSION HEPPDT_DIR_ORIG LCDETECTORS_BASEDIR LCDETECTORS_VERSION dist_tarball dist_dir LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -806,6 +806,7 @@
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-shared yes to enable shared library build; no for statis
--enable-malloc-check yes to enable libc malloc check on slic exit; no to
disable
--enable-opengl Enable or disable usage of OpenGL with Geant4.
@@ -1396,6 +1397,30 @@
+echo "$as_me:$LINENO: checking whether packages should create shared libraries" >&5
+echo $ECHO_N "checking whether packages should create shared libraries... $ECHO_C" >&6
+
+# Check whether --enable-shared or --disable-shared was given.
+if test "${enable_shared+set}" = set; then
+ enableval="$enable_shared"
+
+fi;
+
+SIMDIST_ENABLE_SHARED=
+
+if test "${enable_shared}" == "yes"; then
+ SIMDIST_ENABLE_SHARED=1
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+
+
+
echo "$as_me:$LINENO: checking for installation prefix" >&5
echo $ECHO_N "checking for installation prefix... $ECHO_C" >&6
@@ -2763,6 +2788,7 @@
CLHEP_PACKAGE_NAME=clhep
+CLHEP_VERSION=${package_version}
clhep_major_version=${package_version:1:1}
clhep_minor_version=${package_version:3:1}
@@ -2783,7 +2809,16 @@
CLHEP_BASEDIR=${package_base_dir}
CLHEP_BUILDDIR=${package_base_dir}/CLHEP
-CLHEP_CONFIG_OPTS="--prefix=\$(PACKAGE_BASEDIR) --disable-shared"
+CLHEP_LIB_DIR=${package_base_dir}/lib
+
+CLHEP_CONFIG_OPTS="--prefix=\$(PACKAGE_BASEDIR)"
+
+if test "${SIMDIST_ENABLE_SHARED}" == "1"; then
+ CLHEP_CONFIG_OPTS="${CLHEP_CONFIG_OPTS} --disable-static"
+else
+ CLHEP_CONFIG_OPTS="${CLHEP_CONFIG_OPTS} --disable-shared"
+fi
+
CLHEP_DIR_ORIG=${CLHEP_VERSION_DOT}
CLHEP_DOWNLOAD=${CLHEP_URL}/${CLHEP_TGZ}
@@ -2794,19 +2829,28 @@
- ;;
-gdml )
+ ;;
+gdml )
+GDML_VERSION=${package_version}
GDML_BASEDIR=${package_base_dir}
GDML_BUILDDIR=${package_base_dir}/CPPGDML
GDML_DIR_ORIG=GDML2
-GDML_CONFIG_OPTS="--enable-shared=no --enable-geant4-granular-libs --enable-examples=no --enable-nist=no"
GDML_CVSMODULE=gdml2
+if test "${SIMDIST_ENABLE_SHARED}" == "1"; then
+ GDML_CONFIG_OPTS="--enable-shared=yes --enable-static=no"
+else
+ GDML_CONFIG_OPTS="--enable-shared=no --enable-station=yes"
+fi
+
+GDML_CONFIG_OPTS="${GDML_CONFIG_OPTS} --enable-geant4-granular-libs --enable-examples=no --enable-nist=no"
+
+
@@ -3019,6 +3063,12 @@
G4LIB_USE_ZLIB=1
+if test "${SIMDIST_ENABLE_SHARED}" == "1"; then
+ export G4LIB_BUILD_SHARED=1
+else
+ export G4LIB_BUILD_STATIC=1
+fi
+
@@ -3080,17 +3130,25 @@
lcdd )
+LCDD_CONFIG_OPTS=
+if test "${SIMDIST_ENABLE_SHARED}" == "1"; then
+ LCDD_CONFIG_OPTS="--enable-shared=yes"
+fi
+
LCDD_BASEDIR=$package_base_dir
LCDD_VERSION=$package_version
+
+
;;
lcio )
+LCIO_VERSION=${package_version}
LCIO_BASEDIR=$package_base_dir
LCIO_BUILDDIR=${package_base_dir}/src/cpp
@@ -3098,11 +3156,18 @@
+
;;
slic )
+SLIC_CONFIG_OPTS=
+if test "${SIMDIST_ENABLE_SHARED}" == "1"; then
+ SLIC_CONFIG_OPTS="--enable-shared=yes"
+fi
+
+
SLIC_VERSION=${package_version}
SLIC_BASEDIR=$package_base_dir
@@ -3121,6 +3186,7 @@
+
;;
xerces )
@@ -3131,7 +3197,14 @@
XERCES_BUILDDIR=${package_base_dir}
XERCES_CONFIG=./configure
-XERCES_CONFIG_OPTS="--enable-shared=no --enable-static=yes --prefix=${XERCES_BASEDIR} --enable-transcoder-icu=no --enable-msgloader-icu=no --enable-netaccessor-curl=no --disable-threads --enable-netaccessor-socket"
+
+if test "${SIMDIST_ENABLE_SHARED}" == "1"; then
+ XERCES_CONFIG_OPTS="--enable-shared=yes --enable-static=no"
+else
+ XERCES_CONFIG_OPTS="--enable-shared=no --enable-static=yes"
+fi
+
+XERCES_CONFIG_OPTS="${XERCES_CONFIG_OPTS} --prefix=${XERCES_BASEDIR} --enable-transcoder-icu=no --enable-msgloader-icu=no --enable-netaccessor-curl=no --disable-threads --enable-netaccessor-socket"
xerces_url=http://www.apache.org/dist/xerces/c/3/sources/
xerces_version_dot=$(
@@ -3160,15 +3233,22 @@
-heppdt_url=http://lcgapp.cern.ch/project/simu/HepPDT/download/HepPDT-${package_version}.tar.gz
+if test "${SIMDIST_ENABLE_SHARED}" == "1"; then
+ HEPPDT_CONFIG_OPTS="--enable-shared --disable-static"
+else
+ HEPPDT_CONFIG_OPTS="--disable-shared --enable-static"
+fi
+
+HEPPDT_CONFIG_OPTS="${HEPPDT_CONFIG_OPTS} --prefix=\$(PACKAGE_BASEDIR)"
-HEPPDT_CONFIG_OPTS="--prefix=\$(PACKAGE_BASEDIR) --disable-shared"
HEPPDT_BASEDIR=$package_base_dir
HEPPDT_BUILDDIR=$package_base_dir
-HEPPDT_DOWNLOAD=$heppdt_url
HEPPDT_VERSION=${package_version}
HEPPDT_DIR_ORIG=HepPDT-${package_version}
+heppdt_url="http://lcgapp.cern.ch/project/simu/HepPDT/download/HepPDT-${package_version}.tar.gz"
+HEPPDT_DOWNLOAD=${heppdt_url}
+
@@ -3307,6 +3387,30 @@
+
+if test -z scripts/slic-ldpath.sh
+then
+ { { echo "$as_me:$LINENO: error: \"Missing config file to add.\"" >&5
+echo "$as_me: error: \"Missing config file to add.\"" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+config_files="$config_files"scripts/slic-ldpath.sh" "
+
+
+
+
+if test -z scripts/install-libs.sh
+then
+ { { echo "$as_me:$LINENO: error: \"Missing config file to add.\"" >&5
+echo "$as_me: error: \"Missing config file to add.\"" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+config_files="$config_files"scripts/install-libs.sh" "
+
+
+
config_files=${config_files%\ }
ac_config_files="$ac_config_files ${config_files}"
@@ -3998,10 +4102,13 @@
s,@CLHEP_CONFIG_OPTS@,$CLHEP_CONFIG_OPTS,;t t
s,@CLHEP_DIR_ORIG@,$CLHEP_DIR_ORIG,;t t
s,@CLHEP_DOWNLOAD@,$CLHEP_DOWNLOAD,;t t
+s,@CLHEP_LIB_DIR@,$CLHEP_LIB_DIR,;t t
+s,@CLHEP_VERSION@,$CLHEP_VERSION,;t t
s,@GDML_BASEDIR@,$GDML_BASEDIR,;t t
s,@GDML_BUILDDIR@,$GDML_BUILDDIR,;t t
s,@GDML_CONFIG_OPTS@,$GDML_CONFIG_OPTS,;t t
s,@GDML_CVSMODULE@,$GDML_CVSMODULE,;t t
+s,@GDML_VERSION@,$GDML_VERSION,;t t
s,@GEANT4_VERSION_DOWNLOAD@,$GEANT4_VERSION_DOWNLOAD,;t t
s,@GEANT4_VERSION@,$GEANT4_VERSION,;t t
s,@GEANT4_BUILDDIR@,$GEANT4_BUILDDIR,;t t
@@ -4062,11 +4169,14 @@
s,@G4LIB_BUILD_GDML@,$G4LIB_BUILD_GDML,;t t
s,@LCDD_BASEDIR@,$LCDD_BASEDIR,;t t
s,@LCDD_VERSION@,$LCDD_VERSION,;t t
+s,@LCDD_CONFIG_OPTS@,$LCDD_CONFIG_OPTS,;t t
s,@LCIO_BASEDIR@,$LCIO_BASEDIR,;t t
s,@LCIO_BUILDDIR@,$LCIO_BUILDDIR,;t t
+s,@LCIO_VERSION@,$LCIO_VERSION,;t t
s,@SLIC_BINNAME@,$SLIC_BINNAME,;t t
s,@SLIC_VERSION@,$SLIC_VERSION,;t t
s,@SLIC_BASEDIR@,$SLIC_BASEDIR,;t t
+s,@SLIC_CONFIG_OPTS@,$SLIC_CONFIG_OPTS,;t t
s,@xerces_version_dot@,$xerces_version_dot,;t t
s,@XERCES_VERSION@,$XERCES_VERSION,;t t
s,@XERCES_BASEDIR@,$XERCES_BASEDIR,;t t
SimDist
diff -u -r1.18 -r1.19
--- configure.in 22 Jun 2011 00:26:03 -0000 1.18
+++ configure.in 29 Jun 2011 21:40:20 -0000 1.19
@@ -1,4 +1,4 @@
-dnl $Header: /cvs/lcd/SimDist/configure.in,v 1.18 2011/06/22 00:26:03 jeremy Exp $
+dnl $Header: /cvs/lcd/SimDist/configure.in,v 1.19 2011/06/29 21:40:20 jeremy Exp $
dnl
dnl Process this file with autoconf to produce the configure script for SimDist.
dnl
@@ -20,6 +20,9 @@
dnl Set which variable to use for runtime location of shared libs.
AC_OS_SHARED_LIBS_VAR
+dnl Check if packages should build shared libs.
+AC_SIMDIST_ENABLE_SHARED
+
dnl Set the installation prefix.
AC_WITH_PREFIX
@@ -74,6 +77,8 @@
AC_ADD_CONFIG_FILE(packages/Makefile)
AC_ADD_CONFIG_FILE(build/package.gmk)
AC_ADD_CONFIG_FILE(scripts/slic-setup.sh)
+AC_ADD_CONFIG_FILE(scripts/slic-ldpath.sh)
+AC_ADD_CONFIG_FILE(scripts/install-libs.sh)
dnl Remove trailing space from input file list.
config_files=${config_files%\ }
SimDist/build
diff -u -r1.15 -r1.16
--- geant4.m4 3 Jun 2011 21:30:13 -0000 1.15
+++ geant4.m4 29 Jun 2011 21:40:20 -0000 1.16
@@ -178,6 +178,13 @@
dnl Always enable usage of system's zlib.
G4LIB_USE_ZLIB=1
+dnl Configure shared or static libs.
+if test "${SIMDIST_ENABLE_SHARED}" == "1"; then
+ export G4LIB_BUILD_SHARED=1
+else
+ export G4LIB_BUILD_STATIC=1
+fi
+
dnl Variable substitutions for Geant4 environment.
AC_SUBST(G4SYSTEM)
AC_SUBST(G4INSTALL)
SimDist/build
diff -u -r1.44 -r1.45
--- packages.m4 26 Aug 2010 21:00:30 -0000 1.44
+++ packages.m4 29 Jun 2011 21:40:20 -0000 1.45
@@ -1,6 +1,6 @@
-dnl
-dnl Macro to do common configuration for each package.
-dnl
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
+dnl Configure a package and call its config macro.
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
AC_DEFUN(AC_CONFIG_PACKAGE_BASE, [
if test -z $1
@@ -83,6 +83,9 @@
])
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
+dnl Macro that calls the config macro for each package.
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
AC_DEFUN(AC_CONFIG_PACKAGES, [
dnl setup common helper vars for each package
@@ -93,12 +96,13 @@
])
-dnl
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
dnl Macro for configuring the clhep package.
-dnl
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
AC_DEFUN(AC_CLHEP_PACKAGE, [
CLHEP_PACKAGE_NAME=clhep
+CLHEP_VERSION=${package_version}
clhep_major_version=${package_version:1:1}
clhep_minor_version=${package_version:3:1}
@@ -109,12 +113,24 @@
CLHEP_URL=http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/distributions/
fi
+dnl Downloadable tarball.
CLHEP_VERSION_DOT=$(VERSION_DOT(clhep_version_dot, ${package_version}))
CLHEP_TGZ=clhep-${CLHEP_VERSION_DOT}.tgz
CLHEP_BASEDIR=${package_base_dir}
CLHEP_BUILDDIR=${package_base_dir}/CLHEP
-CLHEP_CONFIG_OPTS="--prefix=\$(PACKAGE_BASEDIR) --disable-shared"
+CLHEP_LIB_DIR=${package_base_dir}/lib
+
+dnl Install prefix.
+CLHEP_CONFIG_OPTS="--prefix=\$(PACKAGE_BASEDIR)"
+
+dnl Build shared libs?
+if test "${SIMDIST_ENABLE_SHARED}" == "1"; then
+ CLHEP_CONFIG_OPTS="${CLHEP_CONFIG_OPTS} --disable-static"
+else
+ CLHEP_CONFIG_OPTS="${CLHEP_CONFIG_OPTS} --disable-shared"
+fi
+
CLHEP_DIR_ORIG=${CLHEP_VERSION_DOT}
CLHEP_DOWNLOAD=${CLHEP_URL}/${CLHEP_TGZ}
@@ -123,39 +139,45 @@
AC_SUBST(CLHEP_CONFIG_OPTS)
AC_SUBST(CLHEP_DIR_ORIG)
AC_SUBST(CLHEP_DOWNLOAD)
+AC_SUBST(CLHEP_LIB_DIR)
+AC_SUBST(CLHEP_VERSION)
])
-dnl
-dnl Macro for configuring the gdml package.
-dnl
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
+dnl Macro for configuring the GDML package.
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
AC_DEFUN(AC_GDML_PACKAGE, [
-dnl gdml_url="http://simu.cvs.cern.ch/cgi-bin/simu.cgi/simu/GDML2.tar.gz?view=tar"
-
-dnl if test "${package_version}" != "HEAD"; then
-dnl gdml_url="${gdml_url}&pathrev=${package_version}"
-dnl fi
-
+dnl Basic GDML config.
+GDML_VERSION=${package_version}
GDML_BASEDIR=${package_base_dir}
GDML_BUILDDIR=${package_base_dir}/CPPGDML
GDML_DIR_ORIG=GDML2
-dnl GDML_DOWNLOAD=\"${gdml_url}\"
-GDML_CONFIG_OPTS="--enable-shared=no --enable-geant4-granular-libs --enable-examples=no --enable-nist=no"
GDML_CVSMODULE=gdml2
+dnl Shared or static libs.
+if test "${SIMDIST_ENABLE_SHARED}" == "1"; then
+ GDML_CONFIG_OPTS="--enable-shared=yes --enable-static=no"
+else
+ GDML_CONFIG_OPTS="--enable-shared=no --enable-station=yes"
+fi
+
+dnl Config opts.
+GDML_CONFIG_OPTS="${GDML_CONFIG_OPTS} --enable-geant4-granular-libs --enable-examples=no --enable-nist=no"
+
+dnl GDML substitutions.
AC_SUBST(GDML_BASEDIR)
AC_SUBST(GDML_BUILDDIR)
-dnl AC_SUBST(GDML_DIR_ORIG)
-dnl AC_SUBST(GDML_DOWNLOAD)
AC_SUBST(GDML_CONFIG_OPTS)
AC_SUBST(GDML_CVSMODULE)
+AC_SUBST(GDML_VERSION)
])
-dnl
-dnl Macro for configuring the geant4 package.
-dnl
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
+dnl Macro for configuring the Geant4 package.
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
AC_DEFUN(AC_GEANT4_PACKAGE, [
dnl G4VIS_NONE setting.
@@ -189,10 +211,18 @@
dnl
AC_DEFUN(AC_LCDD_PACKAGE, [
+dnl Choose shared or static libs.
+LCDD_CONFIG_OPTS=
+if test "${SIMDIST_ENABLE_SHARED}" == "1"; then
+ LCDD_CONFIG_OPTS="--enable-shared=yes"
+fi
+
LCDD_BASEDIR=$package_base_dir
LCDD_VERSION=$package_version
+
AC_SUBST(LCDD_BASEDIR)
AC_SUBST(LCDD_VERSION)
+AC_SUBST(LCDD_CONFIG_OPTS)
])
@@ -201,11 +231,13 @@
dnl
AC_DEFUN(AC_LCIO_PACKAGE, [
+LCIO_VERSION=${package_version}
LCIO_BASEDIR=$package_base_dir
LCIO_BUILDDIR=${package_base_dir}/src/cpp
AC_SUBST(LCIO_BASEDIR)
AC_SUBST(LCIO_BUILDDIR)
+AC_SUBST(LCIO_VERSION)
])
@@ -214,6 +246,14 @@
dnl
AC_DEFUN(AC_SLIC_PACKAGE, [
+dnl Choose shared or static libs.
+SLIC_CONFIG_OPTS=
+if test "${SIMDIST_ENABLE_SHARED}" == "1"; then
+ SLIC_CONFIG_OPTS="--enable-shared=yes"
+fi
+
+dnl TODO: Add additional SLIC config opt selections here: debug build, etc.
+
dnl save this for dist tarball naming
SLIC_VERSION=${package_version}
@@ -228,9 +268,11 @@
;;
esac
+dnl SLIC variable substitutions.
AC_SUBST(SLIC_BINNAME)
AC_SUBST(SLIC_VERSION)
AC_SUBST(SLIC_BASEDIR)
+AC_SUBST(SLIC_CONFIG_OPTS)
])
@@ -266,8 +308,19 @@
XERCES_BUILDDIR=${package_base_dir}
XERCES_CONFIG=./configure
-XERCES_CONFIG_OPTS="--enable-shared=no --enable-static=yes --prefix=${XERCES_BASEDIR} --enable-transcoder-icu=no --enable-msgloader-icu=no --enable-netaccessor-curl=no --disable-threads --enable-netaccessor-socket"
+dnl XERCES_CONFIG_OPTS="--prefix=${XERCES_BASEDIR} --enable-transcoder-icu=no --enable-msgloader-icu=no --enable-netaccessor-curl=no --disable-threads --enable-netaccessor-socket"
+dnl Choose shared or static libs.
+if test "${SIMDIST_ENABLE_SHARED}" == "1"; then
+ XERCES_CONFIG_OPTS="--enable-shared=yes --enable-static=no"
+else
+ XERCES_CONFIG_OPTS="--enable-shared=no --enable-static=yes"
+fi
+
+dnl Set config opts.
+XERCES_CONFIG_OPTS="${XERCES_CONFIG_OPTS} --prefix=${XERCES_BASEDIR} --enable-transcoder-icu=no --enable-msgloader-icu=no --enable-netaccessor-curl=no --disable-threads --enable-netaccessor-socket"
+
+dnl Download location.
xerces_url=http://www.apache.org/dist/xerces/c/3/sources/
xerces_version_dot=$(VERSION_DOT(xerces_version_dot, ${XERCES_VERSION}))
xerces_tgz=xerces-c-${xerces_version_dot}.tar.gz
@@ -275,6 +328,7 @@
XERCES_DOWNLOAD=${xerces_url}/${xerces_tgz}
XERCES_DIR_ORIG=xerces-c-${xerces_version_dot}
+dnl Xerces substitutions.
AC_SUBST(XERCES_VERSION)
AC_SUBST(XERCES_BASEDIR)
AC_SUBST(XERCES_BUILDDIR)
@@ -285,20 +339,29 @@
])
-dnl
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
dnl Macro for configuring the HepPDT package.
-dnl
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
AC_DEFUN(AC_HEPPDT_PACKAGE, [
-heppdt_url=http://lcgapp.cern.ch/project/simu/HepPDT/download/HepPDT-${package_version}.tar.gz
+dnl Shared or static libs.
+if test "${SIMDIST_ENABLE_SHARED}" == "1"; then
+ HEPPDT_CONFIG_OPTS="--enable-shared --disable-static"
+else
+ HEPPDT_CONFIG_OPTS="--disable-shared --enable-static"
+fi
+
+dnl HepPDT config opts.
+HEPPDT_CONFIG_OPTS="${HEPPDT_CONFIG_OPTS} --prefix=\$(PACKAGE_BASEDIR)"
-HEPPDT_CONFIG_OPTS="--prefix=\$(PACKAGE_BASEDIR) --disable-shared"
HEPPDT_BASEDIR=$package_base_dir
HEPPDT_BUILDDIR=$package_base_dir
-HEPPDT_DOWNLOAD=$heppdt_url
HEPPDT_VERSION=${package_version}
HEPPDT_DIR_ORIG=HepPDT-${package_version}
+heppdt_url="http://lcgapp.cern.ch/project/simu/HepPDT/download/HepPDT-${package_version}.tar.gz"
+HEPPDT_DOWNLOAD=${heppdt_url}
+
AC_SUBST(HEPPDT_CONFIG_OPTS)
AC_SUBST(HEPPDT_BASEDIR)
AC_SUBST(HEPPDT_BUILDDIR)
SimDist/build
diff -u -r1.23 -r1.24
--- util.m4 22 Jun 2011 00:26:03 -0000 1.23
+++ util.m4 29 Jun 2011 21:40:20 -0000 1.24
@@ -407,3 +407,24 @@
AC_SUBST(SIMDIST_DISABLE_MALLOC_CHECK)
])
+
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
+dnl Macro to enable global use of shared libraries for packages.
+dnl /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\
+AC_DEFUN(AC_SIMDIST_ENABLE_SHARED, [
+
+AC_MSG_CHECKING(whether packages should create shared libraries)
+
+AC_ARG_ENABLE(shared,
+ AC_HELP_STRING([--enable-shared], [yes to enable shared library build; no for statis]))
+
+SIMDIST_ENABLE_SHARED=
+
+if test "${enable_shared}" == "yes"; then
+ SIMDIST_ENABLE_SHARED=1
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+fi
+
+])
CVSspam 0.2.8