Changeset 1337 for trunk/config


Ignore:
Timestamp:
Sep 30, 2010, 2:47:17 PM (14 years ago)
Author:
garnier
Message:

tag geant4.9.4 beta 1 + modifs locales

Location:
trunk/config
Files:
23 edited

Legend:

Unmodified
Added
Removed
  • trunk/config/CVS/Entries

    r1331 r1337  
    1 /G4UI_BUILD.gmk/1.5/Wed Oct  3 12:15:05 2007//Tgeant4-09-04-beta-01
    2 /G4UI_USE.gmk/1.15/Thu Mar  5 09:19:37 2009//Tgeant4-09-04-beta-01
    3 /G4VIS_BUILD.gmk/1.22/Thu Nov  5 10:06:54 2009//Tgeant4-09-04-beta-01
    4 /G4VIS_USE.gmk/1.28/Tue Nov 17 11:34:56 2009//Tgeant4-09-04-beta-01
    5 /History/1.379/Fri Jun 11 10:02:27 2010//Tgeant4-09-04-beta-01
    6 /analysis.gmk/1.18/Thu Mar  5 09:19:37 2009//Tgeant4-09-04-beta-01
    7 /architecture.gmk/1.121/Wed Nov 18 17:27:38 2009//Tgeant4-09-04-beta-01
    8 /binmake.gmk/1.146/Mon Jun  7 09:01:10 2010//Tgeant4-09-04-beta-01
    9 /common.gmk/1.54/Thu Feb 26 16:29:08 2009//Tgeant4-09-04-beta-01
    10 /globlib.gmk/1.29/Thu Feb 26 16:40:40 2009//Tgeant4-09-04-beta-01
    11 /interactivity.gmk/1.12/Wed Oct  8 01:47:49 2008//Tgeant4-09-04-beta-01
    12 /liblist.c/1.21/Tue May 20 13:33:34 2008//Tgeant4-09-04-beta-01
    13 /moc.gmk/1.3/Wed Dec  3 13:35:36 2008//Tgeant4-09-04-beta-01
    14 /win32def.c/1.3/Fri Jun 18 16:10:06 2004//Tgeant4-09-04-beta-01
    15 D
     1D/scripts////
     2D/sys////
     3/G4UI_BUILD.gmk/1.5/Thu Sep 30 06:01:23 2010//Tgeant4-09-04-beta-01
     4/G4UI_USE.gmk/1.15/Thu Sep 30 06:01:23 2010//Tgeant4-09-04-beta-01
     5/G4VIS_BUILD.gmk/1.22/Thu Sep 30 06:01:24 2010//Tgeant4-09-04-beta-01
     6/G4VIS_USE.gmk/1.28/Thu Sep 30 06:01:24 2010//Tgeant4-09-04-beta-01
     7/History/1.379/Thu Sep 30 06:01:24 2010//Tgeant4-09-04-beta-01
     8/analysis.gmk/1.18/Thu Sep 30 06:01:24 2010//Tgeant4-09-04-beta-01
     9/architecture.gmk/1.121/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-beta-01
     10/binmake.gmk/1.146/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-beta-01
     11/common.gmk/1.54/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-beta-01
     12/globlib.gmk/1.29/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-beta-01
     13/interactivity.gmk/1.12/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-beta-01
     14/liblist.c/1.21/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-beta-01
     15/moc.gmk/1.3/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-beta-01
     16/win32def.c/1.3/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-beta-01
  • trunk/config/G4UI_BUILD.gmk

    r1213 r1337  
    3131endif
    3232
     33ifdef G4UI_BUILD_XAW_SESSION
     34  G4UI_BUILD = 1
     35  G4UI_BUILD_BASIC_SESSION = 1
     36  G4INTY_BUILD_XT = 1
     37  INC_XAW = 1
     38  CPPFLAGS += -DG4UI_BUILD_XAW_SESSION
     39endif
     40
    3341ifdef G4UI_BUILD_WIN32_SESSION
    3442  G4UI_BUILD = 1
     
    5260   endif
    5361
     62   ifdef G4UI_BUILD_XAW_SESSION
     63     G4UI_USE_XAW = 1
     64   endif
     65
    5466   ifdef G4UI_BUILD_WIN32_SESSION
    5567     G4UI_USE_WIN32 = 1
  • trunk/config/G4UI_USE.gmk

    r1213 r1337  
    6868endif
    6969
     70ifdef G4UI_USE_XAW
     71  G4UI_USE  = 1
     72  G4INTY_USE_XT = 1
     73  INC_XAW   = 1
     74  LOAD_XAW  = 1
     75  CPPFLAGS += -DG4UI_USE_XAW
     76endif
     77
    7078ifdef G4UI_USE_WIN32
    7179  G4UI_USE  = 1
  • trunk/config/History

    r1303 r1337  
    1 cvs log $Id: History,v 1.372 2009/11/25 14:20:40 gcosmo Exp $
     1cvs log $Id: History,v 1.379 2010/06/11 10:02:27 gunter Exp $
    22-------------------------------------------------------------------
    33
     
    1616     * Reverse chronological order (last date on top), please *
    1717     ----------------------------------------------------------
     18
     1911 June 2010  Gunter Folger   (config-V09-03-05)
     20- Increase stack size on Windows, in sys/WIN-VC add a /STACK:8368128
     21   (ie. 8MB) option to LDFLAGS; Needed by some Chips based
     22   examples and tests.
     23
     247th June 2010  Gabriele Cosmo (config-V09-03-04)
     25- Removed processes/hadronic/models/leading_particle module from include
     26  paths list.
     27
     283rd June 2010  Ben Morgan (config-V09-03-03)
     29- Added new data set G4NEUTRONXS (Evaluated neutron cross section data,
     30  version 1.0) to Configure script. Coworks with tag "Configure-V09-03-01".
     31
     3211th May 2010  Ben Morgan (config-V09-03-02)
     33- Updated internal scripts for Configure: protected echos on LD_LIBRARY_PATH
     34  so that output from use of Configure post-install is clean.
     35
     3615th March 2010  Ben Morgan (config-V09-03-01)
     37- Configure script (Configure-V09-03-00):
     38  o Corrected settings of LD_LYBRARY_PATH for CLHEP for the case of static
     39    libraries build selection (path was set only for the dynamic libraries
     40    case...).
     41  o Corrected detection of Qt modules on MacOSX.
     42    Addressing problem report #1095.
     43- Updated internal scripts for Configure.
     44
     4520th January 2010  Gabriele Cosmo (config-V09-03-00)
     46- binmake.gmk: removed extra space characters in definition of TARGOBJEXT,
     47  fixing issue with target for main() not being rebuilt according to
     48  dependencies change. Addressing problem report #1098.
    1849
    195025th November 2009  Ben Morgan (config-V09-02-17)
  • trunk/config/binmake.gmk

    r1303 r1337  
    1 # $Id: binmake.gmk,v 1.144 2009/11/20 11:09:18 gcosmo Exp $
     1# $Id: binmake.gmk,v 1.146 2010/06/07 09:01:10 gcosmo Exp $
    22# ----------------------------------------------------------
    33# Script defining rules and paths for making binaries.
     
    109109              -I$(G4BASE)/processes/hadronic/models/inucl/include \
    110110              -I$(G4BASE)/processes/hadronic/models/isotope_production/include \
    111               -I$(G4BASE)/processes/hadronic/models/leading_particle/include \
    112111              -I$(G4BASE)/processes/hadronic/models/lll_fission/include \
    113112              -I$(G4BASE)/processes/hadronic/models/low_energy/include \
     
    311310  endif
    312311  OUT   := /Fe
    313   TARGOBJEXT := OBJ   
     312  TARGOBJEXT := OBJ
    314313else
    315314  # Unix
    316315  LDLIBS = $(TARGETLIB) $(LDLIBS_PREFINAL)
    317316  OUT   := -o
    318   TARGOBJEXT := o   
     317  TARGOBJEXT := o
    319318endif
    320319
     
    340339  ifndef GLOBALLIBS
    341340        @echo "Using granular libraries ..."
    342         @echo $(G4TMP)
    343341        @if [ ! \( -f $(G4LIB)/$(G4SYSTEM)/liblist \
    344342          -a -f $(G4LIB)/$(G4SYSTEM)/libname.map \) ]; then \
  • trunk/config/interactivity.gmk

    r1213 r1337  
    5858endif
    5959
     60# Should be before X11.
     61ifdef INC_XAW
     62  INC_X11   = 1
     63  CPPFLAGS += $(XAWFLAGS)
     64endif
     65ifdef LOAD_XAW
     66  LOAD_X11           = 1
     67  INTYLIBS += $(XAWLIBS)
     68endif
     69
     70
    6071ifdef INC_X11
    6172  CPPFLAGS += $(X11FLAGS)
  • trunk/config/scripts/CVS/Entries

    r1331 r1337  
    1 /GNUmakefile/1.8/Thu Oct  2 17:57:10 2003//Tgeant4-09-04-beta-01
    2 /binmake.gmk/1.11/Fri Dec 12 10:07:56 2003//Tgeant4-09-04-beta-01
    3 /env.csh.SH/1.49/Thu Jun  3 13:13:01 2010//Tgeant4-09-04-beta-01
    4 /env.sh.SH/1.54/Thu Jun  3 13:13:01 2010//Tgeant4-09-04-beta-01
    5 /install.sh.SH/1.45/Fri Nov 20 17:40:25 2009//Tgeant4-09-04-beta-01
    6 /move.sh.SH/1.18/Fri Nov 20 17:40:25 2009//Tgeant4-09-04-beta-01
     1/GNUmakefile/1.8/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-beta-01
     2/binmake.gmk/1.11/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-beta-01
     3/env.csh.SH/1.49/Thu Sep 30 06:01:26 2010//Tgeant4-09-04-beta-01
     4/env.sh.SH/1.54/Thu Sep 30 06:01:26 2010//Tgeant4-09-04-beta-01
     5/install.sh.SH/1.45/Thu Sep 30 06:01:26 2010//Tgeant4-09-04-beta-01
     6/move.sh.SH/1.18/Thu Sep 30 06:01:26 2010//Tgeant4-09-04-beta-01
    77D
  • trunk/config/scripts/env.csh.SH

    r1213 r1337  
    3131unsetenv  CLHEP_LIB_DIR
    3232
    33 unsetenv  G4ANALYSIS_USE
    3433unsetenv  G4DEBUG
    3534unsetenv  G4INCLUDE
     
    4241unsetenv  G4ABLADATA
    4342unsetenv  G4REALSURFACEDATA
     43unsetenv  G4NEUTRONXSDATA
    4444
    4545unsetenv  G4LIB
     
    5757unsetenv  G4UI_NONE
    5858unsetenv  G4UI_BUILD_WIN32_SESSION
     59unsetenv  G4UI_BUILD_XAW_SESSION
    5960unsetenv  G4UI_BUILD_XM_SESSION
    6061unsetenv  G4UI_USE_TCSH
    6162unsetenv  G4UI_USE_WIN32
     63unsetenv  G4UI_USE_XAW
    6264unsetenv  G4UI_USE_XM
    6365unsetenv  G4UI_USE_QT
     
    9799#+
    98100if ( X$g4install != X$g4final_install ) then
    99 setenv G4INSTALL "$g4final_install/src/geant4"
    100 echo "On this machine the G4INSTALL=\$G4INSTALL"
     101    setenv G4INSTALL "$g4final_install/src/geant4"
     102    echo "On this machine the G4INSTALL=\$G4INSTALL"
    101103else
    102 setenv G4INSTALL "$g4install"
    103 echo "On this machine the G4INSTALL=\$G4INSTALL"
     104    setenv G4INSTALL "$g4install"
     105    echo "On this machine the G4INSTALL=\$G4INSTALL"
    104106endif
    105107
    106108#+
    107109if ( X$g4includes_flag != Xn ) then
    108 if ( X$g4install != X$g4final_install ) then
    109 setenv G4INCLUDE "$g4final_install/include/geant4"
    110 else
    111 setenv G4INCLUDE "$g4final_install/include"
    112 endif
    113 echo "On this machine the G4INCLUDE=\$G4INCLUDE"
    114 #else
    115 #setenv G4BASE "$g4final_install/include/geant4/source"
    116 #echo "On this machine the G4BASE=\$G4BASE"
     110    if ( X$g4install != X$g4final_install ) then
     111        setenv G4INCLUDE "$g4final_install/include/geant4"
     112    else
     113        setenv G4INCLUDE "$g4final_install/include"
     114    endif
     115
     116    echo "On this machine the G4INCLUDE=\$G4INCLUDE"
    117117endif
    118118
    119119#+
    120120if ( X$g4lib != X ) then
    121 if ( X$g4install != X$g4final_install ) then
    122 setenv G4LIB "$g4final_install/lib/geant4"
    123 else
    124 setenv G4LIB "$g4final_install/lib"
    125 endif
    126 echo "On this machine the G4LIB=\$G4LIB"
     121    if ( X$g4install != X$g4final_install ) then
     122        setenv G4LIB "$g4final_install/lib/geant4"
     123    else
     124        setenv G4LIB "$g4final_install/lib"
     125    endif
     126
     127    echo "On this machine the G4LIB=\$G4LIB"
    127128endif
    128129
    129130#+
    130131if ( X$g4levelgammadata != X ) then
    131 setenv G4LEVELGAMMADATA "$g4levelgammadata"
    132 echo "On this machine the G4LEVELGAMMADATA=\$G4LEVELGAMMADATA"
     132    setenv G4LEVELGAMMADATA "$g4levelgammadata"
     133    echo "On this machine the G4LEVELGAMMADATA=\$G4LEVELGAMMADATA"
    133134endif
    134135
    135136#+
    136137if ( X$g4radioactivedata != X ) then
    137 setenv G4RADIOACTIVEDATA "$g4radioactivedata"
    138 echo "On this machine the G4RADIOACTIVEDATA=\$G4RADIOACTIVEDATA"
     138    setenv G4RADIOACTIVEDATA "$g4radioactivedata"
     139    echo "On this machine the G4RADIOACTIVEDATA=\$G4RADIOACTIVEDATA"
    139140endif
    140141
    141142#+
    142143if ( X$g4ledata != X ) then
    143 setenv G4LEDATA "$g4ledata"
    144 echo "On this machine the G4LEDATA=\$G4LEDATA"
     144    setenv G4LEDATA "$g4ledata"
     145    echo "On this machine the G4LEDATA=\$G4LEDATA"
    145146endif
    146147
    147148#+
    148149if ( X$g4neutronhpcrosssections != X ) then
    149 setenv G4NEUTRONHPDATA "$g4neutronhpcrosssections"
    150 echo "On this machine the G4NEUTRONHPDATA=\$G4NEUTRONHPDATA"
     150    setenv G4NEUTRONHPDATA "$g4neutronhpcrosssections"
     151    echo "On this machine the G4NEUTRONHPDATA=\$G4NEUTRONHPDATA"
    151152endif
    152153
    153154#+
    154155if ( X$g4abladata != X ) then
    155 setenv G4ABLADATA "$g4abladata"
    156 echo "On this machine the G4ABLADATA=\$G4ABLADATA"
     156    setenv G4ABLADATA "$g4abladata"
     157    echo "On this machine the G4ABLADATA=\$G4ABLADATA"
    157158endif
    158159
    159160#+
    160161if ( X$g4realsurfacedata != X ) then
    161 setenv G4REALSURFACEDATA "$g4realsurfacedata"
    162 echo "On this machine the G4REALSURFACEDATA=\$G4REALSURFACEDATA"
     162    setenv G4REALSURFACEDATA "$g4realsurfacedata"
     163    echo "On this machine the G4REALSURFACEDATA=\$G4REALSURFACEDATA"
     164endif
     165
     166#+
     167if ( X$g4neutronxsdata != X ) then
     168    setenv G4NEUTRONXSDATA "$g4neutronxsdata"
     169    echo "On this machine the G4NEUTRONXSDATA=\$G4NEUTRONXSDATA"
    163170endif
    164171
     
    168175#
    169176if ( X$g4clhep_base_dir != X ) then
    170 setenv CLHEP_BASE_DIR "$g4clhep_base_dir"
    171 echo "On this machine the CLHEP_BASE_DIR=\$CLHEP_BASE_DIR"
     177    setenv CLHEP_BASE_DIR "$g4clhep_base_dir"
     178    echo "On this machine the CLHEP_BASE_DIR=\$CLHEP_BASE_DIR"
    172179endif
    173180
    174181#+
    175182if ( X$g4clhep_include_dir != X ) then
    176 setenv CLHEP_INCLUDE_DIR "$g4clhep_include_dir"
    177 echo "On this machine the CLHEP_INCLUDE_DIR=\$CLHEP_INCLUDE_DIR"
     183    setenv CLHEP_INCLUDE_DIR "$g4clhep_include_dir"
     184    echo "On this machine the CLHEP_INCLUDE_DIR=\$CLHEP_INCLUDE_DIR"
    178185endif
    179186
    180187#+
    181188if ( X$g4clhep_lib_dir != X ) then
    182 setenv CLHEP_LIB_DIR "$g4clhep_lib_dir"
    183 echo "On this machine the CLHEP_LIB_DIR=\$CLHEP_LIB_DIR"
     189    setenv CLHEP_LIB_DIR "$g4clhep_lib_dir"
     190    echo "On this machine the CLHEP_LIB_DIR=\$CLHEP_LIB_DIR"
    184191endif
    185192
    186193#+
    187194if ( X$g4clhep_lib != X ) then
    188 setenv CLHEP_LIB "$g4clhep_lib"
    189 echo "On this machine the CLHEP_LIB=\$CLHEP_LIB"
     195    setenv CLHEP_LIB "$g4clhep_lib"
     196    echo "On this machine the CLHEP_LIB=\$CLHEP_LIB"
    190197endif
    191198
     
    195202#
    196203if ( X$g4debug == Xy ) then
    197 setenv G4DEBUG 1
    198 echo "On this machine the G4DEBUG=\$G4DEBUG"
    199 endif
    200 
    201 #
    202 # g4analysis
    203 #
    204 #+
    205 if ( X$g4wanalysis_use == Xy ) then
    206 setenv G4ANALYSIS_USE 1
    207 echo "On this machine the G4ANALYSIS_USE=\$G4ANALYSIS_USE"
    208 endif
     204    setenv G4DEBUG 1
     205    echo "On this machine the G4DEBUG=\$G4DEBUG"
     206endif
     207
    209208
    210209#
     
    213212#+
    214213if ( X$g4ui_none == Xy ) then
    215 setenv G4UI_NONE 1
    216 echo "On this machine G4UI_NONE is set, so no user interfaces are available"
     214    setenv G4UI_NONE 1
     215    echo "On this machine G4UI_NONE is set, so no user interfaces are available"
    217216endif
    218217
    219218# Check for Windows!
    220219if ( "X\$G4SYSTEM" != "XWIN32-VC" && "X\$G4SYSTEM" != "XWIN32-VC7" ) then
    221 if ( X$g4ui_none != Xy ) then
    222 setenv G4UI_USE_TCSH 1
    223 echo "On this machine the G4UI_USE_TCSH=\$G4UI_USE_TCSH"
    224 endif
     220    if ( X$g4ui_none != Xy ) then
     221        setenv G4UI_USE_TCSH 1
     222        echo "On this machine the G4UI_USE_TCSH=\$G4UI_USE_TCSH"
     223    endif
     224endif
     225
     226#+
     227if ( X$g4ui_build_xaw_session == Xy ) then
     228    setenv G4UI_BUILD_XAW_SESSION 1
     229    echo "On this machine the G4UI_BUILD_XAW_SESSION=\$G4UI_BUILD_XAW_SESSION"
     230endif
     231
     232#+
     233if ( X$g4ui_use_xaw == Xy ) then
     234    setenv G4UI_USE_XAW 1
     235    echo "On this machine the G4UI_USE_XAW=\$G4UI_USE_XAW"
    225236endif
    226237
    227238#+
    228239if ( X$g4ui_build_xm_session == Xy ) then
    229 setenv G4UI_BUILD_XM_SESSION 1
    230 echo "On this machine the G4UI_BUILD_XM_SESSION=\$G4UI_BUILD_XM_SESSION"
     240    setenv G4UI_BUILD_XM_SESSION 1
     241    echo "On this machine the G4UI_BUILD_XM_SESSION=\$G4UI_BUILD_XM_SESSION"
    231242endif
    232243
    233244#+
    234245if ( X$g4ui_use_xm == Xy ) then
    235 setenv G4UI_USE_XM 1
    236 echo "On this machine the G4UI_USE_XM=\$G4UI_USE_XM"
     246    setenv G4UI_USE_XM 1
     247    echo "On this machine the G4UI_USE_XM=\$G4UI_USE_XM"
    237248endif
    238249
    239250#+
    240251if ( X$g4ui_build_win32_session == Xy ) then
    241 setenv G4UI_BUILD_WIN32_SESSION 1
    242 echo "On this machine the G4UI_BUILD_WIN32_SESSION=\$G4UI_BUILD_WIN32_SESSION"
     252    setenv G4UI_BUILD_WIN32_SESSION 1
     253    echo "On this machine the G4UI_BUILD_WIN32_SESSION=\$G4UI_BUILD_WIN32_SESSION"
    243254endif
    244255
    245256#+
    246257if ( X$g4ui_use_win32 == Xy ) then
    247 setenv G4UI_USE_WIN32 1
    248 echo "On this machine the G4UI_USE_WIN32=\$G4UI_USE_WIN32"
     258    setenv G4UI_USE_WIN32 1
     259    echo "On this machine the G4UI_USE_WIN32=\$G4UI_USE_WIN32"
    249260endif
    250261
    251262#+
    252263if ( X$g4ui_build_qt_session == Xy ) then
    253 setenv G4UI_BUILD_QT_SESSION 1
    254 echo "On this machine the G4UI_BUILD_QT_SESSION=\$G4UI_BUILD_QT_SESSION"
     264    setenv G4UI_BUILD_QT_SESSION 1
     265    echo "On this machine the G4UI_BUILD_QT_SESSION=\$G4UI_BUILD_QT_SESSION"
    255266endif
    256267
    257268#+
    258269if ( X$g4ui_use_qt == Xy ) then
    259 setenv G4UI_USE_QT 1
    260 echo "On this machine the G4UI_USE_QT=\$G4UI_USE_QT"
     270    setenv G4UI_USE_QT 1
     271    echo "On this machine the G4UI_USE_QT=\$G4UI_USE_QT"
    261272endif
    262273
     
    268279#+
    269280if ( X$g4vis_none == Xy ) then
    270 setenv G4VIS_NONE 1
    271 echo "On this machine G4VIS_NONE is set, so no vis drivers are available"
     281    setenv G4VIS_NONE 1
     282    echo "On this machine G4VIS_NONE is set, so no vis drivers are available"
    272283endif
    273284
    274285#+
    275286if ( X$g4vis_build_dawn_driver == Xy ) then
    276 setenv G4VIS_BUILD_DAWN_DRIVER 1
    277 echo "On this machine the G4VIS_BUILD_DAWN_DRIVER=\$G4VIS_BUILD_DAWN_DRIVER"
     287    setenv G4VIS_BUILD_DAWN_DRIVER 1
     288    echo "On this machine the G4VIS_BUILD_DAWN_DRIVER=\$G4VIS_BUILD_DAWN_DRIVER"
    278289endif
    279290
    280291#+
    281292if ( X$g4vis_build_openglx_driver == Xy ) then
    282 setenv G4VIS_BUILD_OPENGLX_DRIVER 1
    283 echo "On this machine the G4VIS_BUILD_OPENGLX_DRIVER=\$G4VIS_BUILD_OPENGLX_DRIVER"
     293    setenv G4VIS_BUILD_OPENGLX_DRIVER 1
     294    echo "On this machine the G4VIS_BUILD_OPENGLX_DRIVER=\$G4VIS_BUILD_OPENGLX_DRIVER"
    284295endif
    285296
    286297#+
    287298if ( X$g4vis_build_openglxm_driver == Xy ) then
    288 setenv G4VIS_BUILD_OPENGLXM_DRIVER 1
    289 echo "On this machine the G4VIS_BUILD_OPENGLXM_DRIVER=\$G4VIS_BUILD_OPENGLXM_DRIVER"
     299    setenv G4VIS_BUILD_OPENGLXM_DRIVER 1
     300    echo "On this machine the G4VIS_BUILD_OPENGLXM_DRIVER=\$G4VIS_BUILD_OPENGLXM_DRIVER"
    290301endif
    291302
    292303#+
    293304if ( X$g4vis_build_openglwin32_driver == Xy ) then
    294 setenv G4VIS_BUILD_OPENGLWIN32_DRIVER 1
    295 echo "On this machine the G4VIS_BUILD_OPENGLWIN32_DRIVER=\$G4VIS_BUILD_OPENGLWIN32_DRIVER"
     305    setenv G4VIS_BUILD_OPENGLWIN32_DRIVER 1
     306    echo "On this machine the G4VIS_BUILD_OPENGLWIN32_DRIVER=\$G4VIS_BUILD_OPENGLWIN32_DRIVER"
    296307endif
    297308
    298309#+
    299310if ( X$g4vis_build_oix_driver == Xy ) then
    300 setenv G4VIS_BUILD_OIX_DRIVER 1
    301 echo "On this machine the G4VIS_BUILD_OIX_DRIVER=\$G4VIS_BUILD_OIX_DRIVER"
     311    setenv G4VIS_BUILD_OIX_DRIVER 1
     312    echo "On this machine the G4VIS_BUILD_OIX_DRIVER=\$G4VIS_BUILD_OIX_DRIVER"
    302313endif
    303314
    304315#+
    305316if ( X$g4vis_build_raytracerx_driver == Xy ) then
    306 setenv G4VIS_BUILD_RAYTRACERX_DRIVER 1
    307 echo "On this machine the G4VIS_BUILD_RAYTRACERX_DRIVER=\$G4VIS_BUILD_RAYTRACERX_DRIVER"
     317    setenv G4VIS_BUILD_RAYTRACERX_DRIVER 1
     318    echo "On this machine the G4VIS_BUILD_RAYTRACERX_DRIVER=\$G4VIS_BUILD_RAYTRACERX_DRIVER"
    308319endif
    309320
    310321#+
    311322if ( X$g4vis_build_oiwin32_driver == Xy ) then
    312 setenv G4VIS_BUILD_OIWIN32_DRIVER 1
    313 echo "On this machine the G4VIS_BUILD_OIWIN32_DRIVER=\$G4VIS_BUILD_OIWIN32_DRIVER"
     323    setenv G4VIS_BUILD_OIWIN32_DRIVER 1
     324    echo "On this machine the G4VIS_BUILD_OIWIN32_DRIVER=\$G4VIS_BUILD_OIWIN32_DRIVER"
    314325endif
    315326
    316327#+
    317328if ( X$g4vis_build_vrml_driver == Xy ) then
    318 setenv G4VIS_BUILD_VRML_DRIVER 1
    319 echo "On this machine the G4VIS_BUILD_VRML_DRIVER=\$G4VIS_BUILD_VRML_DRIVER"
     329    setenv G4VIS_BUILD_VRML_DRIVER 1
     330    echo "On this machine the G4VIS_BUILD_VRML_DRIVER=\$G4VIS_BUILD_VRML_DRIVER"
    320331endif
    321332
    322333#+
    323334if ( X$g4vis_build_openglqt_driver == Xy ) then
    324 setenv G4VIS_BUILD_OPENGLQT_DRIVER 1
    325 echo "On this machine the G4VIS_BUILD_OPENGLQT_DRIVER=\$G4VIS_BUILD_OPENGLQT_DRIVER"
     335    setenv G4VIS_BUILD_OPENGLQT_DRIVER 1
     336    echo "On this machine the G4VIS_BUILD_OPENGLQT_DRIVER=\$G4VIS_BUILD_OPENGLQT_DRIVER"
    326337endif
    327338
     
    329340#+
    330341if ( X$g4vis_use_dawn == Xy ) then
    331 setenv G4VIS_USE_DAWN 1
    332 echo "On this machine the G4VIS_USE_DAWN=\$G4VIS_USE_DAWN"
     342    setenv G4VIS_USE_DAWN 1
     343    echo "On this machine the G4VIS_USE_DAWN=\$G4VIS_USE_DAWN"
    333344endif
    334345
    335346#+
    336347if ( X$g4vis_use_openglx == Xy ) then
    337 setenv G4VIS_USE_OPENGLX 1
    338 echo "On this machine the G4VIS_USE_OPENGLX=\$G4VIS_USE_OPENGLX"
     348    setenv G4VIS_USE_OPENGLX 1
     349    echo "On this machine the G4VIS_USE_OPENGLX=\$G4VIS_USE_OPENGLX"
    339350endif
    340351
    341352#+
    342353if ( X$g4vis_use_openglxm == Xy ) then
    343 setenv G4VIS_USE_OPENGLXM 1
    344 echo "On this machine the G4VIS_USE_OPENGLXM=\$G4VIS_USE_OPENGLXM"
     354    setenv G4VIS_USE_OPENGLXM 1
     355    echo "On this machine the G4VIS_USE_OPENGLXM=\$G4VIS_USE_OPENGLXM"
    345356endif
    346357
    347358#+
    348359if ( X$g4vis_use_openglwin32 == Xy ) then
    349 setenv G4VIS_USE_OPENGLWIN32 1
    350 echo "On this machine the G4VIS_USE_OPENGLWIN32=\$G4VIS_USE_OPENGLWIN32"
     360    setenv G4VIS_USE_OPENGLWIN32 1
     361    echo "On this machine the G4VIS_USE_OPENGLWIN32=\$G4VIS_USE_OPENGLWIN32"
    351362endif
    352363
    353364#+
    354365if ( X$g4vis_use_oix == Xy ) then
    355 setenv G4VIS_USE_OIX 1
    356 echo "On this machine the G4VIS_USE_OIX=\$G4VIS_USE_OIX"
     366    setenv G4VIS_USE_OIX 1
     367    echo "On this machine the G4VIS_USE_OIX=\$G4VIS_USE_OIX"
    357368endif
    358369
    359370#+
    360371if ( X$g4vis_use_raytracerx == Xy ) then
    361 setenv G4VIS_USE_RAYTRACERX 1
    362 echo "On this machine the G4VIS_USE_RAYTRACERX=\$G4VIS_USE_RAYTRACERX"
     372    setenv G4VIS_USE_RAYTRACERX 1
     373    echo "On this machine the G4VIS_USE_RAYTRACERX=\$G4VIS_USE_RAYTRACERX"
    363374endif
    364375
    365376#+
    366377if ( X$g4vis_use_oiwin32 == Xy ) then
    367 setenv G4VIS_USE_OIWIN32 1
    368 echo "On this machine the G4VIS_USE_OIWIN32=\$G4VIS_USE_OIWIN32"
     378    setenv G4VIS_USE_OIWIN32 1
     379    echo "On this machine the G4VIS_USE_OIWIN32=\$G4VIS_USE_OIWIN32"
    369380endif
    370381
    371382#+
    372383if ( X$g4vis_use_vrml == Xy ) then
    373 setenv G4VIS_USE_VRML 1
    374 echo "On this machine the G4VIS_USE_VRML=\$G4VIS_USE_VRML"
     384    setenv G4VIS_USE_VRML 1
     385    echo "On this machine the G4VIS_USE_VRML=\$G4VIS_USE_VRML"
    375386endif
    376387
    377388#+
    378389if ( X$g4vis_use_openglqt == Xy ) then
    379 setenv G4VIS_USE_OPENGLQT 1
    380 echo "On this machine the G4VIS_USE_OPENGLQT=\$G4VIS_USE_OPENGLQT"
     390    setenv G4VIS_USE_OPENGLQT 1
     391    echo "On this machine the G4VIS_USE_OPENGLQT=\$G4VIS_USE_OPENGLQT"
    381392endif
    382393
    383394#+
    384395if ( X$g4vis_oglhome != X )  then
    385 setenv OGLHOME "$g4vis_oglhome"
    386 echo "On this machine the OGLHOME=\$OGLHOME"
     396    setenv OGLHOME "$g4vis_oglhome"
     397    echo "On this machine the OGLHOME=\$OGLHOME"
    387398endif
    388399
    389400#+
    390401if ( X$g4vis_oivhome != X )  then
    391 setenv OIVHOME "$g4vis_oivhome"
    392 echo "On this machine the OIVHOME=\$OIVHOME"
     402    setenv OIVHOME "$g4vis_oivhome"
     403    echo "On this machine the OIVHOME=\$OIVHOME"
    393404endif
    394405
     
    396407#+
    397408if ( X$g4vis_build_openglxm_driver != X )  then
    398 setenv XMFLAGS "$g4vis_xmflags"
    399 echo "On this machine the XMFLAGS=\$XMFLAGS"
     409    setenv XMFLAGS "$g4vis_xmflags"
     410    echo "On this machine the XMFLAGS=\$XMFLAGS"
    400411endif
    401412
    402413#+
    403414if ( X$g4vis_build_openglxm_driver != X )  then
    404 setenv XMLIBS "$g4vis_xmlibs"
    405 echo "On this machine the XMLIBS=\$XMLIBS"
     415    setenv XMLIBS "$g4vis_xmlibs"
     416    echo "On this machine the XMLIBS=\$XMLIBS"
    406417endif
    407418
    408419#+
    409420if ( X$g4ui_build_xm_session != X )  then
    410 setenv XMFLAGS "$g4vis_xmflags"
    411 echo "On this machine the XMFLAGS=\$XMFLAGS"
     421    setenv XMFLAGS "$g4vis_xmflags"
     422    echo "On this machine the XMFLAGS=\$XMFLAGS"
    412423endif
    413424
    414425#+
    415426if ( X$g4ui_build_xm_session != X )  then
    416 setenv XMLIBS "$g4vis_xmlibs"
    417 echo "On this machine the XMLIBS=\$XMLIBS"
    418 endif
     427    setenv XMLIBS "$g4vis_xmlibs"
     428    echo "On this machine the XMLIBS=\$XMLIBS"
     429endif
     430
     431#+
     432if ( X$g4ui_build_xaw_session != X )  then
     433    setenv XAWFLAGS "$g4ui_xawflags"
     434    echo "On this machine the XAWFLAGS=\$XAWFLAGS"
     435endif
     436
     437#+
     438if ( X$g4ui_build_xaw_session != X )  then
     439setenv XAWLIBS "$g4ui_xawlibs"
     440echo "On this machine the XAWLIBS=\$XAWLIBS"
     441endif
     442
    419443
    420444#
     
    422446#+
    423447if ( "X$g4ui_build_qt_session" == "Xy" || "X$g4ui_use_qt" == "Xy" )  then
    424 setenv QTFLAGS "$g4_qt_cxxflags"
    425 setenv QTLIBS "$g4_qt_libs"
    426 setenv QTMOC "$g4_qt_moc"
    427 echo "On this machine the QTFLAGS=\$QTFLAGS"
    428 echo "On this machine the QTLIBS=\$QTLIBS"
    429 echo "On this machine the QTMOC=\$QTMOC"
     448    setenv QTFLAGS "$g4_qt_cxxflags"
     449    setenv QTLIBS "$g4_qt_libs"
     450    setenv QTMOC "$g4_qt_moc"
     451    echo "On this machine the QTFLAGS=\$QTFLAGS"
     452    echo "On this machine the QTLIBS=\$QTLIBS"
     453    echo "On this machine the QTMOC=\$QTMOC"
    430454endif
    431455
    432456if ( "X$g4vis_build_openglqt_driver" == "Xy" || "X$g4vis_build_openglqt_driver" == "Xy" )  then
    433 if ( "X\$QTFLAGS" == "X" )  then
    434 setenv QTFLAGS "$g4_qt_cxxflags $g4_qt_gl_cxxflags"
    435 else
    436 setenv QTFLAGS "\$QTFLAGS $g4_qt_gl_cxxflags"
    437 endif
    438 if ( "X\$QTMOC" == "X" )  then
    439 setenv QTMOC "$g4_qt_moc"
    440 endif
    441 setenv GLQTLIBS "$g4_qt_libs $g4_qt_gl_libs"
    442 echo "On this machine the QTFLAGS=\$QTFLAGS"
    443 echo "On this machine the GLQTLIBS=\$GLQTLIBS"
    444 echo "On this machine the QTMOC=\$QTMOC"
     457    if ( "X\$QTFLAGS" == "X" )  then
     458        setenv QTFLAGS "$g4_qt_cxxflags $g4_qt_gl_cxxflags"
     459    else
     460        setenv QTFLAGS "\$QTFLAGS $g4_qt_gl_cxxflags"
     461    endif
     462
     463    if ( "X\$QTMOC" == "X" )  then
     464        setenv QTMOC "$g4_qt_moc"
     465    endif
     466
     467    setenv GLQTLIBS "$g4_qt_libs $g4_qt_gl_libs"
     468    echo "On this machine the QTFLAGS=\$QTFLAGS"
     469    echo "On this machine the GLQTLIBS=\$GLQTLIBS"
     470    echo "On this machine the QTMOC=\$QTMOC"
    445471endif
    446472
     
    454480#+
    455481if ( X$g4lib_build_gdml == Xy ) then
    456 setenv G4LIB_BUILD_GDML 1
    457 echo "On this machine the G4LIB_BUILD_GDML=\$G4LIB_BUILD_GDML"
     482    setenv G4LIB_BUILD_GDML 1
     483    echo "On this machine the G4LIB_BUILD_GDML=\$G4LIB_BUILD_GDML"
    458484endif
    459485
    460486if ( X$g4lib_build_gdml == Xy ) then
    461 setenv XERCESCROOT "$g4gdml_xercesc_root"
    462 echo "On this machine the XERCESCROOT=\$XERCESCROOT"
     487    setenv XERCESCROOT "$g4gdml_xercesc_root"
     488    echo "On this machine the XERCESCROOT=\$XERCESCROOT"
    463489endif
    464490
     
    471497#+
    472498if ( X$g4wlib_build_g3tog4 == Xy )  then
    473 setenv G4LIB_BUILD_G3TOG4 1
    474 echo "On this machine the G4LIB_BUILD_G3TOG4=\$G4LIB_BUILD_G3TOG4"
     499    setenv G4LIB_BUILD_G3TOG4 1
     500    echo "On this machine the G4LIB_BUILD_G3TOG4=\$G4LIB_BUILD_G3TOG4"
    475501endif
    476502
    477503if ( X$g4w_use_g3tog4 == Xy )  then
    478 setenv G4LIB_USE_G3TOG4 1
    479 echo "On this machine the G4LIB_USE_G3TOG4=\$G4LIB_USE_G3TOG4"
     504    setenv G4LIB_USE_G3TOG4 1
     505    echo "On this machine the G4LIB_USE_G3TOG4=\$G4LIB_USE_G3TOG4"
    480506endif
    481507
     
    486512#+
    487513if ( X$g4wlib_build_zlib == Xy )  then
    488 setenv G4LIB_BUILD_ZLIB 1
    489 echo "On this machine the G4LIB_BUILD_ZLIB=\$G4LIB_BUILD_ZLIB"
     514    setenv G4LIB_BUILD_ZLIB 1
     515    echo "On this machine the G4LIB_BUILD_ZLIB=\$G4LIB_BUILD_ZLIB"
    490516endif
    491517
    492518if ( X$g4w_use_ZLIB == Xy )  then
    493 setenv G4LIB_USE_ZLIB 1
    494 echo "On this machine the G4LIB_USE_ZLIB=\$G4LIB_USE_ZLIB"
     519    setenv G4LIB_USE_ZLIB 1
     520    echo "On this machine the G4LIB_USE_ZLIB=\$G4LIB_USE_ZLIB"
    495521endif
    496522
     
    500526#
    501527if ( X$g4lib_build_shared == Xy ) then
    502 setenv G4LIB_BUILD_SHARED 1
    503 echo "On this machine the G4LIB_BUILD_SHARED=\$G4LIB_BUILD_SHARED"
     528    setenv G4LIB_BUILD_SHARED 1
     529    echo "On this machine the G4LIB_BUILD_SHARED=\$G4LIB_BUILD_SHARED"
    504530endif
    505531
    506532if ( X$g4lib_build_static == Xy ) then
    507 setenv G4LIB_BUILD_STATIC 1
    508 echo "On this machine the G4LIB_BUILD_STATIC=\$G4LIB_BUILD_STATIC"
     533    setenv G4LIB_BUILD_STATIC 1
     534    echo "On this machine the G4LIB_BUILD_STATIC=\$G4LIB_BUILD_STATIC"
    509535endif
    510536
     
    514540#
    515541if ( X$g4lib_use_granular == Xy ) then
    516 setenv G4LIB_USE_GRANULAR 1
    517 echo "On this machine the G4LIB_USE_GRANULAR=\$G4LIB_USE_GRANULAR"
     542    setenv G4LIB_USE_GRANULAR 1
     543    echo "On this machine the G4LIB_USE_GRANULAR=\$G4LIB_USE_GRANULAR"
    518544endif
    519545
     
    531557#
    532558if ( ${?G4WORKDIR} ) then
    533 echo "In your environment you have the G4WORKDIR=$G4WORKDIR"
     559    echo "In your environment you have the G4WORKDIR=$G4WORKDIR"
    534560else
    535 # Check for Windows!
    536 if ( "X$G4SYSTEM" == "XWIN32-VC" || "X$G4SYSTEM" == "XWIN32-VC7" ) then
    537 
    538 echo "G4WORKDIR will be set to c:/geant4 (in "native" Windows syntax)."
    539 setenv G4WORKDIR "c:/geant4"
    540 
    541 else # if Unix
    542 
    543 echo "G4WORKDIR will be set to HOME/geant4=$HOME/geant4"
    544 setenv G4WORKDIR $HOME/geant4
    545 
    546 endif
    547 endif
    548 
    549 #
    550 # Shared libraries
    551 #
     561    # Check for Windows!
     562    if ( "X$G4SYSTEM" == "XWIN32-VC" || "X$G4SYSTEM" == "XWIN32-VC7" ) then
     563        echo "G4WORKDIR will be set to c:/geant4 (in "native" Windows syntax)."
     564        setenv G4WORKDIR "c:/geant4"
     565    else # if Unix
     566        echo "G4WORKDIR will be set to HOME/geant4=$HOME/geant4"
     567        setenv G4WORKDIR $HOME/geant4
     568    endif
     569endif
     570
     571#
     572# *NIX Shared Libraries
     573# If we built Geant4 with shared libraries, we need to add the Gean4
     574# library directory to (DY)LD_LIBRARY_PATH.
     575# In all cases, external shared library directories should be added to
     576# (DY)LD_LIBRARY_PATH
     577
     578if ( "X$G4SYSTEM" != "XDarwin-g++" ) then
     579    if ( ${?LD_LIBRARY_PATH} ) then
     580        if ( ${?G4LIB_BUILD_SHARED} ) then
     581            setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}     
     582        endif
     583
     584        setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
     585
     586        if ( ${?G4LIB_BUILD_GDML} ) then
     587            setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${XERCESCROOT}/lib
     588        endif
     589
     590    else
     591        if ( ${?G4LIB_BUILD_SHARED} ) then
     592            setenv LD_LIBRARY_PATH ${G4LIB}/${G4SYSTEM}
     593            setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
     594        else
     595            setenv LD_LIBRARY_PATH ${CLHEP_LIB_DIR}
     596        endif
     597
     598        if ( ${?G4LIB_BUILD_GDML} ) then
     599            setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${XERCESCROOT}/lib
     600        endif
     601    endif
     602else
     603    #
     604    # Darwin Shared Libraries
     605    # we repeat the above logic, but for DYLD_LIBRARY_PATH
     606    #   
     607    if ( ${?DYLD_LIBRARY_PATH} ) then
     608        if ( ${?G4LIB_BUILD_SHARED} ) then
     609            setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM} 
     610        endif
     611
     612        setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
     613
     614        if ( ${?G4LIB_BUILD_GDML} ) then
     615            setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${XERCESCROOT}/lib
     616        endif
     617    else
     618        if ( ${?G4LIB_BUILD_SHARED} ) then
     619            setenv DYLD_LIBRARY_PATH ${G4LIB}/${G4SYSTEM}
     620            setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
     621        else
     622            setenv DYLD_LIBRARY_PATH ${CLHEP_LIB_DIR}
     623        endif
     624
     625        if ( ${?G4LIB_BUILD_GDML} ) then
     626            setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${XERCESCROOT}/lib
     627        endif
     628    endif
     629endif
     630
     631
     632#
     633# Warning about LD_LIBRARY_PATH
     634#
     635echo ''
    552636if ( ${?G4LIB_BUILD_SHARED} ) then
    553 
    554 #
    555 # Warning about LD_LIBRARY_PATH
    556 #
     637    if ( "X$G4SYSTEM" == "XDarwin-g++" ) then
     638        echo 'DYLD_LIBRARY_PATH is set to include CLHEP and Geant4 libraries. '
     639    else
     640        echo 'LD_LIBRARY_PATH is set to include CLHEP and Geant4 libraries. '
     641    endif
     642else
     643    if ( "X$G4SYSTEM" == "XDarwin-g++" ) then
     644        echo 'DYLD_LIBRARY_PATH is set to include CLHEP libraries. '
     645    else
     646        echo 'LD_LIBRARY_PATH is set to include CLHEP libraries. '
     647    endif
     648endif
     649echo 'NOTE : you should verify that the correct path for the CLHEP library'
    557650echo ''
    558 echo 'LD_LIBRARY_PATH is set to include CLHEP and Geant4 libraries. '
     651echo ${CLHEP_BASE_DIR}/lib
    559652echo ''
    560 echo 'NOTE : verify that the correct path for the CLHEP library'
    561 echo '- $CLHEP_BASE_DIR/lib - is included in the $LD_LIBRARY_PATH'
    562 echo 'variable in your environment, and no other outdated installations'
    563 echo 'of CLHEP are by chance referenced through $LD_LIBRARY_PATH and'
    564 echo 'present in your system !'
     653echo 'is included in the dynamic library search path ahead of any other'
     654echo 'installations of CLHEP on your system that may be referenced by this'
     655echo 'path.'
    565656echo ''
    566 
    567 if ( ${?LD_LIBRARY_PATH} )  then
    568 setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
    569 setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
    570 
    571 if ( ${?G4LIB_BUILD_GDML} ) then
    572    setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${XERCESCROOT}/lib
    573 endif
    574 
    575 else
    576 setenv LD_LIBRARY_PATH ${G4LIB}/${G4SYSTEM}
    577 setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
    578 
    579 if ( ${?G4LIB_BUILD_GDML} ) then
    580    setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${XERCESCROOT}/lib
    581 endif
    582 
    583 endif
    584 endif
    585 
    586 #
    587 # Shared libraries for Mac
    588 #
    589 if ( "X$G4SYSTEM" == "XDarwin-g++" ) then
    590 
    591 if ( ${?G4LIB_BUILD_SHARED} ) then
    592 if ( ${?DYLD_LIBRARY_PATH} )  then
    593 setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
    594 setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
    595 
    596 if ( ${?G4LIB_BUILD_GDML} ) then
    597    setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${XERCESCROOT}/lib
    598 endif
    599 
    600 else
    601 setenv DYLD_LIBRARY_PATH ${G4LIB}/${G4SYSTEM}
    602 setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
    603 
    604 if ( ${?G4LIB_BUILD_GDML} ) then
    605    setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${XERCESCROOT}/lib
    606 endif
    607 
    608 endif
    609 endif
    610 
    611 endif
    612657
    613658#
  • trunk/config/scripts/env.sh.SH

    r1213 r1337  
    3131unset  CLHEP_LIB_DIR
    3232
    33 unset  G4ANALYSIS_USE
    3433unset  G4DEBUG
    3534unset  G4INCLUDE
     
    4241unset  G4ABLADATA
    4342unset  G4REALSURFACEDATA
     43unset  G4NEUTRONXSDATA
    4444
    4545unset  G4LIB
     
    5757unset  G4UI_NONE
    5858unset  G4UI_BUILD_WIN32_SESSION
     59unset  G4UI_BUILD_XAW_SESSION
    5960unset  G4UI_BUILD_XM_SESSION
    6061unset  G4UI_USE_TCSH
    6162unset  G4UI_USE_WIN32
     63unset  G4UI_USE_XAW
    6264unset  G4UI_USE_XM
    6365unset  G4UI_USE_QT
     
    9395export G4SYSTEM
    9496if [ X\$g4non_display = X ] ; then
    95 echo "On this machine the G4SYSTEM=\$G4SYSTEM"
     97    echo "On this machine the G4SYSTEM=\$G4SYSTEM"
    9698fi
    9799
     
    101103#+
    102104if [ X$g4install != X$g4final_install ] ; then
    103 G4INSTALL="$g4final_install/src/geant4"
     105    G4INSTALL="$g4final_install/src/geant4"
    104106else
    105 G4INSTALL="$g4install"
     107    G4INSTALL="$g4install"
    106108fi
    107109export G4INSTALL
    108110if [ X\$g4non_display = X ] ; then
    109 echo "On this machine the G4INSTALL=\$G4INSTALL"
     111    echo "On this machine the G4INSTALL=\$G4INSTALL"
    110112fi
    111113
    112114#+
    113115if [ X$g4includes_flag != Xn ] ; then
    114 if [ X$g4install != X$g4final_install ] ; then
    115 G4INCLUDE="$g4final_install/include/geant4"
    116 else
    117 G4INCLUDE="$g4install/include/"
    118 fi
    119 export G4INCLUDE
    120 if [ X\$g4non_display = X ] ; then
    121 echo "On this machine the G4INCLUDE=\$G4INCLUDE"
    122 fi
    123 #else
    124 #G4BASE="$g4final_install/include/geant4/source"
    125 #export G4BASE
    126 #if [ X\$g4non_display = X ] ; then
    127 #echo "On this machine the G4BASE=\$G4BASE"
    128 #fi
     116    if [ X$g4install != X$g4final_install ] ; then
     117        G4INCLUDE="$g4final_install/include/geant4"
     118    else
     119        G4INCLUDE="$g4install/include/"
     120    fi
     121    export G4INCLUDE
     122    if [ X\$g4non_display = X ] ; then
     123        echo "On this machine the G4INCLUDE=\$G4INCLUDE"
     124    fi
    129125fi
    130126
    131127#+
    132128if [ X$g4lib != X ] ; then
    133 if [ X$g4install != X$g4final_install ] ; then
    134 G4LIB="$g4final_install/lib/geant4"
    135 else
    136 G4LIB="$g4install/lib"
    137 fi
    138 export G4LIB
    139 if [ X\$g4non_display = X ] ; then
    140 echo "On this machine the G4LIB=\$G4LIB"
    141 fi
     129    if [ X$g4install != X$g4final_install ] ; then
     130        G4LIB="$g4final_install/lib/geant4"
     131    else
     132        G4LIB="$g4install/lib"
     133    fi
     134    export G4LIB
     135    if [ X\$g4non_display = X ] ; then
     136        echo "On this machine the G4LIB=\$G4LIB"
     137    fi
    142138fi
    143139
    144140#+
    145141if [ X$g4levelgammadata != X ] ; then
    146 G4LEVELGAMMADATA="$g4levelgammadata"
    147 export G4LEVELGAMMADATA
    148 if [ X\$g4non_display = X ] ; then
    149 echo "On this machine the G4LEVELGAMMADATA=\$G4LEVELGAMMADATA"
    150 fi
     142    G4LEVELGAMMADATA="$g4levelgammadata"
     143    export G4LEVELGAMMADATA
     144    if [ X\$g4non_display = X ] ; then
     145        echo "On this machine the G4LEVELGAMMADATA=\$G4LEVELGAMMADATA"
     146    fi
    151147fi
    152148
    153149#+
    154150if [ X$g4radioactivedata != X ] ; then
    155 G4RADIOACTIVEDATA="$g4radioactivedata"
    156 export G4RADIOACTIVEDATA
    157 if [ X\$g4non_display = X ] ; then
    158 echo "On this machine the G4RADIOACTIVEDATA=\$G4RADIOACTIVEDATA"
    159 fi
     151    G4RADIOACTIVEDATA="$g4radioactivedata"
     152    export G4RADIOACTIVEDATA
     153    if [ X\$g4non_display = X ] ; then
     154        echo "On this machine the G4RADIOACTIVEDATA=\$G4RADIOACTIVEDATA"
     155    fi
    160156fi
    161157
    162158#+
    163159if [ X$g4ledata != X ] ; then
    164 G4LEDATA="$g4ledata"
    165 export G4LEDATA
    166 if [ X\$g4non_display = X ] ; then
    167 echo "On this machine the G4LEDATA=\$G4LEDATA"
    168 fi
     160    G4LEDATA="$g4ledata"
     161    export G4LEDATA
     162    if [ X\$g4non_display = X ] ; then
     163        echo "On this machine the G4LEDATA=\$G4LEDATA"
     164    fi
    169165fi
    170166
    171167#+
    172168if [ X$g4neutronhpcrosssections != X ] ; then
    173 G4NEUTRONHPDATA="$g4neutronhpcrosssections"
    174 export G4NEUTRONHPDATA
    175 if [ X\$g4non_display = X ] ; then
    176 echo "On this machine the G4NEUTRONHPDATA=\$G4NEUTRONHPDATA"
    177 fi
     169    G4NEUTRONHPDATA="$g4neutronhpcrosssections"
     170    export G4NEUTRONHPDATA
     171    if [ X\$g4non_display = X ] ; then
     172        echo "On this machine the G4NEUTRONHPDATA=\$G4NEUTRONHPDATA"
     173    fi
    178174fi
    179175
    180176#+
    181177if [ X$g4abladata != X ] ; then
    182 G4ABLADATA="$g4abladata"
    183 export G4ABLADATA
    184 if [ X\$g4non_display = X ] ; then
    185 echo "On this machine the G4ABLADATA=\$G4ABLADATA"
    186 fi
     178    G4ABLADATA="$g4abladata"
     179    export G4ABLADATA
     180    if [ X\$g4non_display = X ] ; then
     181        echo "On this machine the G4ABLADATA=\$G4ABLADATA"
     182    fi
    187183fi
    188184
    189185#+
    190186if [ X$g4realsurfacedata != X ] ; then
    191 G4REALSURFACEDATA="$g4realsurfacedata"
    192 export G4REALSURFACEDATA
    193 if [ X\$g4non_display = X ] ; then
    194 echo "On this machine the G4REALSURFACEDATA=\$G4REALSURFACEDATA"
    195 fi
    196 fi
     187    G4REALSURFACEDATA="$g4realsurfacedata"
     188    export G4REALSURFACEDATA
     189    if [ X\$g4non_display = X ] ; then
     190        echo "On this machine the G4REALSURFACEDATA=\$G4REALSURFACEDATA"
     191    fi
     192fi
     193
     194#+
     195if [ X$g4neutronxsdata != X ] ; then
     196    G4NEUTRONXSDATA="$g4neutronxsdata"
     197    export G4NEUTRONXSDATA
     198    if [ X\$g4non_display = X ] ; then
     199        echo "On this machine the G4NEUTRONXSDATA=\$G4NEUTRONXSDATA"
     200    fi
     201fi
     202
    197203
    198204#
     
    200206#
    201207if [ X$g4clhep_base_dir != X ] ; then
    202 CLHEP_BASE_DIR="$g4clhep_base_dir"
    203 export CLHEP_BASE_DIR
    204 if [ X\$g4non_display = X ] ; then
    205 echo "On this machine the CLHEP_BASE_DIR=\$CLHEP_BASE_DIR"
    206 fi
     208    CLHEP_BASE_DIR="$g4clhep_base_dir"
     209    export CLHEP_BASE_DIR
     210    if [ X\$g4non_display = X ] ; then
     211        echo "On this machine the CLHEP_BASE_DIR=\$CLHEP_BASE_DIR"
     212    fi
    207213fi
    208214
    209215#+
    210216if [ X$g4clhep_include_dir != X ] ; then
    211 CLHEP_INCLUDE_DIR="$g4clhep_include_dir"
    212 export CLHEP_INCLUDE_DIR
    213 if [ X\$g4non_display = X ] ; then
    214 echo "On this machine the CLHEP_INCLUDE_DIR=\$CLHEP_INCLUDE_DIR"
    215 fi
     217    CLHEP_INCLUDE_DIR="$g4clhep_include_dir"
     218    export CLHEP_INCLUDE_DIR
     219    if [ X\$g4non_display = X ] ; then
     220        echo "On this machine the CLHEP_INCLUDE_DIR=\$CLHEP_INCLUDE_DIR"
     221    fi
    216222fi
    217223
    218224#+
    219225if [ X$g4clhep_lib_dir != X ] ; then
    220 CLHEP_LIB_DIR="$g4clhep_lib_dir"
    221 export CLHEP_LIB_DIR
    222 if [ X\$g4non_display = X ] ; then
    223 echo "On this machine the CLHEP_LIB_DIR=\$CLHEP_LIB_DIR"
    224 fi
     226    CLHEP_LIB_DIR="$g4clhep_lib_dir"
     227    export CLHEP_LIB_DIR
     228    if [ X\$g4non_display = X ] ; then
     229        echo "On this machine the CLHEP_LIB_DIR=\$CLHEP_LIB_DIR"
     230    fi
    225231fi
    226232
    227233#+
    228234if [ X$g4clhep_lib != X ] ; then
    229 CLHEP_LIB="$g4clhep_lib"
    230 export CLHEP_LIB
    231 if [ X\$g4non_display = X ] ; then
    232 echo "On this machine the CLHEP_LIB=\$CLHEP_LIB"
    233 fi
     235    CLHEP_LIB="$g4clhep_lib"
     236    export CLHEP_LIB
     237    if [ X\$g4non_display = X ] ; then
     238        echo "On this machine the CLHEP_LIB=\$CLHEP_LIB"
     239    fi
    234240fi
    235241
     
    239245#
    240246if [ X$g4debug = Xy ] ; then
    241 G4DEBUG=1
    242 export G4DEBUG
    243 if [ X\$g4non_display = X ] ; then
    244 echo "On this machine the G4DEBUG=\$G4DEBUG"
    245 fi
    246 fi
    247 
    248 #
    249 # g4analysis
    250 #
    251 #+
    252 if [ X$g4wanalysis_use = Xy ] ; then
    253 G4ANALYSIS_USE=1
    254 export G4ANALYSIS_USE
    255 if [ X\$g4non_display = X ] ; then
    256 echo "On this machine the G4ANALYSIS_USE=\$G4ANALYSIS_USE"
    257 fi
    258 fi
     247    G4DEBUG=1
     248    export G4DEBUG
     249    if [ X\$g4non_display = X ] ; then
     250        echo "On this machine the G4DEBUG=\$G4DEBUG"
     251    fi
     252fi
     253
    259254
    260255#
     
    263258#+
    264259if [ X$g4ui_none = Xy ] ; then
    265 G4UI_NONE=1
    266 export G4UI_NONE
    267 if [ X\$g4non_display = X ] ; then
    268 echo "On this machine, G4UI_NONE is set, so no user interfaces are available"
    269 fi
     260    G4UI_NONE=1
     261    export G4UI_NONE
     262    if [ X\$g4non_display = X ] ; then
     263        echo "On this machine, G4UI_NONE is set, so no user interfaces are available"
     264    fi
    270265fi
    271266
     
    277272# UI_USE_TCSH for Unix
    278273#
    279 if [ X$g4ui_none != Xy ] ; then
    280 G4UI_USE_TCSH=1
    281 export G4UI_USE_TCSH
    282 if [ X\$g4non_display = X ] ; then
    283 echo "On this machine the G4UI_USE_TCSH=\$G4UI_USE_TCSH"
    284 fi
    285 fi
    286 fi
    287 
     274    if [ X$g4ui_none != Xy ] ; then
     275        G4UI_USE_TCSH=1
     276        export G4UI_USE_TCSH
     277        if [ X\$g4non_display = X ] ; then
     278            echo "On this machine the G4UI_USE_TCSH=\$G4UI_USE_TCSH"
     279        fi
     280    fi
     281fi
     282
     283
     284#+
     285if [ X$g4ui_build_xaw_session = Xy ] ; then
     286    G4UI_BUILD_XAW_SESSION=1
     287    export G4UI_BUILD_XAW_SESSION
     288    if [ X\$g4non_display = X ] ; then
     289        echo "On this machine the G4UI_BUILD_XAW_SESSION=\$G4UI_BUILD_XAW_SESSION"
     290    fi
     291fi
     292
     293#+
     294if [ X$g4ui_use_xaw = Xy ] ; then
     295    G4UI_USE_XAW=1
     296    export G4UI_USE_XAW
     297    if [ X\$g4non_display = X ] ; then
     298        echo "On this machine the G4UI_USE_XAW=\$G4UI_USE_XAW"
     299    fi
     300fi
    288301
    289302#+
    290303if [ X$g4ui_build_xm_session = Xy ] ; then
    291 G4UI_BUILD_XM_SESSION=1
    292 export G4UI_BUILD_XM_SESSION
    293 if [ X\$g4non_display = X ] ; then
    294 echo "On this machine the G4UI_BUILD_XM_SESSION=\$G4UI_BUILD_XM_SESSION"
    295 fi
     304    G4UI_BUILD_XM_SESSION=1
     305    export G4UI_BUILD_XM_SESSION
     306    if [ X\$g4non_display = X ] ; then
     307        echo "On this machine the G4UI_BUILD_XM_SESSION=\$G4UI_BUILD_XM_SESSION"
     308    fi
    296309fi
    297310
    298311#+
    299312if [ X$g4ui_use_xm = Xy ] ; then
    300 G4UI_USE_XM=1
    301 export G4UI_USE_XM
    302 if [ X\$g4non_display = X ] ; then
    303 echo "On this machine the G4UI_USE_XM=\$G4UI_USE_XM"
    304 fi
     313    G4UI_USE_XM=1
     314    export G4UI_USE_XM
     315    if [ X\$g4non_display = X ] ; then
     316        echo "On this machine the G4UI_USE_XM=\$G4UI_USE_XM"
     317    fi
    305318fi
    306319
    307320#+
    308321if [ X$g4ui_build_win32_session = Xy ] ; then
    309 G4UI_BUILD_WIN32_SESSION=1
    310 export G4UI_BUILD_WIN32_SESSION
    311 if [ X\$g4non_display = X ] ; then
    312 echo "On this machine the G4UI_BUILD_WIN32_SESSION=\$G4UI_BUILD_WIN32_SESSION"
    313 fi
     322    G4UI_BUILD_WIN32_SESSION=1
     323    export G4UI_BUILD_WIN32_SESSION
     324    if [ X\$g4non_display = X ] ; then
     325        echo "On this machine the G4UI_BUILD_WIN32_SESSION=\$G4UI_BUILD_WIN32_SESSION"
     326    fi
    314327fi
    315328
    316329#+
    317330if [ X$g4ui_use_win32 = Xy ] ; then
    318 G4UI_USE_WIN32=1
    319 export G4UI_USE_WIN32
    320 if [ X\$g4non_display = X ] ; then
    321 echo "On this machine the G4UI_USE_WIN32=\$G4UI_USE_WIN32"
    322 fi
     331    G4UI_USE_WIN32=1
     332    export G4UI_USE_WIN32
     333    if [ X\$g4non_display = X ] ; then
     334        echo "On this machine the G4UI_USE_WIN32=\$G4UI_USE_WIN32"
     335    fi
    323336fi
    324337
     
    326339#+
    327340if [ X$g4ui_build_qt_session = Xy ] ; then
    328 G4UI_BUILD_QT_SESSION=1
    329 export G4UI_BUILD_QT_SESSION
    330 if [ X\$g4non_display = X ] ; then
    331 echo "On this machine the G4UI_BUILD_QT_SESSION=\$G4UI_BUILD_QT_SESSION"
    332 fi
     341    G4UI_BUILD_QT_SESSION=1
     342    export G4UI_BUILD_QT_SESSION
     343    if [ X\$g4non_display = X ] ; then
     344        echo "On this machine the G4UI_BUILD_QT_SESSION=\$G4UI_BUILD_QT_SESSION"
     345    fi
    333346fi
    334347
    335348#+
    336349if [ X$g4ui_use_qt = Xy ] ; then
    337 G4UI_USE_QT=1
    338 export G4UI_USE_QT
    339 if [ X\$g4non_display = X ] ; then
    340 echo "On this machine the G4UI_USE_QT=\$G4UI_USE_QT"
    341 fi
     350    G4UI_USE_QT=1
     351    export G4UI_USE_QT
     352    if [ X\$g4non_display = X ] ; then
     353        echo "On this machine the G4UI_USE_QT=\$G4UI_USE_QT"
     354    fi
    342355fi
    343356
     
    349362#+
    350363if [ X$g4vis_none = Xy ] ; then
    351 G4VIS_NONE=1
    352 export G4VIS_NONE
    353 if [ X\$g4non_display = X ] ; then
    354 echo "On this machine G4VIS_NONE is set, so no vis drivers are available"
    355 fi
     364    G4VIS_NONE=1
     365    export G4VIS_NONE
     366    if [ X\$g4non_display = X ] ; then
     367        echo "On this machine G4VIS_NONE is set, so no vis drivers are available"
     368    fi
    356369fi
    357370
    358371#+
    359372if [ X$g4vis_build_dawn_driver = Xy ] ; then
    360 G4VIS_BUILD_DAWN_DRIVER=1
    361 export G4VIS_BUILD_DAWN_DRIVER
    362 if [ X\$g4non_display = X ] ; then
    363 echo "On this machine the G4VIS_BUILD_DAWN_DRIVER=\$G4VIS_BUILD_DAWN_DRIVER"
    364 fi
     373    G4VIS_BUILD_DAWN_DRIVER=1
     374    export G4VIS_BUILD_DAWN_DRIVER
     375    if [ X\$g4non_display = X ] ; then
     376        echo "On this machine the G4VIS_BUILD_DAWN_DRIVER=\$G4VIS_BUILD_DAWN_DRIVER"
     377    fi
    365378fi
    366379
    367380#+
    368381if [ X$g4vis_build_openglx_driver = Xy ] ; then
    369 G4VIS_BUILD_OPENGLX_DRIVER=1
    370 export G4VIS_BUILD_OPENGLX_DRIVER
    371 if [ X\$g4non_display = X ] ; then
    372 echo "On this machine the G4VIS_BUILD_OPENGLX_DRIVER=\$G4VIS_BUILD_OPENGLX_DRIVER"
    373 fi
     382    G4VIS_BUILD_OPENGLX_DRIVER=1
     383    export G4VIS_BUILD_OPENGLX_DRIVER
     384    if [ X\$g4non_display = X ] ; then
     385        echo "On this machine the G4VIS_BUILD_OPENGLX_DRIVER=\$G4VIS_BUILD_OPENGLX_DRIVER"
     386    fi
    374387fi
    375388
    376389#+
    377390if [ X$g4vis_build_openglxm_driver = Xy ] ; then
    378 G4VIS_BUILD_OPENGLXM_DRIVER=1
    379 export G4VIS_BUILD_OPENGLXM_DRIVER
    380 if [ X\$g4non_display = X ] ; then
    381 echo "On this machine the G4VIS_BUILD_OPENGLXM_DRIVER=\$G4VIS_BUILD_OPENGLXM_DRIVER"
    382 fi
     391    G4VIS_BUILD_OPENGLXM_DRIVER=1
     392    export G4VIS_BUILD_OPENGLXM_DRIVER
     393    if [ X\$g4non_display = X ] ; then
     394        echo "On this machine the G4VIS_BUILD_OPENGLXM_DRIVER=\$G4VIS_BUILD_OPENGLXM_DRIVER"
     395    fi
    383396fi
    384397
    385398#+
    386399if [ X$g4vis_build_openglwin32_driver = Xy ] ; then
    387 G4VIS_BUILD_OPENGLWIN32_DRIVER=1
    388 export G4VIS_BUILD_OPENGLWIN32_DRIVER
    389 if [ X\$g4non_display = X ] ; then
    390 echo "On this machine the G4VIS_BUILD_OPENGLWIN32_DRIVER=\$G4VIS_BUILD_OPENGLWIN32_DRIVER"
    391 fi
     400    G4VIS_BUILD_OPENGLWIN32_DRIVER=1
     401    export G4VIS_BUILD_OPENGLWIN32_DRIVER
     402    if [ X\$g4non_display = X ] ; then
     403        echo "On this machine the G4VIS_BUILD_OPENGLWIN32_DRIVER=\$G4VIS_BUILD_OPENGLWIN32_DRIVER"
     404    fi
    392405fi
    393406
    394407#+
    395408if [ X$g4vis_build_oix_driver = Xy ] ; then
    396 G4VIS_BUILD_OIX_DRIVER=1
    397 export G4VIS_BUILD_OIX_DRIVER
    398 if [ X\$g4non_display = X ] ; then
    399 echo "On this machine the G4VIS_BUILD_OIX_DRIVER=\$G4VIS_BUILD_OIX_DRIVER"
    400 fi
     409    G4VIS_BUILD_OIX_DRIVER=1
     410    export G4VIS_BUILD_OIX_DRIVER
     411    if [ X\$g4non_display = X ] ; then
     412        echo "On this machine the G4VIS_BUILD_OIX_DRIVER=\$G4VIS_BUILD_OIX_DRIVER"
     413    fi
    401414fi
    402415
    403416#+
    404417if [ X$g4vis_build_raytracerx_driver = Xy ] ; then
    405 G4VIS_BUILD_RAYTRACERX_DRIVER=1
    406 export G4VIS_BUILD_RAYTRACERX_DRIVER
    407 if [ X\$g4non_display = X ] ; then
    408 echo "On this machine the G4VIS_BUILD_RAYTRACERX_DRIVER=\$G4VIS_BUILD_RAYTRACERX_DRIVER"
    409 fi
     418    G4VIS_BUILD_RAYTRACERX_DRIVER=1
     419    export G4VIS_BUILD_RAYTRACERX_DRIVER
     420    if [ X\$g4non_display = X ] ; then
     421        echo "On this machine the G4VIS_BUILD_RAYTRACERX_DRIVER=\$G4VIS_BUILD_RAYTRACERX_DRIVER"
     422    fi
    410423fi
    411424
    412425#+
    413426if [ X$g4vis_build_oiwin32_driver = Xy ] ; then
    414 G4VIS_BUILD_OIWIN32_DRIVER=1
    415 export G4VIS_BUILD_OIWIN32_DRIVER
    416 if [ X\$g4non_display = X ] ; then
    417 echo "On this machine the G4VIS_BUILD_OIWIN32_DRIVER=\$G4VIS_BUILD_OIWIN32_DRIVER"
    418 fi
     427    G4VIS_BUILD_OIWIN32_DRIVER=1
     428    export G4VIS_BUILD_OIWIN32_DRIVER
     429    if [ X\$g4non_display = X ] ; then
     430        echo "On this machine the G4VIS_BUILD_OIWIN32_DRIVER=\$G4VIS_BUILD_OIWIN32_DRIVER"
     431    fi
    419432fi
    420433
    421434#+
    422435if [ X$g4vis_build_vrml_driver = Xy ] ; then
    423 G4VIS_BUILD_VRML_DRIVER=1
    424 export G4VIS_BUILD_VRML_DRIVER
    425 if [ X\$g4non_display = X ] ; then
    426 echo "On this machine the G4VIS_BUILD_VRML_DRIVER=\$G4VIS_BUILD_VRML_DRIVER"
    427 fi
     436    G4VIS_BUILD_VRML_DRIVER=1
     437    export G4VIS_BUILD_VRML_DRIVER
     438    if [ X\$g4non_display = X ] ; then
     439        echo "On this machine the G4VIS_BUILD_VRML_DRIVER=\$G4VIS_BUILD_VRML_DRIVER"
     440    fi
    428441fi
    429442
    430443#+
    431444if [ X$g4vis_build_openglqt_driver = Xy ] ; then
    432 G4VIS_BUILD_OPENGLQT_DRIVER=1
    433 export G4VIS_BUILD_OPENGLQT_DRIVER
    434 if [ X\$g4non_display = X ] ; then
    435 echo "On this machine the G4VIS_BUILD_OPENGLQT_DRIVER=\$G4VIS_BUILD_OPENGLQT_DRIVER"
    436 fi
     445    G4VIS_BUILD_OPENGLQT_DRIVER=1
     446    export G4VIS_BUILD_OPENGLQT_DRIVER
     447    if [ X\$g4non_display = X ] ; then
     448        echo "On this machine the G4VIS_BUILD_OPENGLQT_DRIVER=\$G4VIS_BUILD_OPENGLQT_DRIVER"
     449    fi
    437450fi
    438451
     
    441454#+
    442455if [ X$g4vis_use_dawn = Xy ] ; then
    443 G4VIS_USE_DAWN=1
    444 export G4VIS_USE_DAWN
    445 if [ X\$g4non_display = X ] ; then
    446 echo "On this machine the G4VIS_USE_DAWN=\$G4VIS_USE_DAWN"
    447 fi
     456    G4VIS_USE_DAWN=1
     457    export G4VIS_USE_DAWN
     458    if [ X\$g4non_display = X ] ; then
     459        echo "On this machine the G4VIS_USE_DAWN=\$G4VIS_USE_DAWN"
     460    fi
    448461fi
    449462
    450463#+
    451464if [ X$g4vis_use_openglx = Xy ] ; then
    452 G4VIS_USE_OPENGLX=1
    453 export G4VIS_USE_OPENGLX
    454 if [ X\$g4non_display = X ] ; then
    455 echo "On this machine the G4VIS_USE_OPENGLX=\$G4VIS_USE_OPENGLX"
    456 fi
     465    G4VIS_USE_OPENGLX=1
     466    export G4VIS_USE_OPENGLX
     467    if [ X\$g4non_display = X ] ; then
     468        echo "On this machine the G4VIS_USE_OPENGLX=\$G4VIS_USE_OPENGLX"
     469    fi
    457470fi
    458471
    459472#+
    460473if [ X$g4vis_use_openglxm = Xy ] ; then
    461 G4VIS_USE_OPENGLXM=1
    462 export G4VIS_USE_OPENGLXM
    463 if [ X\$g4non_display = X ] ; then
    464 echo "On this machine the G4VIS_USE_OPENGLXM=\$G4VIS_USE_OPENGLXM"
    465 fi
     474    G4VIS_USE_OPENGLXM=1
     475    export G4VIS_USE_OPENGLXM
     476    if [ X\$g4non_display = X ] ; then
     477        echo "On this machine the G4VIS_USE_OPENGLXM=\$G4VIS_USE_OPENGLXM"
     478    fi
    466479fi
    467480
    468481#+
    469482if [ X$g4vis_use_openglwin32 = Xy ] ; then
    470 G4VIS_USE_OPENGLWIN32=1
    471 export G4VIS_USE_OPENGLWIN32
    472 if [ X\$g4non_display = X ] ; then
    473 echo "On this machine the G4VIS_USE_OPENGLWIN32=\$G4VIS_USE_OPENGLWIN32"
    474 fi
     483    G4VIS_USE_OPENGLWIN32=1
     484    export G4VIS_USE_OPENGLWIN32
     485    if [ X\$g4non_display = X ] ; then
     486        echo "On this machine the G4VIS_USE_OPENGLWIN32=\$G4VIS_USE_OPENGLWIN32"
     487    fi
    475488fi
    476489
    477490#+
    478491if [ X$g4vis_use_oix = Xy ] ; then
    479 G4VIS_USE_OIX=1
    480 export G4VIS_USE_OIX
    481 if [ X\$g4non_display = X ] ; then
    482 echo "On this machine the G4VIS_USE_OIX=\$G4VIS_USE_OIX"
    483 fi
     492    G4VIS_USE_OIX=1
     493    export G4VIS_USE_OIX
     494    if [ X\$g4non_display = X ] ; then
     495        echo "On this machine the G4VIS_USE_OIX=\$G4VIS_USE_OIX"
     496    fi
    484497fi
    485498
    486499#+
    487500if [ X$g4vis_use_raytracerx = Xy ] ; then
    488 G4VIS_USE_RAYTRACERX=1
    489 export G4VIS_USE_RAYTRACERX
    490 if [ X\$g4non_display = X ] ; then
    491 echo "On this machine the G4VIS_USE_RAYTRACERX=\$G4VIS_USE_RAYTRACERX"
    492 fi
     501    G4VIS_USE_RAYTRACERX=1
     502    export G4VIS_USE_RAYTRACERX
     503    if [ X\$g4non_display = X ] ; then
     504        echo "On this machine the G4VIS_USE_RAYTRACERX=\$G4VIS_USE_RAYTRACERX"
     505    fi
    493506fi
    494507
    495508#+
    496509if [ X$g4vis_use_oiwin32 = Xy ] ; then
    497 G4VIS_USE_OIWIN32=1
    498 export G4VIS_USE_OIWIN32
    499 if [ X\$g4non_display = X ] ; then
    500 echo "On this machine the G4VIS_USE_OIWIN32=\$G4VIS_USE_OIWIN32"
    501 fi
     510    G4VIS_USE_OIWIN32=1
     511    export G4VIS_USE_OIWIN32
     512    if [ X\$g4non_display = X ] ; then
     513        echo "On this machine the G4VIS_USE_OIWIN32=\$G4VIS_USE_OIWIN32"
     514    fi
    502515fi
    503516
    504517#+
    505518if [ X$g4vis_use_vrml = Xy ] ; then
    506 G4VIS_USE_VRML=1
    507 export G4VIS_USE_VRML
    508 if [ X\$g4non_display = X ] ; then
    509 echo "On this machine the G4VIS_USE_VRML=\$G4VIS_USE_VRML"
    510 fi
     519    G4VIS_USE_VRML=1
     520    export G4VIS_USE_VRML
     521    if [ X\$g4non_display = X ] ; then
     522        echo "On this machine the G4VIS_USE_VRML=\$G4VIS_USE_VRML"
     523    fi
    511524fi
    512525
    513526#+
    514527if [ X$g4vis_use_openglqt = Xy ] ; then
    515 G4VIS_USE_OPENGLQT=1
    516 export G4VIS_USE_OPENGLQT
    517 if [ X\$g4non_display = X ] ; then
    518 echo "On this machine the G4VIS_USE_OPENGLQT=\$G4VIS_USE_OPENGLQT"
    519 fi
     528    G4VIS_USE_OPENGLQT=1
     529    export G4VIS_USE_OPENGLQT
     530    if [ X\$g4non_display = X ] ; then
     531        echo "On this machine the G4VIS_USE_OPENGLQT=\$G4VIS_USE_OPENGLQT"
     532    fi
    520533fi
    521534
     
    524537#+
    525538if [ X$g4vis_oglhome != X ] ; then
    526 OGLHOME="$g4vis_oglhome"
    527 export OGLHOME
    528 if [ X\$g4non_display = X ] ; then
    529 echo "On this machine the OGLHOME=\$OGLHOME"
    530 fi
     539    OGLHOME="$g4vis_oglhome"
     540    export OGLHOME
     541    if [ X\$g4non_display = X ] ; then
     542        echo "On this machine the OGLHOME=\$OGLHOME"
     543    fi
    531544fi
    532545
    533546#+
    534547if [ X$g4vis_oivhome != X ] ; then
    535 OIVHOME="$g4vis_oivhome"
    536 export OIVHOME
    537 if [ X\$g4non_display = X ] ; then
    538 echo "On this machine the OIVHOME=\$OIVHOME"
    539 fi
     548    OIVHOME="$g4vis_oivhome"
     549    export OIVHOME
     550    if [ X\$g4non_display = X ] ; then
     551        echo "On this machine the OIVHOME=\$OIVHOME"
     552    fi
    540553fi
    541554
     
    544557#+
    545558if [ X$g4vis_build_openglxm_driver != X ] ; then
    546 XMFLAGS="$g4vis_xmflags"
    547 export XMFLAGS
    548 if [ X\$g4non_display = X ] ; then
    549 echo "On this machine the XMFLAGS=\$XMFLAGS"
    550 fi
     559    XMFLAGS="$g4vis_xmflags"
     560    export XMFLAGS
     561    if [ X\$g4non_display = X ] ; then
     562        echo "On this machine the XMFLAGS=\$XMFLAGS"
     563    fi
    551564fi
    552565
    553566#+
    554567if [ X$g4vis_build_openglxm_driver != X ] ; then
    555 XMLIBS="$g4vis_xmlibs"
    556 export XMLIBS
    557 if [ X\$g4non_display = X ] ; then
    558 echo "On this machine the XMLIBS=\$XMLIBS"
    559 fi
     568    XMLIBS="$g4vis_xmlibs"
     569    export XMLIBS
     570    if [ X\$g4non_display = X ] ; then
     571        echo "On this machine the XMLIBS=\$XMLIBS"
     572    fi
    560573fi
    561574
    562575#+
    563576if [ X$g4ui_build_xm_session != X ] ; then
    564 XMFLAGS="$g4vis_xmflags"
    565 export XMFLAGS
    566 if [ X\$g4non_display = X ] ; then
    567 echo "On this machine the XMFLAGS=\$XMFLAGS"
    568 fi
     577    XMFLAGS="$g4vis_xmflags"
     578    export XMFLAGS
     579    if [ X\$g4non_display = X ] ; then
     580        echo "On this machine the XMFLAGS=\$XMFLAGS"
     581    fi
    569582fi
    570583
    571584#+
    572585if [ X$g4vis_build_xm_session != X ] ; then
    573 XMLIBS="$g4vis_xmlibs"
    574 export XMLIBS
    575 if [ X\$g4non_display = X ] ; then
    576 echo "On this machine the XMLIBS=\$XMLIBS"
    577 fi
    578 fi
     586    XMLIBS="$g4vis_xmlibs"
     587    export XMLIBS
     588    if [ X\$g4non_display = X ] ; then
     589        echo "On this machine the XMLIBS=\$XMLIBS"
     590    fi
     591fi
     592
     593#+
     594if [ X$g4ui_build_xaw_session != X ] ; then
     595    XAWFLAGS="$g4ui_xawflags"
     596    export XAWFLAGS
     597    if [ X\$g4non_display = X ] ; then
     598        echo "On this machine the XAWFLAGS=\$XAWFLAGS"
     599    fi
     600fi
     601
     602#+
     603if [ X$g4ui_build_xaw_session != X ] ; then
     604    XAWLIBS="$g4ui_xawlibs"
     605    export XAWLIBS
     606    if [ X\$g4non_display = X ] ; then
     607        echo "On this machine the XAWLIBS=\$XAWLIBS"
     608    fi
     609fi
     610
    579611
    580612#
     
    582614#+
    583615if [ "X$g4ui_build_qt_session" = "Xy" -o "X$g4ui_use_qt" = "Xy" ] ; then
    584 QTFLAGS="$g4_qt_cxxflags"
    585 QTLIBS="$g4_qt_libs"
    586 QTMOC="$g4_qt_moc"
    587 export QTFLAGS
    588 export QTLIBS
    589 export QTMOC
    590 if test "x\$g4non_display" = "x" ; then
    591 echo "On this machine the QTFLAGS=\$QTFLAGS"
    592 echo "On this machine the QTLIBS=\$QTLIBS"
    593 echo "On this machine the QTMOC=\$QTMOC"
    594 fi
     616    QTFLAGS="$g4_qt_cxxflags"
     617    QTLIBS="$g4_qt_libs"
     618    QTMOC="$g4_qt_moc"
     619    export QTFLAGS
     620    export QTLIBS
     621    export QTMOC
     622    if test "x\$g4non_display" = "x" ; then
     623        echo "On this machine the QTFLAGS=\$QTFLAGS"
     624        echo "On this machine the QTLIBS=\$QTLIBS"
     625        echo "On this machine the QTMOC=\$QTMOC"
     626    fi
    595627fi
    596628
    597629if [ "X$g4vis_build_openglqt_driver" = "Xy" -o "X$g4vis_build_openglqt_driver" = "Xy" ] ; then
    598 if [ "X\$QTFLAGS" = "X" ] ; then
    599 QTFLAGS="$g4_qt_cxxflags $g4_qt_gl_cxxflags"
    600 else
    601 QTFLAGS="\$QTFLAGS $g4_qt_gl_cxxflags"
    602 fi
    603 if [ "X\$QTMOC" = "X" ] ; then
    604 QTMOC="$g4_qt_moc"
    605 fi
    606 GLQTLIBS="$g4_qt_libs $g4_qt_gl_libs"
    607 export QTFLAGS
    608 export QTMOC
    609 export GLQTLIBS
    610 if test "x\$g4non_display" = "x" ; then
    611 echo "On this machine the QTFLAGS=\$QTFLAGS"
    612 echo "On this machine the GLQTLIBS=\$GLQTLIBS"
    613 echo "On this machine the QTMOC=\$QTMOC"
    614 fi
     630    if [ "X\$QTFLAGS" = "X" ] ; then
     631        QTFLAGS="$g4_qt_cxxflags $g4_qt_gl_cxxflags"
     632    else
     633        QTFLAGS="\$QTFLAGS $g4_qt_gl_cxxflags"
     634    fi
     635
     636    if [ "X\$QTMOC" = "X" ] ; then
     637        QTMOC="$g4_qt_moc"
     638    fi
     639
     640    GLQTLIBS="$g4_qt_libs $g4_qt_gl_libs"
     641    export QTFLAGS
     642    export QTMOC
     643    export GLQTLIBS
     644    if test "x\$g4non_display" = "x" ; then
     645        echo "On this machine the QTFLAGS=\$QTFLAGS"
     646        echo "On this machine the GLQTLIBS=\$GLQTLIBS"
     647        echo "On this machine the QTMOC=\$QTMOC"
     648    fi
    615649fi
    616650
     
    622656#+
    623657if [ X$g4lib_build_gdml = Xy ] ; then
    624 G4LIB_BUILD_GDML=1
    625 export G4LIB_BUILD_GDML
    626 if test "x\$g4non_display" = "x" ; then
    627 echo "On this machine the G4LIB_BUILD_GDML=\$G4LIB_BUILD_GDML"
    628 fi
     658    G4LIB_BUILD_GDML=1
     659    export G4LIB_BUILD_GDML
     660    if test "x\$g4non_display" = "x" ; then
     661        echo "On this machine the G4LIB_BUILD_GDML=\$G4LIB_BUILD_GDML"
     662    fi
    629663fi
    630664
    631665if [ X$g4lib_build_gdml = Xy ] ; then
    632 XERCESCROOT=$g4gdml_xercesc_root
    633 export XERCESCROOT
    634 if test "x\$g4non_display" = "x" ; then
    635 echo "On this machine the XERCESCROOT=\$XERCESCROOT"
    636 fi
     666    XERCESCROOT=$g4gdml_xercesc_root
     667    export XERCESCROOT
     668    if test "x\$g4non_display" = "x" ; then
     669        echo "On this machine the XERCESCROOT=\$XERCESCROOT"
     670    fi
    637671fi
    638672
     
    644678#+
    645679if [ X$g4wlib_build_g3tog4 = Xy ] ; then
    646 G4LIB_BUILD_G3TOG4=1
    647 export G4LIB_BUILD_G3TOG4
    648 if [ X\$g4non_display = X ] ; then
    649 echo "On this machine the G4LIB_BUILD_G3TOG4=\$G4LIB_BUILD_G3TOG4"
    650 fi
     680    G4LIB_BUILD_G3TOG4=1
     681    export G4LIB_BUILD_G3TOG4
     682    if [ X\$g4non_display = X ] ; then
     683        echo "On this machine the G4LIB_BUILD_G3TOG4=\$G4LIB_BUILD_G3TOG4"
     684    fi
    651685fi
    652686
    653687if [ X$g4w_use_g3tog4 = Xy ] ; then
    654 G4LIB_USE_G3TOG4=1
    655 export G4LIB_USE_G3TOG4
    656 if [ X\$g4non_display = X ] ; then
    657 echo "On this machine the G4LIB_USE_G3TOG4=\$G4LIB_USE_G3TOG4"
    658 fi
     688    G4LIB_USE_G3TOG4=1
     689    export G4LIB_USE_G3TOG4
     690    if [ X\$g4non_display = X ] ; then
     691        echo "On this machine the G4LIB_USE_G3TOG4=\$G4LIB_USE_G3TOG4"
     692    fi
    659693fi
    660694
     
    664698#+
    665699if [ X$g4wlib_build_zlib = Xy ] ; then
    666 G4LIB_BUILD_ZLIB=1
    667 export G4LIB_BUILD_ZLIB
    668 if [ X\$g4non_display = X ] ; then
    669 echo "On this machine the G4LIB_BUILD_ZLIB=\$G4LIB_BUILD_ZLIB"
    670 fi
     700    G4LIB_BUILD_ZLIB=1
     701    export G4LIB_BUILD_ZLIB
     702    if [ X\$g4non_display = X ] ; then
     703        echo "On this machine the G4LIB_BUILD_ZLIB=\$G4LIB_BUILD_ZLIB"
     704    fi
    671705fi
    672706
    673707if [ X$g4w_use_zlib = Xy ] ; then
    674 G4LIB_USE_ZLIB=1
    675 export G4LIB_USE_ZLIB
    676 if [ X\$g4non_display = X ] ; then
    677 echo "On this machine the G4LIB_USE_ZLIB=\$G4LIB_USE_ZLIB"
    678 fi
     708    G4LIB_USE_ZLIB=1
     709    export G4LIB_USE_ZLIB
     710    if [ X\$g4non_display = X ] ; then
     711        echo "On this machine the G4LIB_USE_ZLIB=\$G4LIB_USE_ZLIB"
     712    fi
    679713fi
    680714
     
    685719#
    686720if [ X$g4lib_build_shared = Xy ] ; then
    687 G4LIB_BUILD_SHARED=1
    688 export G4LIB_BUILD_SHARED
    689 if [ X\$g4non_display = X ] ; then
    690 echo "On this machine the G4LIB_BUILD_SHARED=\$G4LIB_BUILD_SHARED"
    691 fi
     721    G4LIB_BUILD_SHARED=1
     722    export G4LIB_BUILD_SHARED
     723    if [ X\$g4non_display = X ] ; then
     724        echo "On this machine the G4LIB_BUILD_SHARED=\$G4LIB_BUILD_SHARED"
     725    fi
    692726fi
    693727
    694728if [ X$g4lib_build_static = Xy ] ; then
    695 G4LIB_BUILD_STATIC=1
    696 export G4LIB_BUILD_STATIC
    697 if [ X\$g4non_display = X ] ; then
    698 echo "On this machine the G4LIB_BUILD_STATIC=\$G4LIB_BUILD_STATIC"
    699 fi
     729    G4LIB_BUILD_STATIC=1
     730    export G4LIB_BUILD_STATIC
     731    if [ X\$g4non_display = X ] ; then
     732        echo "On this machine the G4LIB_BUILD_STATIC=\$G4LIB_BUILD_STATIC"
     733    fi
    700734fi
    701735
     
    705739#
    706740if [ X$g4lib_use_granular = Xy ] ; then
    707 G4LIB_USE_GRANULAR=1
    708 export G4LIB_USE_GRANULAR
    709 if [ X\$g4non_display = X ] ; then
    710 echo "On this machine the G4LIB_USE_GRANULAR=\$G4LIB_USE_GRANULAR"
    711 fi
     741    G4LIB_USE_GRANULAR=1
     742    export G4LIB_USE_GRANULAR
     743    if [ X\$g4non_display = X ] ; then
     744        echo "On this machine the G4LIB_USE_GRANULAR=\$G4LIB_USE_GRANULAR"
     745    fi
    712746fi
    713747
     
    726760#
    727761if [ $G4WORKDIR ] ; then
     762    if [ X\$g4non_display = X ] ; then
     763        echo "In your environment you have the G4WORKDIR=$G4WORKDIR"
     764    fi
     765else
     766    # Check for Windows!
     767    if test "X$G4SYSTEM" = "XWIN32-VC" -o "X$G4SYSTEM" = "XWIN32-VC7"; then
     768        if [ X\$g4non_display = X ] ; then
     769            echo "G4WORKDIR will be set to c:/geant4 (in "native" Windows syntax)"
     770        fi
     771
     772        G4WORKDIR="c:/geant4"
     773        export G4WORKDIR
     774
     775    else # if Unix
     776        if [ X\$g4non_display = X ] ; then
     777            echo "G4WORKDIR will be set to HOME/geant4=$HOME/geant4"
     778        fi
     779
     780        G4WORKDIR=$HOME/geant4
     781        export G4WORKDIR
     782    fi # if platforms
     783fi
     784
     785
     786
     787
     788
     789#
     790# *NIX Shared Libraries
     791# If we built Geant4 with shared libraries, we need to add the Gean4
     792# library directory to (DY)LD_LIBRARY_PATH.
     793# In all cases, external shared library directories should be added to
     794# (DY)LD_LIBRARY_PATH
     795
     796if test "X$G4SYSTEM" != "XDarwin-g++" ; then
     797    if [ $LD_LIBRARY_PATH ] ; then
     798        if [ $G4LIB_BUILD_SHARED ] ; then
     799            LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
     800        fi
     801   
     802        LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
     803
     804        if [ $G4LIB_BUILD_GDML ] ; then
     805            LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${XERCESCROOT}/lib
     806        fi
     807
     808        export LD_LIBRARY_PATH
     809    else
     810        if [ $G4LIB_BUILD_SHARED ] ; then
     811            LD_LIBRARY_PATH=${G4LIB}/${G4SYSTEM}
     812            LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
     813        else
     814            LD_LIBRARY_PATH=${CLHEP_LIB_DIR}
     815        fi
     816
     817        if [ $G4LIB_BUILD_GDML ] ; then
     818            LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${XERCESCROOT}/lib
     819        fi
     820
     821        export LD_LIBRARY_PATH
     822    fi
     823else
     824    #
     825    # Shared libraries for Mac
     826    #
     827    if [ $DYLD_LIBRARY_PATH ] ; then
     828        if [ $G4LIB_BUILD_SHARED ] ; then
     829            DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
     830        fi
     831   
     832        DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
     833   
     834        if [ $G4LIB_BUILD_GDML ] ; then
     835            DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${XERCESCROOT}/lib
     836        fi
     837
     838        export DYLD_LIBRARY_PATH
     839    else
     840        if [ $G4LIB_BUILD_SHARED ] ; then
     841            DYLD_LIBRARY_PATH=${G4LIB}/${G4SYSTEM}
     842            DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
     843        else
     844            DYLD_LIBRARY_PATH=${CLHEP_LIB_DIR}
     845        fi
     846
     847        if [ $G4LIB_BUILD_GDML ] ; then
     848           DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${XERCESCROOT}/lib
     849        fi
     850
     851        export DYLD_LIBRARY_PATH
     852    fi
     853fi
     854
     855#
     856# Warning about LD_LIBRARY_PATH
     857# NB: ONLY echo if g4non_display not set
     858if [ $G4LIB_BUILD_SHARED ] ; then
     859    if test "X$G4SYSTEM" = "XDarwin-g++" ; then
     860        if [ X\$g4non_display = X ] ; then
     861            echo 'DYLD_LIBRARY_PATH is set to include CLHEP and Geant4 libraries. '
     862        fi
     863    else
     864        if [ X\$g4non_display = X ] ; then
     865            echo 'LD_LIBRARY_PATH is set to include CLHEP and Geant4 libraries. '
     866        fi
     867    fi
     868else
     869    if test "X$G4SYSTEM" = "XDarwin-g++" ; then
     870        if [ X\$g4non_display = X ] ; then
     871            echo 'DYLD_LIBRARY_PATH is set to include CLHEP libraries. '
     872        fi
     873    else
     874        if [ X\$g4non_display = X ] ; then
     875            echo 'LD_LIBRARY_PATH is set to include CLHEP libraries. '
     876        fi
     877    fi
     878fi
    728879
    729880if [ X\$g4non_display = X ] ; then
    730 echo "In your environment you have the G4WORKDIR=$G4WORKDIR"
    731 fi
    732 
    733 else
    734 
    735 # Check for Windows!
    736 if test "X$G4SYSTEM" = "XWIN32-VC" -o "X$G4SYSTEM" = "XWIN32-VC7"; then
    737 
    738 if [ X\$g4non_display = X ] ; then
    739 echo "G4WORKDIR will be set to c:/geant4 (in "native" Windows syntax)"
    740 fi
    741 
    742 G4WORKDIR="c:/geant4"
    743 export G4WORKDIR
    744 
    745 else # if Unix
    746 
    747 if [ X\$g4non_display = X ] ; then
    748 echo "G4WORKDIR will be set to HOME/geant4=$HOME/geant4"
    749 fi
    750 
    751 G4WORKDIR=$HOME/geant4
    752 export G4WORKDIR
    753 
    754 fi # if platforms
    755 
    756 fi
    757 
    758 
    759 
    760 
    761 #
    762 # Shared libraries
    763 #
    764 if [ $G4LIB_BUILD_SHARED ] ; then
    765 #
    766 # Warning about LD_LIBRARY_PATH unless g4non_display is set!
    767 #
    768 if test "x\$g4non_display" = "x" ; then
     881    echo 'NOTE : you should verify that the correct path for the CLHEP library'
    769882    echo ''
    770     echo 'LD_LIBRARY_PATH is set to include CLHEP and Geant4 libraries. '
     883    echo ${CLHEP_BASE_DIR}/lib
    771884    echo ''
    772     echo 'NOTE : verify that the correct path for the CLHEP library'
    773     echo '- $CLHEP_BASE_DIR/lib - is included in the $LD_LIBRARY_PATH'
    774     echo 'variable in your environment, and no other outdated installations'
    775     echo 'of CLHEP are by chance referenced through $LD_LIBRARY_PATH and'
    776     echo 'present in your system !'
     885    echo 'is included in the dynamic library search path ahead of any other'
     886    echo 'installations of CLHEP on your system that may be referenced by this'
     887    echo 'path.'
    777888    echo ''
    778889fi
    779890
    780 if [ $LD_LIBRARY_PATH ] ; then
    781 LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
    782 LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
    783 
    784 if [ $G4LIB_BUILD_GDML ] ; then
    785    LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${XERCESCROOT}/lib
    786 fi
    787 export LD_LIBRARY_PATH
    788 
    789 else
    790 LD_LIBRARY_PATH=${G4LIB}/${G4SYSTEM}
    791 LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
    792 
    793 if [ $G4LIB_BUILD_GDML ] ; then
    794    LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${XERCESCROOT}/lib
    795 fi
    796 
    797 export LD_LIBRARY_PATH
    798 fi
    799 fi
    800 
    801 #
    802 # Shared libraries for Mac
    803 #
    804 if test "X$G4SYSTEM" = "XDarwin-g++" ; then
    805 
    806 if [ $G4LIB_BUILD_SHARED ] ; then
    807 if [ $DYLD_LIBRARY_PATH ] ; then
    808 DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
    809 DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
    810 
    811 if [ $G4LIB_BUILD_GDML ] ; then
    812    DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${XERCESCROOT}/lib
    813 fi
    814 
    815 export DYLD_LIBRARY_PATH
    816 else
    817 DYLD_LIBRARY_PATH=${G4LIB}/${G4SYSTEM}
    818 DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
    819 
    820 if [ $G4LIB_BUILD_GDML ] ; then
    821    DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${XERCESCROOT}/lib
    822 fi
    823 
    824 export DYLD_LIBRARY_PATH
    825 fi
    826 fi
    827 
    828 fi
    829891
    830892#
  • trunk/config/scripts/install.sh.SH

    r1213 r1337  
    3131unset  CLHEP_LIB_DIR
    3232
    33 unset  G4ANALYSIS_USE
    3433unset  G4DEBUG
    3534unset  G4INCLUDE
     
    5655unset  G4UI_NONE
    5756unset  G4UI_BUILD_WIN32_SESSION
     57unset  G4UI_BUILD_XAW_SESSION
    5858unset  G4UI_BUILD_XM_SESSION
    5959unset  G4UI_BUILD_QT_SESSION
    6060unset  G4UI_USE_TCSH
    6161unset  G4UI_USE_WIN32
     62unset  G4UI_USE_XAW
    6263unset  G4UI_USE_XM
    6364unset  G4UI_USE_QT
     
    219220fi
    220221
    221 #
    222 # g4analysis
    223 #
    224 #+
    225 if [ X$g4wanalysis_use = Xy ] ; then
    226 G4ANALYSIS_USE=1
    227 export G4ANALYSIS_USE
    228 echo "On this machine the G4ANALYSIS_USE=\$G4ANALYSIS_USE"
    229 fi
    230222
    231223#
     
    242234
    243235#+
     236if [ X$g4ui_build_xaw_session = Xy ] ; then
     237G4UI_BUILD_XAW_SESSION=1
     238export G4UI_BUILD_XAW_SESSION
     239echo "On this machine the G4UI_BUILD_XAW_SESSION=\$G4UI_BUILD_XAW_SESSION"
     240fi
     241
     242#+
     243if [ X$g4ui_use_xaw = Xy ] ; then
     244G4UI_USE_XAW=1
     245export G4UI_USE_XAW
     246echo "On this machine the G4UI_USE_XAW=\$G4UI_USE_XAW"
     247fi
     248
     249#+
    244250if [ X$g4ui_build_xm_session = Xy ] ; then
    245251G4UI_BUILD_XM_SESSION=1
     
    485491fi
    486492fi
     493
     494#+
     495if [ X$g4ui_build_xaw_session != X ] ; then
     496XAWFLAGS="$g4ui_xawflags"
     497export XAWFLAGS
     498if [ X\$g4non_display = X ] ; then
     499echo "On this machine the XAWFLAGS=\$XAWFLAGS"
     500fi
     501fi
     502
     503#+
     504if [ X$g4ui_build_xaw_session != X ] ; then
     505XAWLIBS="$g4ui_xawlibs"
     506export XAWLIBS
     507if [ X\$g4non_display = X ] ; then
     508echo "On this machine the XAWLIBS=\$XAWLIBS"
     509fi
     510fi
     511
     512
    487513
    488514# Qt Flags and Libs, messy, but needed for backward compatibility
  • trunk/config/scripts/move.sh.SH

    r1213 r1337  
    151151fi
    152152
    153 #
    154 # g4analysis
    155 #
    156 #+
    157 if [ X$g4wanalysis_use = Xy ] ; then
    158 G4ANALYSIS_USE=1
    159 export G4ANALYSIS_USE
    160 echo "On this machine the G4ANALYSIS_USE=\$G4ANALYSIS_USE"
    161 fi
    162153
    163154#
    164155# g4ui
    165156#
     157#+
     158if [ X$g4ui_build_xaw_session = Xy ] ; then
     159G4UI_BUILD_XAW_SESSION=1
     160export G4UI_BUILD_XAW_SESSION
     161echo "On this machine the G4UI_BUILD_XAW_SESSION=\$G4UI_BUILD_XAW_SESSION"
     162fi
     163
     164#+
     165if [ X$g4ui_use_xaw = Xy ] ; then
     166G4UI_USE_XAW=1
     167export G4UI_USE_XAW
     168echo "On this machine the G4UI_USE_XAW=\$G4UI_USE_XAW"
     169fi
     170
    166171#+
    167172if [ X$g4ui_build_xm_session = Xy ] ; then
  • trunk/config/sys/AIX-xlC.gmk

    r1213 r1337  
    3030    XMLIBS    := -L/usr/lib -lXm -lXt -lX11
    3131  endif
     32  ifndef XAWFLAGS
     33    XAWFLAGS  := -I/usr/include/X11
     34  endif
     35  ifndef XAWLIBS
     36    XAWLIBS   := -L/usr/lib -lXaw -lXmu -lXt -lX11 -lXext
     37  endif
    3238  ifndef OGLFLAGS
    3339    OGLFLAGS  := -I$(OGLHOME)/include
  • trunk/config/sys/CVS/Entries

    r1331 r1337  
    1 /AIX-xlC.gmk/1.8/Tue Jun 10 14:33:39 2008//Tgeant4-09-04-beta-01
    2 /DEC-cxx.gmk/1.12/Tue Jun 13 15:37:05 2006//Tgeant4-09-04-beta-01
    3 /Darwin-g++.gmk/1.42/Tue Sep  8 14:07:09 2009//Tgeant4-09-04-beta-01
    4 /HP-aCC.gmk/1.11/Tue Jun 13 15:37:05 2006//Tgeant4-09-04-beta-01
    5 /Linux-egcs.gmk/1.10/Tue Jun 13 15:37:05 2006//Tgeant4-09-04-beta-01
    6 /Linux-g++.gmk/1.50/Mon Apr 20 10:09:40 2009//Tgeant4-09-04-beta-01
    7 /Linux-icc.gmk/1.15/Mon Apr 27 07:43:54 2009//Tgeant4-09-04-beta-01
    8 /SGI-CC.gmk/1.8/Tue Jun 13 15:37:05 2006//Tgeant4-09-04-beta-01
    9 /SUN-CC.gmk/1.19/Mon Aug 13 11:06:29 2007//Tgeant4-09-04-beta-01
    10 /WIN32-VC.gmk/1.34/Fri Jun 11 10:07:46 2010//Tgeant4-09-04-beta-01
    11 /WIN32-g++.gmk/1.18/Mon Aug 17 15:58:25 2009//Tgeant4-09-04-beta-01
     1/AIX-xlC.gmk/1.8/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
     2/DEC-cxx.gmk/1.12/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
     3/Darwin-g++.gmk/1.42/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
     4/HP-aCC.gmk/1.11/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
     5/Linux-egcs.gmk/1.10/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
     6/Linux-g++.gmk/1.50/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
     7/Linux-icc.gmk/1.15/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
     8/SGI-CC.gmk/1.8/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
     9/SUN-CC.gmk/1.19/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
     10/WIN32-VC.gmk/1.34/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
     11/WIN32-g++.gmk/1.18/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
    1212D
  • trunk/config/sys/DEC-cxx.gmk

    r1213 r1337  
    3131    XMLIBS    := -lXm
    3232  endif
     33  ifndef XAWFLAGS
     34    XAWFLAGS   :=
     35  endif
     36  ifndef XAWLIBS
     37    XAWLIBS    := -lXaw
     38  endif
    3339  ifndef OGLFLAGS
    3440    OGLFLAGS  := -I$(OGLHOME)/include
  • trunk/config/sys/Darwin-g++.gmk

    r1335 r1337  
    5555#   XMLIBS    := -L/usr/X11R6/lib -lXm -lXpm   ##### some installations.
    5656  endif
     57  ifndef XAWFLAGS
     58    XAWFLAGS   := -I/sw/include
     59#   XAWFLAGS   := -I/usr/X11R6/include         ##### some installations.
     60  endif
     61  ifndef XAWLIBS
     62    XAWLIBS    := -lXaw
     63  endif
    5764  DLDLIBS   := -ldl
    5865  ifndef OGLHOME
     
    6875    else
    6976#      OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
    70 #      OGLLIBS   := $(OGLLIBS) -F/System/Library/Frameworks/ -framework OpenGL -framework AGL
    7177      OGLLIBS   := -F/System/Library/Frameworks/ -framework OpenGL -framework AGL
    7278    endif
     
    101107      QTLIBPATH   := $(shell test -d $(QTHOME)/lib/qt3/lib && echo "$(QTHOME)/lib/qt3/lib" || echo "$(QTHOME)/lib" )
    102108    else
    103       QTLIBPATH  := -F$(QTHOME)
     109      QTLIBPATH  := -F$(QTHOME)/lib -F$(QTHOME)
    104110    endif
    105111  endif
  • trunk/config/sys/HP-aCC.gmk

    r1213 r1337  
    3838    XMLIBS    := -L/usr/lib/Motif1.2_R6 -lXm
    3939  endif
     40  ifndef XAWFLAGS
     41    XAWFLAGS  := -I/usr/contrib/X11R6/include -I/usr/contrib/X11R6/include/X11
     42  endif
     43  ifndef XAWLIBS
     44    XAWLIBS   := -L/usr/contrib/X11R6/lib -lXaw
     45  endif
    4046  ifndef OGLFLAGS
    4147    OGLFLAGS  := -I$(OGLHOME)/include
  • trunk/config/sys/Linux-egcs.gmk

    r1213 r1337  
    4444    XMLIBS    := -lXm -lXpm
    4545  endif
     46  ifndef XAWFLAGS
     47    XAWFLAGS   := -I/usr/X11R6/include
     48  endif
     49  ifndef XAWLIBS
     50    XAWLIBS    := -lXaw
     51  endif
    4652  DLDLIBS   := -ldl
    4753  ifndef OGLFLAGS
  • trunk/config/sys/Linux-g++.gmk

    r1213 r1337  
    6161  ifndef XMLIBS
    6262    XMLIBS    := -lXm -lXpm
     63  endif
     64  ifndef XAWFLAGS
     65    XAWFLAGS   := -I/usr/X11R6/include
     66  endif
     67  ifndef XAWLIBS
     68    XAWLIBS    := -lXaw
    6369  endif
    6470  DLDLIBS   := -ldl
  • trunk/config/sys/Linux-icc.gmk

    r1213 r1337  
    4646    XMLIBS    := -lXm -lXpm
    4747  endif
     48  ifndef XAWFLAGS
     49    XAWFLAGS   := -I/usr/X11R6/include
     50  endif
     51  ifndef XAWLIBS
     52    XAWLIBS    := -lXaw
     53  endif
    4854  DLDLIBS   := -ldl
    4955  ifndef OGLFLAGS
  • trunk/config/sys/SGI-CC.gmk

    r1213 r1337  
    3030    XMLIBS    := -L/usr/lib -lXm
    3131  endif
     32  ifndef XAWFLAGS
     33    XAWFLAGS   :=
     34  endif
     35  ifndef XAWLIBS
     36    XAWLIBS    := -lXaw
     37  endif
    3238  ifndef OGLFLAGS
    3339    OGLFLAGS  :=
  • trunk/config/sys/SUN-CC.gmk

    r1213 r1337  
    3939    XMLIBS    += -R/usr/openwin/lib -lXt -lXm -lX11
    4040  endif
     41  ifndef XAWFLAGS
     42    XAWFLAGS  := -I/usr/openwin/include/X11
     43  endif
     44  ifndef XAWLIBS
     45    XAWLIBS   := -L/usr/openwin/lib -L/usr/dt/lib -L/usr/ucblib
     46    XAWLIBS   += -R/usr/openwin/lib -lXaw -lXmu -lXt -lX11 -lXext
     47  endif
    4148  ifndef OGLFLAGS
    4249    OGLFLAGS  := -I$(OGLHOME)/include
  • trunk/config/sys/WIN32-VC.gmk

    r1186 r1337  
    1414  CXXFLAGS += -D_CONSOLE -D_WIN32 -DOS
    1515  CPPFLAGS += -DWIN32 -DXPNET -D_CRT_SECURE_NO_DEPRECATE
    16   LDFLAGS  += -FORCE /NODEFAULTLIB:MSVCRT.dll
     16  LDFLAGS  += -FORCE /NODEFAULTLIB:MSVCRT.dll /STACK:8368128
    1717
    1818  SHEXT := dll
  • trunk/config/sys/WIN32-g++.gmk

    r1213 r1337  
    6060    XMLIBS    := -lXm -lXpm
    6161  endif
     62  ifndef XAWFLAGS
     63    XAWFLAGS  := -I/usr/X11R6/include
     64  endif
     65  ifndef XAWLIBS
     66    XAWLIBS   := -lXaw
     67  endif
    6268  ifndef OGLFLAGS
    6369    OGLFLAGS  := -I$(OGLHOME)/include
Note: See TracChangeset for help on using the changeset viewer.