slic
diff -u -r1.134 -r1.135
--- configure 26 Jul 2010 19:52:41 -0000 1.134
+++ configure 26 Jul 2010 19:59:19 -0000 1.135
@@ -675,7 +675,6 @@
ac_subst_files=''
ac_user_opts='
enable_option_checking
-enable_slic_debug
with_geant4
enable_nist
with_clhep
@@ -1313,7 +1312,6 @@
--disable-option-checking ignore unrecognized --enable/--with options
--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-nist=<yes|no> Enable NIST material lookup in Geant4.
--enable-debug turn on debug code by defining SLIC_DEBUG; default =
no
@@ -3116,7 +3114,6 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-#AC_PROG_INSTALL
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
@@ -3563,9 +3560,7 @@
done
-# check for dependent packages
-# set OS string
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for supported OS" >&5
@@ -3593,29 +3588,12 @@
-# Check whether to rewrite include/PackageInfo.hh
-
-
-# Check whether --enable-slic-debug was given.
-if test "${enable_slic_debug+set}" = set; then :
- enableval=$enable_slic_debug;
-fi
-
-
-if test "${enable_package_info}" != "no"; then
- SLIC_ENABLE_PACKAGE_INFO=1
-fi
-
-
-
-# Setup Default CPPFLAGS
CPPFLAGS="${CPPFLAGS} -Wno-long-long"
-# G4
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Geant4 installation" >&5
@@ -3797,7 +3775,6 @@
-# CLHEP
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLHEP installation" >&5
@@ -3842,7 +3819,6 @@
-# Xerces
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xerces installation" >&5
@@ -3901,7 +3877,6 @@
-# GDML
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDML installation" >&5
@@ -3937,7 +3912,6 @@
-# LCDD
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LCDD installation" >&5
@@ -3972,7 +3946,6 @@
-# LCIO
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LCIO installation" >&5
@@ -4011,7 +3984,6 @@
-# HepPDT
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HepPDT installation" >&5
@@ -4050,7 +4022,6 @@
-# SLIC
SLIC_PREFIX=$(pwd)
@@ -4159,7 +4130,6 @@
-# possible option for verbose compiler output
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether verbose compiler output should be enabled" >&5
$as_echo_n "checking whether verbose compiler output should be enabled... " >&6; }
@@ -4184,7 +4154,6 @@
-# Doxygen
for ac_prog in doxygen
@@ -4232,7 +4201,6 @@
-# Set VERSION file
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to rewrite VERSION file" >&5
@@ -4256,7 +4224,6 @@
-# define additional PACKAGE_ vars
PACKAGE_DATE=$(date)
@@ -4276,12 +4243,10 @@
-# substitute DEFS and CXXFLAGS
-# write out GNUmakefile.local with local settings
config_files="
GNUmakefile.local
./config/doxygen/slic_doxygen.cfg
@@ -4290,9 +4255,9 @@
./include/PackageInfo.hh
"
-
ac_config_files="$ac_config_files ${config_files}"
+
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
slic
diff -u -r1.118 -r1.119
--- configure.ac 26 Jul 2010 19:52:41 -0000 1.118
+++ configure.ac 26 Jul 2010 19:59:19 -0000 1.119
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/configure.ac,v 1.118 2010/07/26 19:52:41 jeremy Exp $
+# $Header: /cvs/lcd/slic/configure.ac,v 1.119 2010/07/26 19:59:19 jeremy Exp $
#
# Process this file with autoconf to produce a configure script for SLIC.
#
@@ -14,7 +14,6 @@
# checks for library functions
# checks for system services
-# package info
AC_PREREQ(2.57)
AC_INIT(SLIC,
@@ -30,68 +29,64 @@
CXXFLAGS="-g"
AC_PROG_CC
-#AC_PROG_INSTALL
AC_PROG_MAKE_SET
AC_CHECK_HEADERS(getopt.h,,AC_MSG_ERROR(getopt was not found))
-# check for dependent packages
+dnl check for dependent packages
-# set OS string
+dnl set OS string
CHECK_OS
-# Check whether to rewrite include/PackageInfo.hh
-SIM_ENABLE_PACKAGE_INFO
-
-# Setup Default CPPFLAGS
+dnl Setup Default CPPFLAGS
SIM_SETUP_DEF_CPPFLAGS
-# G4
+dnl G4
SIM_SETUP_G4
AC_HAVE_G4VERSION
AC_HAVE_G4NIST
AC_USE_G4NIST
-# CLHEP
+dnl CLHEP
SIM_SETUP_CLHEP
-# Xerces
+dnl Xerces
SIM_SETUP_XERCES
SIM_WITH_XERCES_LIBNAME
-# GDML
+dnl GDML
SIM_SETUP_GDML
-# LCDD
+dnl LCDD
SIM_SETUP_LCDD
-# LCIO
+dnl LCIO
SIM_SETUP_LCIO
-# HepPDT
+dnl HepPDT
SIM_SETUP_HEPPDT
-# SLIC
+dnl SLIC
SIM_SETUP_SLIC
-# possible option for verbose compiler output
+dnl possible option for verbose compiler output
SIM_SETUP_VERBOSE_COMPILE
-# Doxygen
+dnl Doxygen
SIM_SETUP_DOXYGEN
-# Set VERSION file
+dnl Set VERSION file
SIM_CREATE_VERSION_FILE
-# define additional PACKAGE_ vars
+dnl define additional PACKAGE_ vars
SIM_DEFINE_PACKAGE_VARS
-# substitute DEFS and CXXFLAGS
+dnl substitute DEFS and CXXFLAGS
AC_SUBST([CXXFLAGS])
AC_SUBST([CPPFLAGS])
AC_SUBST([DEFS])
-# write out GNUmakefile.local with local settings
+dnl local settings
config_files="
GNUmakefile.local
./config/doxygen/slic_doxygen.cfg
@@ -100,13 +95,8 @@
./include/PackageInfo.hh
"
-dnl if test -n "${SLIC_ENABLE_PACKAGE_INFO}"; then
-dnl config_files="${config_files}
-dnl include/PackageInfo.hh
-dnl "
-dnl fi
-
AC_CONFIG_FILES(${config_files})
+
AC_OUTPUT
# completion mesg
