diff -u -r1.13 -r1.14
--- configure.ac	22 Jun 2006 00:39:36 -0000	1.13
+++ configure.ac	22 Jun 2006 23:42:35 -0000	1.14
@@ -1,81 +1,75 @@

-# $Header: /cvs/lcd/SimDist/configure.ac,v 1.13 2006/06/22 00:39:36 jeremy Exp $
-#
-# Process this file with autoconf to produce a configure script for SimDist.
-#

+dnl $Header: /cvs/lcd/SimDist/configure.ac,v 1.14 2006/06/22 23:42:35 jeremy Exp $
+dnl
+dnl Process this file with autoconf to produce the configure script for SimDist.
+dnl

-# package info

 AC_PREREQ(2.57)
 

+dnl Package info.

 AC_INIT(SimDist,
 	v1r0p0,
 	[log in to unmask])
 

+dnl Set the host variables.

 AC_CANONICAL_HOST

-dnl AC_CANONICAL_TARGET
-dnl AC_CANONICAL_BUILD

-echo "host_cpu=$host_cpu"
-echo "host_vendor=$host_vendor"
-echo "host_os=$host_os"

+dnl Set which variable to use for runtime location of shared libs.
+AC_OS_SHARED_LIBS_VAR

-# check for required progs
-CHECK_PROGS

+dnl Check for required programs.
+AC_PROG_MAKE_SET
+AC_PROG_CXX
+AC_PROG_CVS
+AC_PROG_JAVA
+AC_PROG_WGET
+AC_PROG_SCP

-# set the SLAC CVS username
-WITH_CVSUSER

+dnl Set the SLAC CVS username.
+AC_WITH_CVSUSER

-# set the installation prefix
-WITH_PREFIX

+dnl Set the installation prefix.
+AC_WITH_PREFIX

-# set the var host_os to determine basic OS flavor (Linux, Mac, Windows)
-CONFIG_HOST_OS

+dnl Initialize the SimDist build.
+AC_INIT_SIMDIST

-# set the variable platform to host_os"-"compiler
-CONFIG_PLATFORM

+dnl Setup OpenGL if found.
+AC_OPENGL

-# set which variable to use for runtime location of shared libs
-OS_SHARED_LIBS_VAR

+dnl Setup each package.
+AC_CONFIG_PACKAGES

-# initialize SimDist config
-SIMDIST_INIT
-
-# setup OpenGL if found
-CONFIG_OGL
-
-# config the individual packages
-CONFIG_PACKAGES
-
-# Package configuration.

+dnl Individual package configuration.

 AC_CLHEP

-AC_GEANT4

+dnl AC_GEANT4

 AC_MYSQL
 

-# setup name of tarball
-DIST_TGZ

+dnl Setup name of tarball.
+AC_DIST_TGZ

-# select location for dist tarball
-WITH_UPLOAD_DIR

+dnl Select location for dist tarball.
+AC_WITH_UPLOAD_DIR

-# add input files
-ADD_CONFIG_FILE(scripts/slic.sh)
-ADD_CONFIG_FILE(scripts/mokka.sh)
-ADD_CONFIG_FILE(Makefile)
-ADD_CONFIG_FILE(packages/Makefile)
-ADD_CONFIG_FILE(build/package.gmk)
-#ADD_CONFIG_FILE(build/xerces.gmk)

+dnl Add additional input files.
+AC_ADD_CONFIG_FILE(scripts/slic.sh)
+AC_ADD_CONFIG_FILE(scripts/mokka.sh)
+AC_ADD_CONFIG_FILE(Makefile)
+AC_ADD_CONFIG_FILE(packages/Makefile)
+AC_ADD_CONFIG_FILE(build/package.gmk)

-#ADD_CONFIG_FILE(build/clhep.gmk)

+dnl AC_ADD_CONFIG_FILE(build/xerces.gmk)
+dnl AC_ADD_CONFIG_FILE(build/clhep.gmk)

-# remove trailing space from input file list

+dnl Remove trailing space from input file list.

 config_files=${config_files%\ }
 

-# set AC input files

+dnl Set AC input files.

 AC_CONFIG_FILES(${config_files})
 

-# do it

+dnl Generate the files.

 AC_OUTPUT()
 

-# set perms on scripts

+dnl Set the permissions on scripts.

 chmod 755 build.sh
 chmod 755 $sim_packages_dir/*/*.sh
 chmod 755 $sim_scripts_dir/*.sh