+If you fiddle, changes will only stick in files with the ".in" extension. + +Run ac.sh to regenerate the build files from these inputs files. + +More options will be added as the build system evolves. +

+ +AC_DEFUN(SIM_CONFIG_OGL, [ + +AC_MSG_CHECKING(for OpenGL) + +if test -z $OGLHOME +then + case "$host_os" in + Linux ) _ogldir=/usr;; + CYGWIN ) _ogldir=/usr;; + DARWIN ) _ogldir=/usr/X11R6;; + * ) ;; + esac +else + _ogldir=$OGLHOME +fi + +if test -e $OGLHOME +then + + # check header file to see if OpenGL is installed + if test -e ${_ogldir}/include/gl.h} + then + HAVE_OGL=1 + fi +fi + +if test -n $HAVE_OGL +then + OGLHOME=${_ogldir} + USE_OGL=yes + AC_SUBST(USE_OGL) + AC_SUBST(OGLHOME) + AC_DEFINE(HAVE_OGL) +fi + +AC_MSG_RESULT(yes) + +])

diff -u -r1.6 -r1.7
--- configure	18 Nov 2005 01:37:20 -0000	1.6
+++ configure	22 Nov 2005 01:48:18 -0000	1.7
@@ -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 have_java have_wget 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_base_dir clhep_version clhep_package_name clhep_build_dir gdml_base_dir gdml_version gdml_package_name gdml_build_dir geant4_base_dir geant4_version geant4_package_name geant4_build_dir lcdd_base_dir lcdd_version lcdd_package_name lcdd_build_dir lcio_base_dir lcio_version lcio_package_name lcio_build_dir lcphys_base_dir lcphys_version lcphys_package_n!
 ame lcphys_build_dir slic_base_dir slic_version slic_package_name slic_build_dir xerces_base_dir xerces_version xerces_package_name xerces_build_dir g4system xerces_configure_args os_shared_libs_var 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 have_java have_wget 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_base_dir clhep_version clhep_package_name clhep_build_dir gdml_base_dir gdml_version gdml_package_name gdml_build_dir geant4_base_dir geant4_version geant4_package_name geant4_build_dir lcdd_base_dir lcdd_version lcdd_package_name lcdd_build_dir lcio_base_dir lcio_version lcio_package_name lcio_buil!
 d_dir lcphys_base_dir lcphys_version lcphys_package_name lcphys_build_dir slic_base_dir slic_version slic_package_name slic_build_dir xerces_base_dir xerces_version xerces_package_name xerces_build_dir g4system xerces_configure_args os_shared_libs_var LIBOBJS LTLIBOBJS'

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

@@ -2147,6 +2147,51 @@

+# config OpenGL
+
+
+echo "$as_me:$LINENO: checking for OpenGL" >&5
+echo $ECHO_N "checking for OpenGL... $ECHO_C" >&6
+
+if test -z $OGLHOME
+then
+  case "$host_os" in
+  Linux            ) _ogldir=/usr;;
+  CYGWIN           ) _ogldir=/usr;;
+  DARWIN           ) _ogldir=/usr/X11R6;;
+  *                ) ;;
+  esac
+else
+  _ogldir=$OGLHOME
+fi
+
+if test -e $OGLHOME
+then
+
+  # check header file to see if OpenGL is installed
+  if test -e ${_ogldir}/include/gl.h}
+  then
+    HAVE_OGL=1
+  fi
+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: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+
+

 # config the individual packages

@@ -3021,6 +3066,8 @@

 s,@sim_packages_dir@,$sim_packages_dir,;t t
 s,@sim_build_dir@,$sim_build_dir,;t t
 s,@sim_scripts_dir@,$sim_scripts_dir,;t t

+s,@USE_OGL@,$USE_OGL,;t t
+s,@OGLHOME@,$OGLHOME,;t t

 s,@clhep_base_dir@,$clhep_base_dir,;t t
 s,@clhep_version@,$clhep_version,;t t
 s,@clhep_package_name@,$clhep_package_name,;t t

Commit in `SimDist` on MAIN
`INSTALL`	+6		1.2 -> 1.3
`TODO`	+10	-4	1.5 -> 1.6
`aclocal.m4`	+39		1.4 -> 1.5
`configure`	+48	-1	1.6 -> 1.7
`configure.ac`	+4	-1	1.4 -> 1.5
`build/util.inc.sh`	+2	-2	1.1 -> 1.2
`packages/clhep/GNUmakefile.in`	+5	-5	1.2 -> 1.3
`/download.sh.in`	+2	-1	1.1 -> 1.2
`packages/gdml/GNUmakefile.in`	+2	-2	1.3 -> 1.4
`packages/geant4/GNUmakefile.in`	+2	-2	1.5 -> 1.6
`/download.sh.in`	+2	-2	1.3 -> 1.4
`packages/lcdd/GNUmakefile.in`	+2	-2	1.3 -> 1.4
`/env.gmk.in`	+1	-1	1.1 -> 1.2
`packages/lcio/GNUmakefile.in`	+2	-2	1.3 -> 1.4
`packages/slic/GNUmakefile.in`	+2	-2	1.2 -> 1.3
`packages/xerces/GNUmakefile.in`	+3	-3	1.3 -> 1.4
	+132	-30