diff -u -r1.36 -r1.37
--- configure	22 Jun 2006 20:18:49 -0000	1.36
+++ configure	22 Jun 2006 23:50:02 -0000	1.37
@@ -1,10 +1,11 @@

 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.

-# Generated by GNU Autoconf 2.59 for SimDist v1r0p0.

+# Generated by GNU Autoconf 2.57 for SimDist v1r0p0.

 #
 # Report bugs to <[log in to unmask]>.
 #

-# Copyright (C) 2003 Free Software Foundation, Inc.

+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.

 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##

@@ -21,10 +22,9 @@

 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
   set -o posix
 fi

-DUALCASE=1; export DUALCASE # for MKS sh

 
 # Support unset when possible.

-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then

+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then

   as_unset=unset
 else
   as_unset=false

@@ -43,7 +43,7 @@

   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
   LC_TELEPHONE LC_TIME
 do

-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then

+  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then

     eval $as_var=C; export $as_var
   else
     $as_unset $as_var

@@ -220,17 +220,16 @@

 if mkdir -p . 2>/dev/null; then
   as_mkdir_p=:
 else

-  test -d ./-p && rmdir ./-p

   as_mkdir_p=false
 fi
 
 as_executable_p="test -f"
 
 # Sed expression to map a string onto a valid CPP name.

-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"

+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"

 
 # Sed expression to map a string onto a valid variable name.

-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"

+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"

 
 
 # IFS

@@ -273,7 +272,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 SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA have_wget WGET have_scp SCP slic_binname platform compiler os_shared_libs_var 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 USE_OGL OGLHOME clhep_version_dot clhep clhep_version clhep_package_dir clhep_base_dir clep_build_dir clhep_tgz_local clhep_dir_orig clhep_download clhep_config_opts gdml gdml_version gdml!
 _package_dir gdml_base_dir gdml_build_dir gdml_tgz_local gdml_dir_orig gdml_download gdml_config_opts g4system ac_geant4_terminal geant4_version_download geant4 geant4_version geant4_package_dir geant4_base_dir geant4_build_dir geant4_tgz_local geant4_dir_orig geant4_download lcdd lcdd_version lcdd_package_dir lcdd_base_dir lcdd_build_dir lcdd_cvsroot lcio lcio_version lcio_package_dir lcio_base_dir lcio_build_dir lcio_cvsroot lcphys lcphys_version lcphys_package_dir lcphys_base_dir lcphys_cvsmodule lcphys_cvsroot slic slic_version slic_package_dir slic_base_dir slic_cvsroot mokka mokka_version mokka_package_dir mokka_base_dir mokka_build_dir mokka_download mokka_dir_orig mokka_tgz_local xerces_configure_args XERCES_OS XERCES_USE_SHARED_LIB XERCES_USE_STATIC_LIB xerces_version_underscore xerces xerces_version xerces_package_dir xerces_base_dir xerces_build_dir xerces_config xerces_tgz_local xerces_config_opts xerces_download xerces_dir_orig XERCES_OBJDIR CLHEP_CONFIG CLHEP_!
 BASEDIR CLHEP_INCLUDEDIR CLHEP_LIBDIR CLHEP_LIBNAME CLHEP_VERS!
 ION GEAN
T4_BASEDIR MYSQL_BASEDIR MYSQL_INCLUDEDIR MYSQL_LIBDIR dist_tarball dist_tarball_current dist_version bin_tarball_current bin_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 have_wget WGET have_scp SCP 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 clhep_version_dot clhep clhep_version clhep_package_dir clhep_base_dir clep_build_dir clhep_tgz_local clhep_dir_orig clhep_download clhep_config_opts gdml gdml_version gdml_package_dir gdml_base_dir gdml_build_dir gdml_tg!
 z_local gdml_dir_orig gdml_download gdml_config_opts geant4_version_download geant4 geant4_version geant4_package_dir geant4_base_dir geant4_build_dir geant4_tgz_local geant4_dir_orig geant4_download 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 lcdd lcdd_version lcdd_package_dir l!
 cdd_base_dir lcdd_build_dir lcdd_cvsroot lcio lcio_version lci!
 o_packag
e_dir lcio_base_dir lcio_build_dir lcio_cvsroot lcphys lcphys_version lcphys_package_dir lcphys_base_dir lcphys_cvsmodule lcphys_cvsroot slic slic_version slic_package_dir slic_base_dir slic_cvsroot slic_binname mokka mokka_version mokka_package_dir mokka_base_dir mokka_build_dir mokka_download mokka_dir_orig mokka_tgz_local XERCES_CONFIGURE_ARGS XERCES_OS XERCES_USE_SHARED_LIB XERCES_USE_STATIC_LIB xerces_version_underscore xerces xerces_version xerces_package_dir xerces_base_dir xerces_build_dir xerces_config xerces_tgz_local xerces_download xerces_dir_orig XERCES_OBJDIR CLHEP_CONFIG CLHEP_BASEDIR CLHEP_INCLUDEDIR CLHEP_LIBDIR CLHEP_LIBNAME CLHEP_VERSION MYSQL_BASEDIR MYSQL_INCLUDEDIR MYSQL_LIBDIR dist_tarball dist_tarball_current dist_version bin_tarball_current bin_tarball dist_dir LIBOBJS LTLIBOBJS'

 ac_subst_files=''
 
 # Initialize some variables set by options.

@@ -632,7 +631,7 @@

 
 # Be sure to have absolute paths.
 for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \

-	      localstatedir libdir includedir oldincludedir infodir mandir

+              localstatedir libdir includedir oldincludedir infodir mandir

 do
   eval ac_val=$`echo $ac_var`
   case $ac_val in

@@ -672,10 +671,10 @@

   # Try the directory containing this script, then its parent.
   ac_confdir=`(dirname "$0") 2>/dev/null ||
 $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \

-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||

+         X"$0" : 'X\(//\)[^/]' \| \
+         X"$0" : 'X\(//\)$' \| \
+         X"$0" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||

 echo X"$0" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }

@@ -750,10 +749,6 @@

 ac_env_CLHEP_VERSION_value=$CLHEP_VERSION
 ac_cv_env_CLHEP_VERSION_set=${CLHEP_VERSION+set}
 ac_cv_env_CLHEP_VERSION_value=$CLHEP_VERSION

-ac_env_GEANT4_BASEDIR_set=${GEANT4_BASEDIR+set}
-ac_env_GEANT4_BASEDIR_value=$GEANT4_BASEDIR
-ac_cv_env_GEANT4_BASEDIR_set=${GEANT4_BASEDIR+set}
-ac_cv_env_GEANT4_BASEDIR_value=$GEANT4_BASEDIR

 ac_env_MYSQL_BASEDIR_set=${MYSQL_BASEDIR+set}
 ac_env_MYSQL_BASEDIR_value=$MYSQL_BASEDIR
 ac_cv_env_MYSQL_BASEDIR_set=${MYSQL_BASEDIR+set}

@@ -799,9 +794,9 @@

   cat <<_ACEOF
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX

-			  [$ac_default_prefix]

+                          [$ac_default_prefix]

   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX

-			  [PREFIX]

+                          [PREFIX]

 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify

@@ -855,8 +850,6 @@

                           extension)
   --with-clhep-version=<version>
                           dot-separated CLHEP version string

-  --with-geant4-basedir=<path>
-                          absolute path to Geant4 base install directory

   --with-mysql-basedir=<path>
                           absolute path to mysql base directory
   --with-mysql-includedir=<path>

@@ -886,8 +879,6 @@

               shared extension
   CLHEP_VERSION
               dot-separated CLHEP version string

-  GEANT4_BASEDIR
-              base installation directory of Geant4

   MYSQL_BASEDIR
               base mysql directory
   MYSQL_INCLUDEDIR

@@ -932,45 +923,12 @@

     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
     ac_top_srcdir=$ac_top_builddir$srcdir ;;
 esac

-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac

+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`

 
     cd $ac_dir
     # Check for guested configure; otherwise get Cygnus style configure.

@@ -981,7 +939,7 @@

       echo
       $SHELL $ac_srcdir/configure  --help=recursive
     elif test -f $ac_srcdir/configure.ac ||

-	   test -f $ac_srcdir/configure.in; then

+           test -f $ac_srcdir/configure.in; then

       echo
       $ac_configure --help
     else

@@ -995,9 +953,10 @@

 if $ac_init_version; then
   cat <<\_ACEOF
 SimDist configure v1r0p0

-generated by GNU Autoconf 2.59

+generated by GNU Autoconf 2.57

-Copyright (C) 2003 Free Software Foundation, Inc.

+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+Free Software Foundation, Inc.

 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF

@@ -1009,7 +968,7 @@

 running configure, to aid debugging if configure makes a mistake.
 
 It was created by SimDist $as_me v1r0p0, which was

-generated by GNU Autoconf 2.59.  Invocation command line was

+generated by GNU Autoconf 2.57.  Invocation command line was

 
   $ $0 $@
 

@@ -1086,19 +1045,19 @@

     2)
       ac_configure_args1="$ac_configure_args1 '$ac_arg'"
       if test $ac_must_keep_next = true; then

-	ac_must_keep_next=false # Got value, back to normal.

+        ac_must_keep_next=false # Got value, back to normal.

       else

-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac

+        case $ac_arg in
+          *=* | --config-cache | -C | -disable-* | --disable-* \
+          | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+          | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+          | -with-* | --with-* | -without-* | --without-* | --x)
+            case "$ac_configure_args0 " in
+              "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+            esac
+            ;;
+          -* ) ac_must_keep_next=true ;;
+        esac

       fi
       ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
       # Get rid of the leading space.

@@ -1132,12 +1091,12 @@

     case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
     *ac_space=\ *)
       sed -n \

-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"

+        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"

       ;;
     *)
       sed -n \

-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"

+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"

       ;;
     esac;
 }

@@ -1166,7 +1125,7 @@

       for ac_var in $ac_subst_files
       do
 	eval ac_val=$`echo $ac_var`

-	echo "$ac_var='"'"'$ac_val'"'"'"

+        echo "$ac_var='"'"'$ac_val'"'"'"

       done | sort
       echo
     fi

@@ -1185,7 +1144,7 @@

       echo "$as_me: caught signal $ac_signal"
     echo "$as_me: exit $exit_status"
   } >&5

-  rm -f core *.core &&

+  rm -f core core.* *.core &&

   rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
      ' 0

@@ -1265,7 +1224,7 @@

 # value.
 ac_cache_corrupted=false
 for ac_var in `(set) 2>&1 |

-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do

+               sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do

   eval ac_old_set=\$ac_cv_env_${ac_var}_set
   eval ac_new_set=\$ac_env_${ac_var}_set
   eval ac_old_val="\$ac_cv_env_${ac_var}_value"

@@ -1282,13 +1241,13 @@

     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then

-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5

+        { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5

 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}

-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5

+        { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5

 echo "$as_me:   former value:  $ac_old_val" >&2;}

-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5

+        { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5

 echo "$as_me:   current value: $ac_new_val" >&2;}

-	ac_cache_corrupted=:

+        ac_cache_corrupted=:

       fi;;
   esac
   # Pass precious variables to config.status.

@@ -1425,16 +1384,27 @@

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

-# check for required progs

+
+case "$host_os" in
+  linux*  )
+    OS_SHARED_LIBS_VAR=LD_LIBRARY_PATH
+    ;;
+  cygwin* )
+    OS_SHARED_LIBS_VAR=PATH
+    ;;
+  darwin* )
+    OS_SHARED_LIBS_VAR=DYLD_LIBRARY_PATH
+    ;;
+esac
+
+
+

 
 
 echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6

-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`

+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`

 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

@@ -1461,7 +1431,6 @@

   SET_MAKE="MAKE=${MAKE-make}"
 fi
 

-

 ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

@@ -1576,6 +1545,7 @@

   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF

+#line $LINENO "configure"

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext

@@ -1595,8 +1565,8 @@

 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.

-echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5
-echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6

+echo "$as_me:$LINENO: checking for C++ compiler default output" >&5
+echo $ECHO_N "checking for C++ compiler default output... $ECHO_C" >&6

 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5

@@ -1616,23 +1586,23 @@

   test -f "$ac_file" || continue
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )

-	;;

+        ;;

     conftest.$ac_ext )

-	# This is the source file.
-	;;

+        # This is the source file.
+        ;;

     [ab].out )

-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;

+        # We found the default executable, but exeext='' is most
+        # certainly right.
+        break;;

     *.* )

-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	# FIXME: I believe we export ac_cv_exeext for Libtool,
-	# but it would be cool to find out if it's true.  Does anybody
-	# maintain Libtool? --akim.
-	export ac_cv_exeext
-	break;;

+        ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+        # FIXME: I believe we export ac_cv_exeext for Libtool,
+        # but it would be cool to find out if it's true.  Does anybody
+        # maintain Libtool? --akim.
+        export ac_cv_exeext
+        break;;

     * )

-	break;;

+        break;;

   esac
 done
 else

@@ -1706,8 +1676,8 @@

   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`

-	  export ac_cv_exeext
-	  break;;

+          export ac_cv_exeext
+          break;;

     * ) break;;
   esac
 done

@@ -1732,6 +1702,7 @@

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

+#line $LINENO "configure"

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext

@@ -1782,6 +1753,7 @@

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

+#line $LINENO "configure"

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext

@@ -1801,21 +1773,11 @@

 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

-  (eval $ac_compile) 2>conftest.er1

+  (eval $ac_compile) 2>&5

   ac_status=$?

-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5

   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&

-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'

+         { ac_try='test -s conftest.$ac_objext'

   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?

@@ -1828,7 +1790,7 @@

 
 ac_compiler_gnu=no
 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f conftest.$ac_objext conftest.$ac_ext

 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi

@@ -1844,6 +1806,7 @@

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

+#line $LINENO "configure"

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext

@@ -1860,21 +1823,11 @@

 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

-  (eval $ac_compile) 2>conftest.er1

+  (eval $ac_compile) 2>&5

   ac_status=$?

-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5

   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&

-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'

+         { ac_try='test -s conftest.$ac_objext'

   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?

@@ -1887,7 +1840,7 @@

 
 ac_cv_prog_cxx_g=no
 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f conftest.$ac_objext conftest.$ac_ext

 fi
 echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6

@@ -1907,7 +1860,8 @@

   fi
 fi
 for ac_declaration in \

-   '' \

+   ''\
+   '#include <stdlib.h>' \

    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \

@@ -1915,13 +1869,14 @@

    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF

+#line $LINENO "configure"

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */

-$ac_declaration

 #include <stdlib.h>

+$ac_declaration

 int
 main ()
 {

@@ -1932,21 +1887,11 @@

 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

-  (eval $ac_compile) 2>conftest.er1

+  (eval $ac_compile) 2>&5

   ac_status=$?

-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5

   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&

-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'

+         { ac_try='test -s conftest.$ac_objext'

   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?

@@ -1959,8 +1904,9 @@

 
 continue
 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f conftest.$ac_objext conftest.$ac_ext

   cat >conftest.$ac_ext <<_ACEOF

+#line $LINENO "configure"

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext

@@ -1977,21 +1923,11 @@

 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

-  (eval $ac_compile) 2>conftest.er1

+  (eval $ac_compile) 2>&5

   ac_status=$?

-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5

   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&

-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'

+         { ac_try='test -s conftest.$ac_objext'

   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?

@@ -2003,7 +1939,7 @@

 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+rm -f conftest.$ac_objext conftest.$ac_ext

 done
 rm -f conftest*
 if test -n "$ac_declaration"; then

@@ -2019,6 +1955,7 @@

 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 

+

 # Extract the first word of "cvs", so it can be a program name with args.
 set dummy cvs; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5

@@ -2058,14 +1995,17 @@

 
 if test $have_cvs == "no"
 then

-  { { echo "$as_me:$LINENO: error: cvs not found" >&5
-echo "$as_me: error: cvs not found" >&2;}

+  { { echo "$as_me:$LINENO: error: cvs was not found on this system" >&5
+echo "$as_me: error: cvs was not found on this system" >&2;}

    { (exit 1); exit 1; }; }
 else
   CVS=cvs
 
 fi
 

+
+
+

 # Extract the first word of "java", so it can be a program name with args.
 set dummy java; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5

@@ -2113,6 +2053,8 @@

 
 fi
 

+
+

 # Extract the first word of "wget", so it can be a program name with args.
 set dummy wget; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5

@@ -2160,6 +2102,9 @@

 
 fi
 

+
+
+

 # Extract the first word of "scp", so it can be a program name with args.
 set dummy scp; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5

@@ -2209,7 +2154,6 @@

-# set the SLAC CVS username

 
 
 echo "$as_me:$LINENO: checking for SLAC CVS user" >&5

@@ -2237,7 +2181,6 @@

-# set the installation prefix

 
 
 echo "$as_me:$LINENO: checking for installation prefix" >&5

@@ -2263,77 +2206,6 @@

-# set the var host_os to determine basic OS flavor (Linux, Mac, Windows)
-
-
-echo "$as_me:$LINENO: checking for supported OS" >&5
-echo $ECHO_N "checking for supported OS... $ECHO_C" >&6
-
-host_os=`uname | tr [:upper:] [:lower:]`
-supported_os=yes
-
-case "$host_os" in
-
-linux*            ) host_os="Linux";;
-cygwin*           ) host_os="WIN32";;
-darwin*           ) host_os="Darwin";;
-*                 ) supported_os=no;;
-
-esac
-
-if test "$supported_os" = "no"; then
-  { { echo "$as_me:$LINENO: error: $host_os is not in the list of supported operating systems " >&5
-echo "$as_me: error: $host_os is not in the list of supported operating systems " >&2;}
-   { (exit 1); exit 1; }; }
-else
-  echo "$as_me:$LINENO: result: $host_os" >&5
-echo "${ECHO_T}$host_os" >&6
-fi
-
-
-
-if test $host_os == "WIN32"
-then
-  slic_binname=slic.exe
-else
-  slic_binname=slic
-fi
-
-
-
-
-
-# set the variable platform to host_os"-"compiler
-
-
-platform=${host_os}"-"${CXX}
-
-
-
-compiler=${CXX}
-
-
-
-
-# set which variable to use for runtime location of shared libs
-
-
-if test $host_os == "Linux"
-then
-  os_shared_libs_var=LD_LIBRARY_PATH
-elif test $host_os == "WIN32"
-then
-  os_shared_libs_var=PATH
-elif test $host_os == "Darwin"
-then
-  os_shared_libs_var=DYLD_LIBRARY_PATH
-fi
-
-
-
-
-
-# initialize SimDist config

 
 
 sim_dist_dir_basename=$(basename `pwd`)

@@ -2508,50 +2380,61 @@

-# setup OpenGL if found

-echo "$as_me:$LINENO: checking for OpenGL" >&5
-echo $ECHO_N "checking for OpenGL... $ECHO_C" >&6

+#AC_MSG_CHECKING(for OpenGL installation)

 
 if test -z $OGLHOME
 then
   case "$host_os" in

-  Linux            ) _ogldir=/usr;;
-  WIN32            ) _ogldir=/usr/X11R6;;
-  Darwin           ) _ogldir=/usr/X11R6;;
-  *                ) ;;

+    linux*           )
+      OGLHOME=/usr
+      ;;
+    cygwin*|darwin*  )
+      OGLHOME=/usr/X11R6
+      ;;

   esac

-else
-  _ogldir=$OGLHOME

 fi
 

-if test -e $OGLHOME
-then
-    if test -e ${_ogldir}/include/gl.h}
-  then
-    HAVE_OGL=1
-  fi

+as_ac_File=`echo "ac_cv_file_$OGLHOME/include/GL/gl.h" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $OGLHOME/include/GL/gl.h" >&5
+echo $ECHO_N "checking for $OGLHOME/include/GL/gl.h... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  test "$cross_compiling" = yes &&
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
+if test -r "$OGLHOME/include/GL/gl.h"; then
+  eval "$as_ac_File=yes"
+else
+  eval "$as_ac_File=no"
+fi
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
+  :
+else
+  OGLHOME=

 fi
 

-if test -n $HAVE_OGL
-then
-  OGLHOME=${_ogldir}
-  USE_OGL=yes
-
-
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_OGL 1
-_ACEOF

-fi

+echo "$as_me:$LINENO: checking for OpenGL installation" >&5
+echo $ECHO_N "checking for OpenGL installation... $ECHO_C" >&6

-echo "$as_me:$LINENO: result: yes" >&5

+if test -n "$OGLHOME"
+then
+  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

-# config the individual packages

 
 
 for p in $(echo ${packages_list})

@@ -2763,6 +2646,7 @@

+

   ;;
 
 gdml )

@@ -2929,32 +2813,6 @@

 
 geant4 )
 

-
-
-g4system=$platform
-
-
-
-
-
-echo "$as_me:$LINENO: checking for type of Geant4 UI terminal to use" >&5
-echo $ECHO_N "checking for type of Geant4 UI terminal to use... $ECHO_C" >&6
-
-if test $host_os == "Linux" || test $host_os == "Darwin"; then
-  ac_geant4_terminal="TCSH"
-else
-  ac_geant4_terminal="CSH"
-fi
-
-echo "$as_me:$LINENO: result: ${ac_geant4_terminal}" >&5
-echo "${ECHO_T}${ac_geant4_terminal}" >&6
-
-
-
-
-
-
-

   geant4_version=${package_version}
   geant4_url=http://geant4.cern.ch/support/source/
   geant4_version_download=$(

@@ -3101,6 +2959,123 @@

+
+  G4INSTALL=$geant4_base_dir
+  G4WORKDIR=$geant4_base_dir
+
+
+
+echo "$as_me:$LINENO: checking for G4SYSTEM setting" >&5
+echo $ECHO_N "checking for G4SYSTEM setting... $ECHO_C" >&6
+
+# G4SYSTEM
+case "$host_os" in
+
+  linux*  )
+    G4SYSTEM=Linux
+    ;;
+  cygwin* )
+    G4SYSTEM=WIN32
+    ;;
+  darwin* )
+    G4SYSTEM=Darwin
+    ;;
+  *       )
+
+esac
+
+if test -z "$G4SYSTEM"
+then
+  { { echo "$as_me:$LINENO: error: platform $host_os is not supported" >&5
+echo "$as_me: error: platform $host_os is not supported" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+G4SYSTEM=$G4SYSTEM"-"${CXX}
+
+echo "$as_me:$LINENO: result: $G4SYSTEM" >&5
+echo "${ECHO_T}$G4SYSTEM" >&6
+
+if test -n "$OGLHOME"
+then
+G4VIS_USE_OPENGLX=1
+G4VIS_BUILD_OPENGLX_DRIVER=1
+fi
+
+# terminal
+G4UI_USE_TCSH=
+G4UI_USE_CSH=
+
+case "$host_os" in
+
+  linux*|darwin* )
+    G4UI_USE_TCSH=1
+    ;;
+  cygwin* )
+    G4UI_USE_CSH=1
+    ;;
+
+esac
+
+# Built-in visualization.
+if test -z "$G4VIS_NONE"
+then
+  G4VIS_BUILD_DAWN_DRIVER=1
+  G4VIS_BUILD_RAYTRACERX_DRIVER=1
+  G4VIS_BUILD_VRML_DRIVER=1
+  G4VIS_USE_DAWN=1
+  G4VIS_USE_VRML=1
+  G4VIS_USE_RAYTRACERX=1
+  G4LIB_USE_ZLIB=1
+fi
+
+# Variable substitutions.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

   ;;
 
 lcdd )

@@ -3548,6 +3523,17 @@

+  case "$host_os" in

diff -N configure.ac
--- configure.ac	22 Jun 2006 23:42:35 -0000	1.14
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,75 +0,0 @@

-dnl $Header: /cvs/lcd/SimDist/Attic/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
-
-AC_PREREQ(2.57)
-
-dnl Package info.
-AC_INIT(SimDist,
-	v1r0p0,
-	[log in to unmask])
-
-dnl Set the host variables.
-AC_CANONICAL_HOST
-
-dnl Set which variable to use for runtime location of shared libs.
-AC_OS_SHARED_LIBS_VAR
-
-dnl Check for required programs.
-AC_PROG_MAKE_SET
-AC_PROG_CXX
-AC_PROG_CVS
-AC_PROG_JAVA
-AC_PROG_WGET
-AC_PROG_SCP
-
-dnl Set the SLAC CVS username.
-AC_WITH_CVSUSER
-
-dnl Set the installation prefix.
-AC_WITH_PREFIX
-
-dnl Initialize the SimDist build.
-AC_INIT_SIMDIST
-
-dnl Setup OpenGL if found.
-AC_OPENGL
-
-dnl Setup each package.
-AC_CONFIG_PACKAGES
-
-dnl Individual package configuration.
-AC_CLHEP
-dnl AC_GEANT4
-AC_MYSQL
-
-dnl Setup name of tarball.
-AC_DIST_TGZ
-
-dnl Select location for dist tarball.
-AC_WITH_UPLOAD_DIR
-
-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)
-
-dnl AC_ADD_CONFIG_FILE(build/xerces.gmk)
-dnl AC_ADD_CONFIG_FILE(build/clhep.gmk)
-
-dnl Remove trailing space from input file list.
-config_files=${config_files%\ }
-
-dnl Set AC input files.
-AC_CONFIG_FILES(${config_files})
-
-dnl Generate the files.
-AC_OUTPUT()
-
-dnl Set the permissions on scripts.
-chmod 755 build.sh
-chmod 755 $sim_packages_dir/*/*.sh
-chmod 755 $sim_scripts_dir/*.sh

diff -u -r1.2 -r1.3
--- util.m4	1 Feb 2006 20:16:11 -0000	1.2
+++ util.m4	22 Jun 2006 23:50:04 -0000	1.3
@@ -30,30 +30,30 @@

 do
 
   dnl Makefile

-  ADD_CONFIG_FILE(packages/$p/Makefile)

+  AC_ADD_CONFIG_FILE(packages/$p/Makefile)

 
   dnl variables for the build system

-  ADD_CONFIG_FILE(packages/$p/package.gmk)

+  AC_ADD_CONFIG_FILE(packages/$p/package.gmk)

 
   dnl vars required by the package itself (e.g. SLIC_BASE)

-  ADD_CONFIG_FILE(packages/$p/env.gmk)

+  AC_ADD_CONFIG_FILE(packages/$p/env.gmk)

 
   dnl download script if exists
   if test -e "$sim_packages_dir/$p/${download_script}.in"
   then

-    ADD_CONFIG_FILE(packages/$p/${download_script})

+    AC_ADD_CONFIG_FILE(packages/$p/${download_script})

   fi
 
   dnl cvs script if exists
   if test -e "$sim_packages_dir/$p/${cvs_script}.in"
   then

-    ADD_CONFIG_FILE(packages/$p/${cvs_script})

+    AC_ADD_CONFIG_FILE(packages/$p/${cvs_script})

   fi
 
   dnl patch script if exists
   if test -e "$sim_packages_dir/$p/${patch_script}.in"
   then

-    ADD_CONFIG_FILE(packages/$p/${patch_script})

+    AC_ADD_CONFIG_FILE(packages/$p/${patch_script})

   fi
 
 done

@@ -61,7 +61,7 @@

 ])
 
 dnl macro to add a file to the list of .in files

-AC_DEFUN(ADD_CONFIG_FILE, [

+AC_DEFUN(AC_ADD_CONFIG_FILE, [

 
 if test -z $1
 then

@@ -72,26 +72,23 @@

 
 ])
 

-dnl macro to check for necessary installation/build programs
-AC_DEFUN(CHECK_PROGS, [
-
-dnl make
-AC_PROG_MAKE_SET
-
-dnl g++
-AC_PROG_CXX

+AC_DEFUN(AC_PROG_CVS, [

 
 dnl cvs
 AC_CHECK_PROG(have_cvs, cvs, yes, no)
 
 if test $have_cvs == "no"
 then

-  AC_MSG_ERROR(cvs not found)

+  AC_MSG_ERROR(cvs was not found on this system)

 else
   CVS=cvs
   AC_SUBST(CVS)
 fi
 

+])
+
+AC_DEFUN(AC_PROG_JAVA, [
+

 dnl java (for ant bundled with LCIO)
 AC_CHECK_PROG(have_java, java, yes, no)
 

@@ -103,7 +100,10 @@

   AC_SUBST(JAVA)
 fi
 

+])
+

 dnl wget

+AC_DEFUN(AC_PROG_WGET, [

 AC_CHECK_PROG(have_wget, wget, yes, no)
 
 if test $have_wget == "no"

@@ -114,6 +114,10 @@

   AC_SUBST(WGET)
 fi
 

+])
+
+AC_DEFUN(AC_PROG_SCP, [
+

 dnl scp
 AC_CHECK_PROG(have_scp, scp, yes, no)
 

@@ -126,3 +130,171 @@

 fi
 
 ])

+
+AC_DEFUN(AC_WITH_CVSUSER, [
+
+AC_MSG_CHECKING(for SLAC CVS user)
+
+AC_ARG_WITH(cvsuser,
+	AC_HELP_STRING([--with-cvsuser=<path>], [SLAC CVS user name.  (Default is anonymous)]),
+	[cvsuser=$with_cvsuser],
+	[cvsuser=anonymous])
+
+AC_MSG_RESULT([$cvsuser])
+
+cvsroot=:pserver:[log in to unmask]:/cvs/lcd
+
+AC_MSG_CHECKING(for CVSROOT)
+
+AC_MSG_RESULT($cvsroot)
+
+])
+
+dnl macro to set the variable which OS uses for locating shared libs at runtime
+AC_DEFUN(AC_OS_SHARED_LIBS_VAR, [
+
+case "$host_os" in
+  linux*  )
+    OS_SHARED_LIBS_VAR=LD_LIBRARY_PATH
+    ;;
+  cygwin* )
+    OS_SHARED_LIBS_VAR=PATH
+    ;;
+  darwin* )
+    OS_SHARED_LIBS_VAR=DYLD_LIBRARY_PATH
+    ;;
+esac
+
+AC_SUBST(OS_SHARED_LIBS_VAR)
+
+])
+
+dnl Macro to set the name of the dist tarball.
+AC_DEFUN(AC_DIST_TGZ, [
+
+dnl dist version is the same as slic version
+dist_version=$(echo ${slic_version} | sed -e 's/[[a-z]]/\_/g' -e 's/^_//g')
+
+dnl versioned tarball name
+dist_tarball="slic-"${dist_version}"-"${host_os}"-dist".tar.gz
+
+dnl non-versioned tarball name
+dist_tarball_current="slic-current-"${host_os}"-dist".tar.gz
+
+dnl versioned tarball containing binary, xerces, and runscript
+bin_tarball="slic-"${dist_version}"-"${host_os}"-bin".tar.gz
+
+dnl non-versioned bindist tarball name
+bin_tarball_current="slic-current-"${host_os}"-bin".tar.gz
+
+echo "bin_tarball_current=$bin_tarball_current"
+
+dnl substitute to common.gmk
+AC_SUBST(dist_tarball)
+AC_SUBST(dist_tarball_current)
+AC_SUBST(dist_version)
+
+AC_SUBST(bin_tarball_current)
+AC_SUBST(bin_tarball)
+
+])
+
+dnl macro to allow selection of where tarball should be copied; default to SLAC location
+AC_DEFUN(AC_WITH_UPLOAD_DIR, [
+
+AC_MSG_CHECKING(for dist directory)
+
+dnl This won't work for anyone but Jeremy McCormick at SLAC.
+slac_dist="[log in to unmask]:/nfs/slac/g/lcd/mc/prj/www/lcsim/dist/slic"
+
+dnl Set the SCP-style destination directory
+AC_ARG_WITH(distdir,
+            AC_HELP_STRING([--with-distdir=<path>], [Set SCP-style dist directory in form username@host:dir]),
+            dist_dir=$with_distdir,
+            dist_dir=$slac_dist)
+
+AC_SUBST(dist_dir)
+
+AC_MSG_RESULT($dist_dir)
+
+])
+
+dnl Macro to do top-level initialization of the build system and set some common variables and substitutions.
+AC_DEFUN(AC_INIT_SIMDIST, [
+
+sim_dist_dir_basename=$(basename `pwd`)
+AC_SUBST(sim_dist_dir_basename)
+
+packages_dep_order="clhep geant4 lcphys xerces gdml lcio lcdd slic"
+AC_SUBST(packages_dep_order)
+
+packages_reverse_dep_order=""
+for p in $(echo $packages_dep_order)
+do
+  packages_reverse_dep_order=${p}" "${packages_reverse_dep_order}
+done
+
+AC_SUBST(packages_reverse_dep_order)
+
+download_script=download.sh
+AC_SUBST(download_script)
+
+cvs_script=cvs.sh
+AC_SUBST(cvs_script)
+
+patch_script=patch.sh
+AC_SUBST(patch_script)
+
+gen_files="package.gmk env.gmk download.sh cvs.sh patch.sh GNUmakefile *.tar.gz *.tgz"
+AC_SUBST(gen_files)
+
+sim_dist_dir=$(pwd)
+
+AC_SUBST(sim_dist_dir)
+
+AC_ADD_CONFIG_FILE("build/common.gmk")
+
+sim_packages_dir=$(pwd)/packages
+AC_SUBST(sim_packages_dir)
+
+sim_build_dir=$(pwd)/build
+AC_SUBST(sim_build_dir)
+
+sim_scripts_dir=$(pwd)/scripts
+AC_SUBST(sim_scripts_dir)
+
+AC_MSG_CHECKING(for packages list)
+
+for p in $(ls -1 packages | grep -v CVS)
+do
+  if test -d $sim_packages_dir/$p
+  then
+    packages_list="$packages_list"${p}" "
+  fi
+done
+
+packages_list=${packages_list%\ }
+
+AC_MSG_RESULT($packages_list)
+
+MAKE_CONFIG_FILES_LIST
+
+])
+
+dnl Macro to set the installation prefix.
+AC_DEFUN(AC_WITH_PREFIX, [
+
+AC_MSG_CHECKING(for installation prefix)
+
+AC_ARG_WITH(prefix,
+	AC_HELP_STRING([--with-prefix=<path>],[binary installation base area]),
+	[prefix=$with_prefix],
+	[prefix=/usr/local])
+
+if test [ -d "$prefix" ]; then
+  AC_MSG_RESULT($prefix)
+else
+  AC_MSG_ERROR($prefix is not a directory)
+fi
+
+])

diff -N dist.m4
--- dist.m4	19 May 2006 00:36:35 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,49 +0,0 @@

-dnl macro to set the name of the dist tarball
-AC_DEFUN(DIST_TGZ, [
-
-dnl dist version is the same as slic version
-dist_version=$(echo ${slic_version} | sed -e 's/[[a-z]]/\_/g' -e 's/^_//g')
-
-dnl versioned tarball name
-dist_tarball="slic-"${dist_version}"-"${platform}"-dist".tar.gz
-
-dnl non-versioned tarball name
-dist_tarball_current="slic-current-"${platform}"-dist".tar.gz
-
-dnl versioned tarball containing binary, xerces, and runscript 
-bin_tarball="slic-"${dist_version}"-"${platform}"-bin".tar.gz
-
-dnl non-versioned bindist tarball name
-bin_tarball_current="slic-current-"${platform}"-bin".tar.gz
-
-echo "bin_tarball_current=$bin_tarball_current"
-
-dnl substitute to common.gmk
-AC_SUBST(dist_tarball)
-AC_SUBST(dist_tarball_current)
-AC_SUBST(dist_version)
-
-AC_SUBST(bin_tarball_current)
-AC_SUBST(bin_tarball)
-
-])
-
-dnl macro to allow selection of where tarball should be copied; default to SLAC location
-AC_DEFUN(WITH_UPLOAD_DIR, [
-
-AC_MSG_CHECKING(for dist directory)
-
-dnl This won't work for anyone but Jeremy McCormick (SLAC).
-slac_dist="[log in to unmask]:/nfs/slac/g/lcd/mc/prj/www/lcsim/dist/slic"
-
-dnl Set the SCP-style destination directory
-AC_ARG_WITH(distdir,
-            AC_HELP_STRING([--with-distdir=<path>], [Set SCP-style dist directory in form username@host:dir]),
-            dist_dir=$with_distdir,
-            dist_dir=$slac_dist)
-
-AC_SUBST(dist_dir)
-
-AC_MSG_RESULT($dist_dir)
-
-])