4 modified files
slic
diff -u -r1.26 -r1.27
--- GNUmakefile 7 Sep 2005 22:57:39 -0000 1.26
+++ GNUmakefile 21 Sep 2005 21:16:31 -0000 1.27
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/GNUmakefile,v 1.26 2005/09/07 22:57:39 jeremy Exp $
+# $Header: /cvs/lcd/slic/GNUmakefile,v 1.27 2005/09/21 21:16:31 jeremy Exp $
#
# Makefile for SLIC simulation package based on examples GNUmakefile by G. Cosmo.
#
@@ -71,8 +71,7 @@
# Geant4 binmake and special settings
include $(MAKEINCLUDES)/geant4.gmk
-# These files only exist if configure ran successfully.
-check_config: $(SLIC_BASE)/include/PackageInfo.hh
+check_config: GNUmakefile.local
lib_copy:
@if [ ! -e $(G4WORKDIR)/lib ]; then mkdir $(G4WORKDIR)/lib; fi
slic
diff -u -r1.11 -r1.12
--- aclocal.m4 7 Sep 2005 22:23:32 -0000 1.11
+++ aclocal.m4 21 Sep 2005 21:16:31 -0000 1.12
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/aclocal.m4,v 1.11 2005/09/07 22:23:32 jeremy Exp $
+# $Header: /cvs/lcd/slic/aclocal.m4,v 1.12 2005/09/21 21:16:31 jeremy Exp $
#
# local m4 macros for SLIC autoconf
#
@@ -461,6 +461,17 @@
])
+AC_DEFUN(SIM_ENABLE_PACKAGE_INFO, [
+
+AC_ARG_ENABLE(slic-debug,
+ AC_HELP_STRING([--enable-package-info], [Rewrite include/PackageInfo.hh]))
+
+if test "${enable_package_info}" = "yes"; then
+ SLIC_ENABLE_PACKAGE_INFO=1
+fi
+
+])
+
AC_DEFUN(SIM_DEFINE_PACKAGE_VARS, [
PACKAGE_DATE=$(date)
slic
diff -u -r1.21 -r1.22
--- configure 21 Sep 2005 00:16:57 -0000 1.21
+++ configure 21 Sep 2005 21:16:31 -0000 1.22
@@ -811,6 +811,7 @@
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-package-info Rewrite include/PackageInfo.hh
--enable-slic-debug Enable debugging in code by setting SLIC_DEBUG,
G4DEBUG and G4PROFILE
--enable-slic-verbose Enable usage of verbose output using SLIC_VERBOSE
@@ -2524,6 +2525,21 @@
+# Check whether to rewrite include/PackageInfo.hh
+
+
+# Check whether --enable-slic-debug or --disable-slic-debug was given.
+if test "${enable_slic_debug+set}" = set; then
+ enableval="$enable_slic_debug"
+
+fi;
+
+if test "${enable_package_info}" = "yes"; then
+ SLIC_ENABLE_PACKAGE_INFO=1
+fi
+
+
+
# Setup Default CPPFLAGS
@@ -3154,9 +3170,14 @@
# write out GNUmakefile.local with local settings
config_files="
GNUmakefile.local
- include/PackageInfo.hh
"
+if test -n "${SLIC_ENABLE_PACKAGE_INFO}"; then
+ config_files="${config_files}
+ include/PackageInfo.hh
+ "
+fi
+
ac_config_files="$ac_config_files ${config_files}"
cat >confcache <<\_ACEOF
slic
diff -u -r1.19 -r1.20
--- configure.ac 21 Sep 2005 00:16:57 -0000 1.19
+++ configure.ac 21 Sep 2005 21:16:31 -0000 1.20
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/configure.ac,v 1.19 2005/09/21 00:16:57 jeremy Exp $
+# $Header: /cvs/lcd/slic/configure.ac,v 1.20 2005/09/21 21:16:31 jeremy Exp $
#
# Process this file with autoconf to produce a configure script for SLIC.
#
@@ -38,6 +38,9 @@
# set OS string
CHECK_OS()
+# Check whether to rewrite include/PackageInfo.hh
+SIM_ENABLE_PACKAGE_INFO()
+
# Setup Default CPPFLAGS
SIM_SETUP_DEF_CPPFLAGS()
@@ -86,9 +89,14 @@
# write out GNUmakefile.local with local settings
config_files="
GNUmakefile.local
- include/PackageInfo.hh
"
+if test -n "${SLIC_ENABLE_PACKAGE_INFO}"; then
+ config_files="${config_files}
+ include/PackageInfo.hh
+ "
+fi
+
AC_CONFIG_FILES(${config_files})
AC_OUTPUT()
CVSspam 0.2.8