diff -u -r1.26 -r1.27
--- configure	3 May 2006 23:04:14 -0000	1.26
+++ configure	10 May 2006 23:00:15 -0000	1.27
@@ -272,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 SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA have_wget WGET have_scp SCP host_os 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_di!
 r_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 xerces_configure_args 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 dist_tarball dist_tarball_current dist_version 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 SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA have_wget WGET have_scp SCP host_os 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_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 dist_tarball dist_tarball_current dist_version bin_tarball dist_dir LIBOBJS LTLIBOBJ!
 S'

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

@@ -3324,6 +3324,149 @@

 
   ;;
 

+mokka )
+
+  mokka_base_url=http://polype.in2p3.fr/geant4/tesla/www/mokka/software/mokka_tags/
+  mokka_tgz=Mokka-mokka-${package_version}.tgz
+
+
+
+f=$sim_packages_dir/mokka/package.gmk.in
+
+echo "export PACKAGE = @mokka@" >> $f ;
+
+if test -z "mokka"
+then
+  v=`eval echo $mokka`
+else
+  v=mokka
+fi
+
+mokka=$v
+
+
+
+
+
+f=$sim_packages_dir/mokka/package.gmk.in
+
+echo "export PACKAGE_VERSION = @mokka_version@" >> $f ;
+
+if test -z "${package_version}"
+then
+  v=`eval echo $mokka_version`
+else
+  v=${package_version}
+fi
+
+mokka_version=$v
+
+
+
+
+
+f=$sim_packages_dir/mokka/package.gmk.in
+
+echo "export PACKAGE_DIR = @mokka_package_dir@" >> $f ;
+
+if test -z "${package_dir}"
+then
+  v=`eval echo $mokka_package_dir`
+else
+  v=${package_dir}
+fi
+
+mokka_package_dir=$v
+
+
+
+
+
+f=$sim_packages_dir/mokka/package.gmk.in
+
+echo "export PACKAGE_BASEDIR = @mokka_base_dir@" >> $f ;
+
+if test -z "${package_base_dir}"
+then
+  v=`eval echo $mokka_base_dir`
+else
+  v=${package_base_dir}
+fi
+
+mokka_base_dir=$v
+
+
+
+
+
+f=$sim_packages_dir/mokka/package.gmk.in
+
+echo "export PACKAGE_BUILDDIR = @mokka_build_dir@" >> $f ;
+
+if test -z "${package_base_dir}/source"
+then
+  v=`eval echo $mokka_build_dir`
+else
+  v=${package_base_dir}/source
+fi
+
+mokka_build_dir=$v
+
+
+
+
+
+f=$sim_packages_dir/mokka/package.gmk.in
+
+echo "export PACKAGE_DOWNLOAD = @mokka_download@" >> $f ;
+
+if test -z "${mokka_base_url}/${mokka_tgz}"
+then
+  v=`eval echo $mokka_download`
+else
+  v=${mokka_base_url}/${mokka_tgz}
+fi
+
+mokka_download=$v
+
+
+
+
+
+f=$sim_packages_dir/mokka/package.gmk.in
+
+echo "export PACKAGE_DIR_ORIG = @mokka_dir_orig@" >> $f ;
+
+if test -z "Mokka"
+then
+  v=`eval echo $mokka_dir_orig`
+else
+  v=Mokka
+fi
+
+mokka_dir_orig=$v
+
+
+
+
+
+f=$sim_packages_dir/mokka/package.gmk.in
+
+echo "export PACKAGE_TGZ_LOCAL = @mokka_tgz_local@" >> $f ;
+
+if test -z "mokka.tar.gz"
+then
+  v=`eval echo $mokka_tgz_local`
+else
+  v=mokka.tar.gz
+fi
+
+mokka_tgz_local=$v
+
+
+
+  ;;
+

 xerces )
 
 

@@ -3595,6 +3738,18 @@

+if test -z scripts/mokka.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/mokka.sh" "
+
+
+
+

 if test -z Makefile
 then
   { { echo "$as_me:$LINENO: error: \"Missing config file to add.\"" >&5

@@ -4358,6 +4513,14 @@

 s,@slic_package_dir@,$slic_package_dir,;t t
 s,@slic_base_dir@,$slic_base_dir,;t t
 s,@slic_cvsroot@,$slic_cvsroot,;t t

+s,@mokka@,$mokka,;t t
+s,@mokka_version@,$mokka_version,;t t
+s,@mokka_package_dir@,$mokka_package_dir,;t t
+s,@mokka_base_dir@,$mokka_base_dir,;t t
+s,@mokka_build_dir@,$mokka_build_dir,;t t
+s,@mokka_download@,$mokka_download,;t t
+s,@mokka_dir_orig@,$mokka_dir_orig,;t t
+s,@mokka_tgz_local@,$mokka_tgz_local,;t t

 s,@xerces_configure_args@,$xerces_configure_args,;t t
 s,@xerces_version_underscore@,$xerces_version_underscore,;t t
 s,@xerces@,$xerces,;t t

diff -u -r1.3 -r1.4
--- Makefile.in	3 May 2006 22:47:54 -0000	1.3
+++ Makefile.in	10 May 2006 23:00:18 -0000	1.4
@@ -1,4 +1,4 @@

-# $Id: Makefile.in,v 1.3 2006/05/03 22:47:54 jeremy Exp $

+# $Id: Makefile.in,v 1.4 2006/05/10 23:00:18 jeremy Exp $

 
 include @[log in to unmask]
 

@@ -41,4 +41,4 @@

 #@geant4@ @lcdd@ @lcio@
 
 @xerces@ :

-	cd @xerces@ && $(MAKE) $(TARGET);:

\ No newline at end of file

+	cd @xerces@ && $(MAKE) $(TARGET);: