SimDist/build
diff -u -r1.3 -r1.4
--- geant4.m4 5 Jul 2006 23:27:56 -0000 1.3
+++ geant4.m4 6 Jul 2006 18:17:08 -0000 1.4
@@ -73,12 +73,12 @@
fi
# Win32 OpenGL config.
-case "$host_os" in
- cygwin* )
- G4VIS_BUILD_OPENGLWIN32_DRIVER=1
- G4VIS_USE_OPENGLWIN32=1
- ;;
-esac
+dnl case "$host_os" in
+dnl cygwin* )
+dnl G4VIS_BUILD_OPENGLWIN32_DRIVER=1
+dnl G4VIS_USE_OPENGLWIN32=1
+dnl ;;
+dnl esac
# terminal
G4UI_USE_TCSH=
@@ -150,5 +150,7 @@
AC_SUBST(G4WORKDIR)
AC_SUBST(G4UI_NONE)
AC_SUBST(G4VIS_NONE)
+AC_SUBST(G4VIS_BUILD_OPENGL_DRVIER)
+AC_SUBST(G4VIS_USE_OPENGL)
-])
\ No newline at end of file
+])
SimDist
diff -u -r1.41 -r1.42
--- configure 5 Jul 2006 23:27:56 -0000 1.41
+++ configure 6 Jul 2006 18:17:08 -0000 1.42
@@ -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 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 SLACCVSROOT SLACCVSUSER 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_BASEDIR CLHEP_BUILDDIR CLHEP_CONFIG_OPTS CLHEP_DIR_ORIG CLHEP_DOWNLOAD GDML_BASEDIR GDML_BUILDDIR GDML_DIR_ORIG GDML_DOWNLOAD GDML_CONFIG_OPTS GEANT4_VERSION_DOWNLOAD GEAN!
T4_BUILDDIR GEANT4_DIR_ORIG GEANT4_DOWNLOAD GEANT4_VERSION 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_BASEDIR LCIO_BASEDIR LCPHYS_CVSMODULE LCPHYS_BASEDIR slic_binname SLIC_VERSION SLIC_BASEDIR MOKKA_BASEDIR MOKKA_BUILDDIR MOKKA_DOWNLOAD MOKKA_DIR_ORIG XERCES_CONFIGURE_ARGS!
XERCES_OS XERCES_USE_SHARED_LIB XERCES_USE_STATIC_LIB xerces_!
version_
underscore XERCES_VERSION XERCES_BASEDIR XERCES_BUILDDIR XERCES_CONFIG XERCES_CONFIG_OPTS XERCES_DOWNLOAD XERCES_DIR_ORIG XERCES_OBJDIR 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 SLACCVSROOT SLACCVSUSER 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_BASEDIR CLHEP_BUILDDIR CLHEP_CONFIG_OPTS CLHEP_DIR_ORIG CLHEP_DOWNLOAD GDML_BASEDIR GDML_BUILDDIR GDML_DIR_ORIG GDML_DOWNLOAD GDML_CONFIG_OPTS GEANT4_VERSION_DOWNLOAD GEANT4!
_BUILDDIR GEANT4_DIR_ORIG GEANT4_DOWNLOAD GEANT4_VERSION 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 G4VIS_BUILD_OPENGL_DRVIER G4VIS_USE_OPENGL LCDD_BASEDIR LCIO_BASEDIR LCPHYS_CVSMODULE LCPHYS_BASEDIR slic_binname SLIC_VERSION SLIC_BASEDIR !
MOKKA_BASEDIR MOKKA_BUILDDIR MOKKA_DOWNLOAD MOKKA_DIR_ORIG XER!
CES_CONF
IGURE_ARGS XERCES_OS XERCES_USE_SHARED_LIB XERCES_USE_STATIC_LIB xerces_version_underscore XERCES_VERSION XERCES_BASEDIR XERCES_BUILDDIR XERCES_CONFIG XERCES_CONFIG_OPTS XERCES_DOWNLOAD XERCES_DIR_ORIG XERCES_OBJDIR 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.
@@ -2622,12 +2622,6 @@
fi
# Win32 OpenGL config.
-case "$host_os" in
- cygwin* )
- G4VIS_BUILD_OPENGLWIN32_DRIVER=1
- G4VIS_USE_OPENGLWIN32=1
- ;;
-esac
# terminal
G4UI_USE_TCSH=
@@ -2703,6 +2697,8 @@
+
+
;;
lcdd )
@@ -3807,6 +3803,8 @@
s,@G4WORKDIR@,$G4WORKDIR,;t t
s,@G4UI_NONE@,$G4UI_NONE,;t t
s,@G4VIS_NONE@,$G4VIS_NONE,;t t
+s,@G4VIS_BUILD_OPENGL_DRVIER@,$G4VIS_BUILD_OPENGL_DRVIER,;t t
+s,@G4VIS_USE_OPENGL@,$G4VIS_USE_OPENGL,;t t
s,@LCDD_BASEDIR@,$LCDD_BASEDIR,;t t
s,@LCIO_BASEDIR@,$LCIO_BASEDIR,;t t
s,@LCPHYS_CVSMODULE@,$LCPHYS_CVSMODULE,;t t
