Changeset 1045 for trunk/config/scripts

Timestamp:

May 15, 2009, 12:28:43 PM (17 years ago)

Author:

garnier

Message:

maj en aussi sur CVS

Location:

trunk/config/scripts

Files:

• env.csh.SH (modified) (4 diffs)
• env.sh.SH (modified) (8 diffs)

trunk/config/scripts/env.csh.SH

@@ -577 +577 @@
 if ( ${?LD_LIBRARY_PATH} )  then
 setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
-setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
+setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
 
 if ( ${?G4LIB_BUILD_GDML} ) then
@@ -585 +585 @@
 else
 setenv LD_LIBRARY_PATH ${G4LIB}/${G4SYSTEM}
-setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
+setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
 
 if ( ${?G4LIB_BUILD_GDML} ) then
@@ -602 +602 @@
 if ( ${?DYLD_LIBRARY_PATH} )  then
 setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
-setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
+setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
 
 if ( ${?G4LIB_BUILD_GDML} ) then
@@ -610 +610 @@
 else
 setenv DYLD_LIBRARY_PATH ${G4LIB}/${G4SYSTEM}
-setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
+setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
 
 if ( ${?G4LIB_BUILD_GDML} ) then

trunk/config/scripts/env.sh.SH

@@ -591 +591 @@
 export QTLIBS
 export QTMOC
+if test "x\$g4non_display" = "x" ; then
 echo "On this machine the QTFLAGS=\$QTFLAGS"
 echo "On this machine the QTLIBS=\$QTLIBS"
 echo "On this machine the QTMOC=\$QTMOC"
+fi
 fi
 
@@ -609 +611 @@
 export QTMOC
 export GLQTLIBS
+if test "x\$g4non_display" = "x" ; then
 echo "On this machine the QTFLAGS=\$QTFLAGS"
 echo "On this machine the GLQTLIBS=\$GLQTLIBS"
 echo "On this machine the QTMOC=\$QTMOC"
 fi
+fi
 
 
@@ -623 +627 @@
 G4LIB_BUILD_GDML=1
 export G4LIB_BUILD_GDML
+if test "x\$g4non_display" = "x" ; then
 echo "On this machine the G4LIB_BUILD_GDML=\$G4LIB_BUILD_GDML"
+fi
 fi 
 
@@ -629 +635 @@
 XERCESCROOT=$g4gdml_xercesc_root
 export XERCESCROOT
+if test "x\$g4non_display" = "x" ; then
 echo "On this machine the XERCESCROOT=\$XERCESCROOT"
+fi
 fi 
 
@@ -771 +779 @@
 if [ $G4LIB_BUILD_SHARED ] ; then
 #
-# Warning about LD_LIBRARY_PATH
-#
-echo ''
-echo 'LD_LIBRARY_PATH is set to include CLHEP and Geant4 libraries. '
-echo ''
-echo 'NOTE : verify that the correct path for the CLHEP library'
-echo '- $CLHEP_BASE_DIR/lib - is included in the $LD_LIBRARY_PATH'
-echo 'variable in your environment, and no other outdated installations'
-echo 'of CLHEP are by chance referenced through $LD_LIBRARY_PATH and'
-echo 'present in your system !'
-echo ''
+# Warning about LD_LIBRARY_PATH unless g4non_display is set!
+#
+if test "x\$g4non_display" = "x" ; then
+    echo ''
+    echo 'LD_LIBRARY_PATH is set to include CLHEP and Geant4 libraries. '
+    echo ''
+    echo 'NOTE : verify that the correct path for the CLHEP library'
+    echo '- $CLHEP_BASE_DIR/lib - is included in the $LD_LIBRARY_PATH'
+    echo 'variable in your environment, and no other outdated installations'
+    echo 'of CLHEP are by chance referenced through $LD_LIBRARY_PATH and'
+    echo 'present in your system !'
+    echo ''
+fi
 
 if [ $LD_LIBRARY_PATH ] ; then
 LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
+LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
 
 if [ $G4LIB_BUILD_GDML ] ; then
@@ -794 +804 @@
 else
 LD_LIBRARY_PATH=${G4LIB}/${G4SYSTEM}
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
+LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
 
 if [ $G4LIB_BUILD_GDML ] ; then
@@ -812 +822 @@
 if [ $DYLD_LIBRARY_PATH ] ; then
 DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
-DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
+DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
 
 if [ $G4LIB_BUILD_GDML ] ; then
@@ -821 +831 @@
 else
 DYLD_LIBRARY_PATH=${G4LIB}/${G4SYSTEM}
-DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
+DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
 
 if [ $G4LIB_BUILD_GDML ] ; then