diff -u -r1.32 -r1.33
--- configure	25 May 2006 01:06:04 -0000	1.32
+++ configure	20 Jun 2006 22:22:45 -0000	1.33
@@ -273,7 +273,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_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 MYSQL_BASEDIR MYSQL_INCLUDEDIR MYSQL_LIBDIR dist_tarball dist_tarball_current dist_vers!
 ion 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 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_p!
 ackage_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_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 MYSQL_BASEDIR MYSQL_INCLUDEDIR MYSQL_LIBDIR d!
 ist_tarball dist_tarball_current dist_version bin_tarball_curr!
 ent bin_
tarball dist_dir LIBOBJS LTLIBOBJS'

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

@@ -3499,8 +3499,7 @@

   ;;
 
 mokka )

-
-  mokka_base_url=http://polype.in2p3.fr/geant4/tesla/www/mokka/software/mokka_tags/

+  mokka_base_url=http://polywww.in2p3.fr/activites/physique/geant4/tesla/www/mokka/software/mokka_tags/

   mokka_tgz=Mokka-mokka-${package_version}.tgz
 
 

@@ -3658,6 +3657,15 @@

+if test $host_os == "Darwin"
+then
+  XERCES_OS=MACOSX
+else
+  XERCES_OS=$(uname | tr [a-z] [A-Z])
+fi
+
+
+

 
 
   xerces_version=${package_version}

@@ -4197,10 +4205,9 @@

   # 1. Remove the extension, and $U if already installed.
   ac_i=`echo "$ac_i" |
 	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`

-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'

+  # 2. Add them.
+  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'

 done
 LIBOBJS=$ac_libobjs
 

@@ -4822,6 +4829,7 @@

 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_OS@,$XERCES_OS,;t t

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