Changeset 921 for trunk/Configure

Timestamp:

Feb 16, 2009, 10:14:30 AM (17 years ago)

Author:

garnier

Message:

en test de gl2ps. Problemes de libraries

File:

• trunk/Configure (modified) (16 diffs)

trunk/Configure

@@ -19 +19 @@
 #
 
-# $Id: Configure,v 1.107 2008/11/14 15:14:46 bmorgan Exp $
-#
-# Generated on Fri Nov 14 15:14:32 GMT 2008 [metaconfig 3.0 PL70]
+# $Id: Configure,v 1.110 2008/12/03 15:34:57 bmorgan Exp $
+#
+# Generated on Wed Dec  3 15:33:49 GMT 2008 [metaconfig 3.0 PL70]
 
 cat >/tmp/c1$$ <<EOF
@@ -1144 +1144 @@
 awk
 cat
+echo
 expr
 grep
@@ -2303 +2304 @@
             \`ls -dr /System/Library/Frameworks/QtCore.framework/Headers 2>/dev/null\`
             /usr/include/QtCore
-            \`ls -dr /usr/include/qt*/QtCore 2>/dev/null\` 
+            \`ls -dr /usr/include/qt*/QtCore 2>/dev/null\`
+            \`ls -dr /usr/local/include/QtCore 2>/dev/null\`
+            \`ls -dr /usr/local/include/qt*/QtCore 2>/dev/null\`
+            \`ls -dr /usr/local/qt*/include/QtCore 2>/dev/null\` 
             \`ls -dr /opt/qt*/include/QtCore 2>/dev/null\` 
             \`ls -dr /usr/qt*/include/QtCore 2>/dev/null\`
@@ -2313 +2317 @@
             /usr/include
             \`ls -dr /usr/include/qt* 2>/dev/null\`
+            \`ls -dr /usr/local/include 2>/dev/null\`
+            \`ls -dr /usr/local/include/qt* 2>/dev/null\`
+            \`ls -dr /usr/local/qt*/include 2>/dev/null\`
             \`ls -dr /opt/qt*/include 2>/dev/null\` 
             \`ls -dr /usr/qt*/include 2>/dev/null\`
@@ -2321 +2328 @@
             \`ls -dr /sw/qt/*/include 2>/dev/null\`
             /usr/include/Qt
-            \`ls -dr /usr/include/qt*/Qt 2>/dev/null\` 
+            \`ls -dr /usr/include/qt*/Qt 2>/dev/null\`
+            \`ls -dr /usr/local/include/Qt 2>/dev/null\`
+            \`ls -dr /usr/local/include/qt*/Qt 2>/dev/null\`
             \`ls -dr /opt/qt*/include/Qt 2>/dev/null\` 
             \`ls -dr /usr/qt*/include/Qt 2>/dev/null\`
@@ -2592 +2601 @@
 fi #END TEST "x\$g4_qt_is_configured" = "x" 
 
-
-echo ""
-echo "DEBUG#####"
-echo "g4_qt_cxxflags    = \$g4_qt_cxxflags"
-echo "g4_qt_gl_cxxflags = \$g4_qt_gl_cxxflags"
-echo "g4_qt_libs        = \$g4_qt_libs"
-echo "g4_qt_gl_libs     = \$g4_qt_gl_libs"
-echo "g4_qt_moc         = \$g4_qt_moc"
-echo "..."
-echo "g4_havegoodqt       = \$g4_havegoodqt"
-echo "g4_qt_is_configured = \$g4_qt_is_configured"
-echo "##########"
 EOSC
 : decide how portable to be
@@ -3120 +3117 @@
 done
 
+g4data_photonevaporation_version='PhotonEvaporation2.0'
+g4data_radioactivedecay_version='RadioactiveDecay3.2'
+g4data_g4emlow_version='G4EMLOW6.2'
+g4data_g4ndl_version='G4NDL3.13'
+g4data_g4abla_version='G4ABLA3.0'
+#END GEANT4 DATA OPTIONS
 echo " "
 
+
+#
+# Set defaults for data paths - here, because we depend on g4install
+#
 case "$g4data" in
 '')
@@ -3130 +3137 @@
 case "$g4levelgammadata" in
 '')
-        g4levelgammadata=$g4data/PhotonEvaporation2.0
+        g4levelgammadata=$g4data/$g4data_photonevaporation_version
         ;;
 esac
@@ -3136 +3143 @@
 case "$g4radioactivedata" in
 '')
-        g4radioactivedata=$g4data/RadioactiveDecay3.2
+        g4radioactivedata=$g4data/$g4data_radioactivedecay_version
         ;;
 esac
@@ -3142 +3149 @@
 case "$g4ledata" in
 '')
-        g4ledata=$g4data/G4EMLOW6.1
+        g4ledata=$g4data/$g4data_g4emlow_version
         ;;
 esac
@@ -3148 +3155 @@
 case "$g4neutronhpcrosssections" in
 '')
-        g4neutronhpcrosssections=$g4data/G4NDL3.12
+        g4neutronhpcrosssections=$g4data/$g4data_g4ndl_version
         ;;
 esac
@@ -3154 +3161 @@
 case "$g4abladata" in
 '')
-        g4abladata=$g4data/G4ABLA3.0
-        ;;
-esac
-
-
-#case "$g4elasticdata" in
-#'')
-#       g4elasticdata=$g4data/G4ELASTIC1.1
-#       ;;
-#esac
-
-#########################################################################
-
-# while test 1 = 1  ; do
-
-g4message=`cat << EOM
-
-Please, specify default directory where ALL the Geant4 data is installed:
-
- G4LEVELGAMMADATA:              $g4levelgammadata
-
- G4RADIOACTIVEDATA:             $g4radioactivedata
-
- G4LEDATA:                      $g4ledata
-
- G4NEUTRONHPDATA:               $g4neutronhpcrosssections
-
- G4ABLADATA:                    $g4abladata
-
-You will be asked about customizing these next.
-
-EOM`
-
-#dflt="NO DEFAULT ANSWER"
+        g4abladata=$g4data/$g4data_g4abla_version
+        ;;
+esac
+
+
+#
+# Now we have defaults, prompt user to see if this is where they want to use
+# 
+g4data_alllibs="$g4data_photonevaporation_version $g4data_radioactivedecay_version $g4data_g4emlow_version $g4data_g4ndl_version $g4data_g4abla_version"
+
+g4message=`cat <<EOM
+Specify the path where are the Geant4 data libraries 
+
+$g4data_alllibs 
+
+are installed. For now, a flat directory structure is assumed, and this can 
+be customized at the next step if needed.
+EOM`
+
 dflt=$g4data
-#fn='d~'
-rp=$g4message
-#. ./myread
-gans=$ans
-
-                dflt=$g4data
-                fn='d~'
-                . ./getfile
-
-                if [ X$g4data != X$ans ] ; then
-                g4data=$ans
-
-                g4levelgammadata=$g4data/PhotonEvaporation2.0
-                g4radioactivedata=$g4data/RadioactiveDecay3.2
-                g4ledata=$g4data/G4EMLOW6.1
-                g4neutronhpcrosssections=$g4data/G4NDL3.12
-                g4abladata=$g4data/G4ABLA3.0
-#               g4elasticdata=$g4data/G4ELASTIC1.1
-                fi
-# done
-
-###################################################################
-
-while test 1 = 1  ; do
-
-g4message=`cat << EOM
-
-Please, specify default directory where the Geant4 data is installed:
-
-1) G4LEVELGAMMADATA:            $g4levelgammadata
-
-2) G4RADIOACTIVEDATA:           $g4radioactivedata
-
-3) G4LEDATA:                    $g4ledata
-
-4) G4NEUTRONHPDATA:             $g4neutronhpcrosssections
-
-5) G4ABLADATA:                  $g4abladata
-
-To modify default settings, select number above (e.g. 2) 
-EOM`
-
-#dflt="NO DEFAULT ANSWER"
-dflt="Press [Enter] for default settings"
-#fn='d~'
 rp=$g4message
 . ./myread
-gans=$ans
-
+g4data=$ans
+
+#
+# Using this, we can now check that the libs exist, but only on a directory
+# level
+#
+g4data_foundall='yes'
+promptend="no"
+g4data_customize="no"
+
+while test "x$promptend" = "xno" ; do
+        ### PhotonEvaporation
+        $echo $n "checking for $g4data_photonevaporation_version... $c"
+        if test -d "$g4data/$g4data_photonevaporation_version" ; then
+                $echo "yes"
+                g4levelgammadata=$g4data/$g4data_photonevaporation_version
+        else
+                $echo "no"
+                g4data_foundall="no"
+        fi
+
+        ### RadioactiveDecay
+        $echo $n "checking for $g4data_radioactivedecay_version... $c"
+        if test -d "$g4data/$g4data_radioactivedecay_version" ; then
+                $echo "yes"
+                g4radioactivedata=$g4data/$g4data_radioactivedecay_version
+        else
+                $echo "no"
+                g4data_foundall="no"
+        fi
+
+        ### G4EMLOW
+        $echo $n "checking for $g4data_g4emlow_version... $c"
+        if test -d "$g4data/$g4data_g4emlow_version" ; then
+                $echo "yes"
+                g4ledata=$g4data/$g4data_emlow_version
+        else
+                $echo "no"
+                g4data_foundall="no"
+        fi
+
+        ### G4NDL
+        $echo $n "checking for $g4data_g4ndl_version... $c"
+        if test -d "$g4data/$g4data_g4ndl_version" ; then
+                $echo "yes"
+                g4neutronhpcrosssections=$g4data/$g4data_g4ndl_version
+        else
+                $echo "no"
+                g4data_foundall="no"
+        fi
+
+        ### G4ABLA
+        $echo $n "checking for $g4data_g4abla_version... $c"
+        if test -d "$g4data/$g4data_g4abla_version" ; then
+                $echo "yes"
+                g4levelgammadata=$g4data/$g4data_g4abla_version
+        else
+                $echo "no"
+                g4data_foundall="no"
+        fi
+
+        #
+        # If we haven't found all the data, query the user as to whether they
+        # want to
+        # 1) try again with a different path
+        # 2) use the path they input
+        # 3) customize paths
+        #
+        if test "x$g4data_foundall" = "xyes" ; then
+                promptend=yes
+        else
+                g4message=`cat << EOM
+
+Failed to locate one or more of the Geant4 data libraries in 
+
+$g4data 
+
+Please enter
+1) Another path to search in
+2) 'f' to force the use of the path you entered previously (the data libraries
+   are not needed to build Geant4, but are needed to run applications later).
+3) 'c' to customize the data paths, e.g. if you have the data libraries
+   installed in different locations.
+EOM`
+                dflt="f"
+                rp=$g4message
+                . ./myread
+                gans=$ans
+
+                if test "x$gans" = "xf" ; then
+                        # Force paths
+                        promptend="yes"
+                        g4levelgammadata="$g4data/$g4data_photonevaporation_version"
+                        g4radioactivedata="$g4data/$g4data_radioactivedecay_version"
+                        g4ledata="$g4data/$g4data_g4emlow_version"
+                        g4neutronhpcrosssections="$g4data/$g4data_g4ndl_version"
+                        g4abladata="$g4data/$g4data_g4abla_version"
+                        
+
+                elif test "x$gans" = "xc" ; then
+                        # enable customization - we use input g4data to set
+                        # defaults
+                        promptend="yes"
+                        g4data_customize="yes"
+
+                        g4levelgammadata="$g4data/$g4data_photonevaporation_version"
+                        g4radioactivedata="$g4data/$g4data_radioactivedecay_version"
+                        g4ledata="$g4data/$g4data_g4emlow_version"
+                        g4neutronhpcrosssections="$g4data/$g4data_g4ndl_version"
+                        g4abladata="$g4data/$g4data_g4abla_version"
+
+
+                else
+                        #try again
+                        g4data=$gans
+                fi
+        fi
+done
+
+
+#
+# Now customize paths if required
+#
+if test "x$g4data_customize" = "xyes" ; then
+while test "x" = "x" ; do
+
+        g4message=`cat <<EOM
+
+You have chosen to customize the Geant4 data library paths.
+
+1) $g4data_photonevaporation_version: 
+        $g4levelgammadata
+2) $g4data_radioactivedecay_version: 
+        $g4radioactivedata
+3) $g4data_g4emlow_version: 
+        $g4ledata
+4) $g4data_g4ndl_version: 
+        $g4neutronhpcrosssections
+5) $g4data_g4abla_version: 
+        $g4abladata
+
+Choose a number from the list above to customize that path (e.g. 2)
+EOM`
+
+        dflt="Press [Enter] to exit customization with paths as above"
+        rp=$g4message
+        . ./myread
+        gans=$ans
 
         case $gans in
 
-        1) 
+        "1")
                 dflt=$g4levelgammadata
                 fn='d~'
-                rp="Where is Geant4 PhotonEvaporation2.0 data installed?"
+                rp="Custom path to $g4data_photonevaporation_version?"
                 . ./getfile
                 g4levelgammadata=$ans
                 ;;
-        2) 
+
+        "2")
                 dflt=$g4radioactivedata
                 fn='d~'
-                rp="Where is Geant4 RadioactiveDecay3.2 data installed?"
+                rp="Custom path to $g4data_radioactivedecay_version?"
                 . ./getfile
                 g4radioactivedata=$ans
                 ;;
-        3) 
+
+        "3")
                 dflt=$g4ledata
                 fn='d~'
-                rp="Where is G4EMLOW6.1 data installed ?"
+                rp="Custom path to $g4data_g4emlow_version?"
                 . ./getfile
                 g4ledata=$ans
                 ;;
-        4) 
+
+        "4")
                 dflt=$g4neutronhpcrosssections
                 fn='d~'
-                rp="Where is G4NDL3.12 data installed?"
+                rp="Custom path to $g4data_g4ndl_version?"
                 . ./getfile
                 g4neutronhpcrosssections=$ans
                 ;;
 
-        5)
+        "5")
                 dflt=$g4abladata
                 fn='d~'
-                rp="Where is G4ABLA3.0 data installed?"
+                rp="Custom path to $g4data_g4abla_version?"
                 . ./getfile
                 g4abladata=$ans
                 ;;
 
-#       5) 
-#               dflt=$g4elasticdata
-#               fn='d~'
-#               rp="Where is G4ELASTIC1.1 data installed?"
-#               . ./getfile
-#               g4elasticdata=$ans
-#               ;;
-
-#       [eE]) 
-#               break
-#               ;;
-        *) 
+        *)
                 break
-#               echo " "
-                ;;
+                ;;
+
         esac
+
 done
+fi
+
+
+
 
 
@@ -4355 +4445 @@
 
 if test "X$g4osname" = "XLinux" ; then
-g4ui_xawflags=" -I$g4ui_xawhome/include "
-        if test "X$g4ui_xawhome" = "X/usr/X11R6" ; then
+        if test "X$g4ui_xawhome" = "X" ; then
+                g4ui_xawflags=""
+        else
+                g4ui_xawflags=" -I$g4ui_xawhome/include "
+        fi
+
+        if test "X$g4ui_xawhome" = "X/usr/X11R6" -o "X$g4ui_xawhome" = "X" ; then
                 g4ui_xawlibs=" -lXaw "
         else
-                g4ui_xawlibs=" -L$g4ui_xawhome/lib -lXaw "
+                if test -d "$g4ui_xawhome/lib64" ; then
+                        g4ui_xawlibs=" -L$g4ui_xawhome/lib64 -lXaw "
+                else
+                        g4ui_xawlibs=" -L$g4ui_xawhome/lib -lXaw "
+                fi
         fi
 fi
@@ -4558 +4657 @@
 
 if test "X$g4osname" = "XLinux"; then 
-
-if test "X$g4vis_xmhome" = "X/usr" -o "X$g4vis_xmhome" = "X/usr/local" ; then
-g4vis_xmhome=""
-fi
+        if test "X$g4vis_xmhome" = "X/usr" -o "X$g4vis_xmhome" = "X/usr/local" ; then
+                g4vis_xmhome=""
+        fi
 fi
 fi # g4vis_build_opheglxm_driver
@@ -4577 +4675 @@
 
 if test "X$g4osname" = "XLinux" ; then
-g4vis_xmflags=" -I$g4vis_xmhome/include "
-        if test "X$g4vis_xmhome" = "X/usr/X11R6" ; then
+        if test "X$g4vis_xmhome" = "X" ; then
+                g4vis_xmflags=""
+        else
+                g4vis_xmflags=" -I$g4vis_xmhome/include "
+        fi
+
+        if test "X$g4vis_xmhome" = "X/usr/X11R6" -o "X$g4vis_xmhome" = "X" ; then
                 g4vis_xmlibs=" -lXm -lXpm "
         else
-                g4vis_xmlibs=" -L$g4vis_xmhome/lib -lXm -lXpm "
+                if test -d "$g4vis_xmhome/lib64" ; then
+                        g4vis_xmlibs=" -L$g4vis_xmhome/lib64 -lXm -lXpm "
+                else
+                        g4vis_xmlibs=" -L$g4vis_xmhome/lib -lXm -lXpm "
+                fi
         fi
 fi
@@ -5180 +5287 @@
 
 if test "X$g4osname" = "XLinux" ; then
-g4vis_xmflags=" -I$g4vis_xmhome/include "
-        if test "X$g4vis_xmhome" = "X/usr/X11R6" ; then
+        if test "X$g4vis_xmhome" = "X" ; then
+                g4vis_xmflags=""
+        else
+                g4vis_xmflags=" -I$g4vis_xmhome/include "
+        fi
+
+        if test "X$g4vis_xmhome" = "X/usr/X11R6" -o "X$g4vis_xmhome" = "X" ; then
                 g4vis_xmlibs=" -lXm -lXpm "
         else
-                g4vis_xmlibs=" -L$g4vis_xmhome/lib -lXm -lXpm "
+                if test -d "$g4vis_xmhome/lib64" ; then
+                        g4vis_xmlibs=" -L$g4vis_xmhome/lib64 -lXm -lXpm "
+                else
+                        g4vis_xmlibs=" -L$g4vis_xmhome/lib -lXm -lXpm "
+                fi
         fi
 fi