Changeset 1337 for trunk/Configure

Timestamp:

Sep 30, 2010, 2:47:17 PM (15 years ago)

Author:

garnier

Message:

tag geant4.9.4 beta 1 + modifs locales

File:

• trunk/Configure (modified) (24 diffs)

trunk/Configure

@@ -19 +19 @@
 #
 
-# $Id: Configure,v 1.124 2009/11/24 13:10:37 bmorgan Exp $
+# $Id: Configure,v 1.133 2010/06/24 15:24:11 bmorgan Exp $
 #
-# Generated on Tue Nov 24 13:09:42 GMT 2009 [metaconfig 3.0 PL70]
+# Generated on Thu Jun 24 16:21:02 BST 2010 [metaconfig 3.0 PL70]
 
 cat >/tmp/c1$$ <<EOF
@@ -179 +179 @@
 g4levelgammadata=''
 g4neutronhpcrosssections=''
+g4neutronxsdata=''
 g4radioactivedata=''
 g4clhep_base_dir=''
@@ -333 +334 @@
 g4vis_build_raytracer_driver='y'
 g4vis_use_raytracer='y'
-g4vis_build_vrml_driver='y'
-g4vis_use_vrml='y'
+g4vis_build_vrmlfile_driver='y'
+g4vis_use_vrmlfile='y'
+g4vis_build_vrml_driver='n'
+g4vis_use_vrml='n'
 g4vis_build_asciitree_driver='y'
 g4vis_use_asciitree='y'
@@ -2258 +2261 @@
     #
     # User may supply a value for 'QTDIR' and in that case we ASSUME a
-    # Trolltech style installation or a Mac Framework
+    # Trolltech style installation or a Mac Framework. The latter has a
+    # higher priority in the list of search paths because otherwise we may
+    # miss the presence of a Framework (see Bug #1095)
     #
     if test "x\$with_qt_dir" != "x" ; then
         g4_qt_dir="\$with_qt_dir"
-        g4_qt_possible_qt_include_dirs="\$with_qt_dir/include/QtCore
+        g4_qt_possible_qt_include_dirs="\$with_qt_dir/QtCore.framework/Headers
+                                        \$with_qt_dir/lib*/QtCore.framework/Headers
+                                        \$with_qt_dir/include/QtCore
                                         \$with_qt_dir/include/Qt 
                                         \`ls -dr \$with_qt_dir/include/qt*/QtCore 2>/dev/null\` 
                                         \`ls -dr \$with_qt_dir/include/qt*/Qt 2>/dev/null\` 
                                         \`ls -dr \$with_qt_dir/include/qt* 2>/dev/null\` 
-                                        \$with_qt_dir/include
-                                        \$with_qt_dir/QtCore.framework/Headers"
+                                        \$with_qt_dir/include"
 
         # Check for qglobal.h
@@ -2284 +2290 @@
 
     else
-        # We use standard search paths...
+        # We use standard search paths, again preferencing Frameworks so that
+        # these are not missed
         qt_direct_test_header="qglobal.h"
 
@@ -2290 +2297 @@
             \`ls -dr /Library/Frameworks/QtCore.framework/Headers 2>/dev/null\` 
             \`ls -dr /System/Library/Frameworks/QtCore.framework/Headers 2>/dev/null\`
+            \`ls -dr /usr/local/Qt*/QtCore.framework/Headers 2>/dev/null\`
+            \`ls -dr /usr/local/Qt*/lib*/QtCore.framework/Headers 2>/dev/null\`
+            \`ls -dr /usr/local/lib*/Qt*/QtCore.framework/Headers 2>/dev/null\`
+            \`ls -dr /opt/local/Qt*/QtCore.framework/Headers 2>/dev/null\`
+            \`ls -dr /opt/local/Qt*/lib*/QtCore.framework/Headers 2>/dev/null\`
+            \`ls -dr /opt/local/lib/Qt*/QtCore.framework/Headers 2>/dev/null\`
+            \`ls -dr /opt/local/lib*/QtCore.framework/Headers 2>/dev/null\`
+            \`ls -dr /opt/Qt*/QtCore.framework/Headers 2>/dev/null\`
+            \`ls -dr /opt/Qt*/lib*/QtCore.framework/Headers 2>/dev/null\`
+            \`ls -dr /usr/lib/QtCore.framework/Headers 2>/dev/null\`
+            \`ls -dr /usr/lib/Qt*/QtCore.framework/Headers 2>/dev/null\`
             /usr/include/QtCore
             \`ls -dr /usr/include/qt*/QtCore 2>/dev/null\`
-            \`ls -dr /usr/local/include/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 /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\`
@@ -2305 +2323 @@
             \`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/include/qt* 2>/dev/null\`
             \`ls -dr /usr/local/qt*/include 2>/dev/null\`
             \`ls -dr /opt/qt*/include 2>/dev/null\` 
@@ -2348 +2366 @@
             g4_qt_include_dir=no
             g4_havegoodqt=no
+            echo "checking for qglobal.h... no"
+        else
+            echo "checking for qglobal.h... \$g4_qt_include_dir/qglobal.h"
         fi
-
-        echo "checking for qglobal.h... \$g4_qt_include_dir/qglobal.h"
     fi # END TEST with_qt_dir is set
 
@@ -2361 +2380 @@
     # Immediate and obvious Darwin check...
     if test "x\`basename \$g4_qt_include_dir\`" = "xHeaders" ; then
-        #check for moc
-        if test -x "/usr/bin/moc" ; then
-            g4_qt_moc="/usr/bin/moc"
-            echo "checking for moc... \$g4_qt_moc"
-
-            g4_qt_dir=\`dirname \$g4_qt_include_dir\`
-            g4_qt_dir=\`dirname \$g4_qt_dir\`
-
-            g4_qt_version="4"
-            g4_qt_cxxflags="-I\$g4_qt_dir/QtCore.framework/Headers -I\$g4_qt_dir/QtGui.framework/Headers"
-            g4_qt_gl_cxxflags="-I\$g4_qt_dir/QtOpenGl.framework/Headers"
-            g4_qt_libs="-F\$g4_qt_dir -framework QtCore -framework QtGui"
-            g4_qt_gl_libs="-framework QtOpenGL"
-        else
-            echo "checking for moc... no"
-            g4_havegoodqt=no
+        #check for moc - we have a framework so we first need to check for
+        #a bin directory below g4_qt_include_dir. Depending on how the
+        #Framework was installed, this may be below the level that
+        #QtCore.framework is at.
+
+        # Find base framework directory
+        g4_qt_fmwk_base_dir=\`dirname \$g4_qt_include_dir\`
+        g4_qt_fmwk_base_dir=\`dirname \$g4_qt_fmwk_base_dir\`
+
+        if test "x\`basename \$g4_qt_fmwk_base_dir\`" = "xlib" ; then
+            #This is probably an independent install
+            echo "checking Mac Framework location... trolltech/custom"
+            g4_qt_dir=\`dirname \$g4_qt_fmwk_base_dir\`
+
+            #Check for moc
+            if test -x "\$g4_qt_dir/bin/moc" ; then
+                g4_qt_moc="\$g4_qt_dir/bin/moc"
+                echo "checking for moc... \$g4_qt_moc"
+
+                g4_qt_version="4"
+                g4_qt_cxxflags="-I\$g4_qt_dir/lib/QtCore.framework/Headers -I\$g4_qt_dir/lib/QtGui.framework/Headers"
+                g4_qt_gl_cxxflags="-I\$g4_qt_dir/lib/QtOpenGl.framework/Headers"
+                g4_qt_libs="-F\$g4_qt_dir/lib -framework QtCore -framework QtGui"
+                g4_qt_gl_libs="-framework QtOpenGL"
+            else
+                echo "checking for moc... no"
+                g4_havegoodqt=no
+            fi
+        elif test "x\`basename \$g4_qt_fmwk_base_dir\`" = "xFrameworks" ; then
+            #This looks like a system install
+            echo "Checking Mac Framework location... Frameworks"
+            if test -x "/usr/bin/moc" ; then
+                g4_qt_moc="/usr/bin/moc"
+                echo "checking for moc... \$g4_qt_moc"
+
+                g4_qt_dir=\$g4_qt_fmwk_base_dir
+
+                    g4_qt_version="4"
+                g4_qt_cxxflags="-I\$g4_qt_dir/QtCore.framework/Headers -I\$g4_qt_dir/QtGui.framework/Headers"
+                g4_qt_gl_cxxflags="-I\$g4_qt_dir/QtOpenGl.framework/Headers"
+                g4_qt_libs="-F\$g4_qt_dir -framework QtCore -framework QtGui"
+                g4_qt_gl_libs="-framework QtOpenGL"
+            else
+                echo "checking for moc... no"
+                g4_havegoodqt=no
+            fi
         fi
-    else
+    elif test "x\$g4_qt_include_dir" != "x" ; then
         # Probably have Unix-style installation, in which case estimated
         # 'QTDIR' equivalent is $with_qt_dir if supplied, or directory
@@ -2477 +2526 @@
             # We don't ever cross-compile Geant4, so must have the native libraries.
             # Double check for this craziness...
-            case `uname -m` in
+            case "`uname -m`" in
                 i*86)
                     g4_qt_lib_dir=\$g4_qt_dir/lib
@@ -2669 +2718 @@
             g4_qt_is_configured=''
         fi
+    else
+        #We couldn't find qglobal...
+            g4_havegoodqt="no"
     fi #END TEST for Darwin Framework
 
@@ -3234 +3286 @@
 g4data_photonevaporation_version='PhotonEvaporation2.0'
 g4data_radioactivedecay_version='RadioactiveDecay3.2'
-g4data_g4emlow_version='G4EMLOW6.9'
+g4data_g4emlow_version='G4EMLOW6.13'
 g4data_g4ndl_version='G4NDL3.13'
 g4data_g4abla_version='G4ABLA3.0'
 g4data_realsurface_version='RealSurface1.0'
+g4data_neutronxs_version='G4NEUTRONXS1.0'
 #END GEANT4 DATA OPTIONS
 echo " "
@@ -3288 +3341 @@
 esac
 
+case "$g4neutronxsdata" in
+'')
+        g4neutronxsdata=$g4data/$g4data_neutronxs_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 $g4data_realsurface_version"
+g4data_alllibs="$g4data_photonevaporation_version $g4data_radioactivedecay_version $g4data_g4emlow_version $g4data_g4ndl_version $g4data_g4abla_version $g4data_realsurface_version $g4data_neutronxs_version"
 
 g4message=`cat <<EOM
@@ -3367 +3426 @@
                 $echo "yes"
                 g4realsurfacedata=$g4data/$g4data_realsurface_version
+        else
+                $echo "no"
+                g4data_foundall="no"
+        fi
+
+        ### G4NEUTRONXS
+        $echo $n "checking for $g4data_neutronxs_version... $c"
+        if test -d "$g4data/$g4data_neutronxs_version" ; then
+                $echo "yes"
+                g4neutronxsdata=$g4data/$g4data_neutronxs_version
         else
                 $echo "no"
@@ -3411 +3480 @@
                         g4abladata="$g4data/$g4data_g4abla_version"
                         g4realsurfacedata="$g4data/$g4data_realsurface_version"
+            g4neutronxsdata="$g4data/$g4data_neutronxs_version"
                         
 
@@ -3420 +3490 @@
 
                         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"
-                        g4realsurfacedata="$g4data/$g4data_realsurface_version"
+            g4radioactivedata="$g4data/$g4data_radioactivedecay_version"
+            g4ledata="$g4data/$g4data_g4emlow_version"
+            g4neutronhpcrosssections="$g4data/$g4data_g4ndl_version"
+            g4abladata="$g4data/$g4data_g4abla_version"
+            g4realsurfacedata="$g4data/$g4data_realsurface_version"
+            g4neutronxsdata="$g4data/$g4data_neutronxs_version"
 
                 else
@@ -3457 +3528 @@
 6) $g4data_realsurface_version:
         $g4realsurfacedata
+7) $g4data_neutronxs_version:
+    $g4neutronxsdata
 
 Choose a number from the list above to customize that path (e.g. 2)
@@ -3514 +3587 @@
                 . ./getfile
                 g4realsurfacedata=$ans
+                ;;
+
+        "7")
+                dflt=$g4neutronxsdata
+                fn='d~'
+                rp="Custom path to $g4data_neutronxs_version?"
+                . ./getfile
+                g4neutronxsdata=$ans
                 ;;
 
@@ -3570 +3651 @@
 # Now see if make/gmake are GNU make.
 if test "x$g4_make_loc" != "xno" ; then
-    g4_make_version=`$g4_make_loc -v 2>/dev/null`
+    g4_make_version=`$g4_make_loc -v 2>/dev/null | sed s"/'//"`
 
     case $g4_make_version in
@@ -3585 +3666 @@
 if test "x$g4osname" != "xWIN32" ; then
     if test "x$g4_gmake_loc" != "xno" ; then
-        g4_gmake_version=`$g4_gmake_loc -v 2>/dev/null`
+        g4_gmake_version=`$g4_gmake_loc -v 2>/dev/null | sed s"/'//"`
 
         case $g4_gmake_version in
@@ -3624 +3705 @@
 
         #Check if this is GNU make...
-        g4_user_make_version=`$gans -v 2>/dev/null`
+        g4_user_make_version=`$gans -v 2>/dev/null | sed s"/'//"`
 
         case $g4_user_make_version in
@@ -5546 +5627 @@
 if test "X$g4lib_build_gdml" != "Xn"; then
 
-   if test "X$g4gdml_xercesc_root" = "X"; then
-      #probe for Xerces, using example from UI and Vis
-      xercesc_root=`find $g4gdml_xercesc_root /usr/include /usr/local/include \
-/opt/local/include /sw/include -type d -name xercesc 2>/dev/null | xargs echo`
-
-      #If we got something, strip off the include/xerces part
-      if test "X$xercesc_root" != "X"; then
-         g4gdml_xercesc_root=`dirname $xercesc_root`
-         g4gdml_xercesc_root=`dirname $g4gdml_xercesc_root`
-
-         echo "checking for XercesC install... $g4gdml_xercesc_root"
-     echo " "
-      else
-         g4gdml_xercesc_root=""
-         echo "checking for XercesC install... no"
-      fi
-   fi #END OF XERCES AUTOPROBE
-
-   #
-   # If the autoprobe failed, prompt the user to enter the path to the Xerces
-   # install
-   #
-   if test "X$g4gdml_xercesc_root" = "X"; then
-
-      promptend="no"
-      xercesloc="the standard locations"
+    # If g4system is WIN32-VC, we need to force the input of a search path
+    # though we can use with_xercesc_root as the dflt.
+    if test "X$g4system" = "XWIN32-VC" ; then
+        g4message=`cat << EOM
+You have requested GDML support for Geant4 built on WIN32-VC.
+This requires the Xerces-C library built for MSVC. 
+Please enter the path to the Xerces-C install (i.e. if XercesC is installed
+in PATH\include\xercesc, enter PATH), or type '-' to CANCEL the build of the 
+GDML module.
+XercesC path:
+EOM`
+        dflt=$with_xercesc_root
+        fn='d~(-)'
+            rp=$g4message
+            . ./getfile
+        with_xercesc_root=$ans
+        if test "X$with_xercesc_root" = "X-" ; then
+            g4lib_build_gdml=n
+            g4gdml_xercesc_root=""
+                echo "G4LIB_BUILD_GDML cancelled..."
+                    echo " "
+        fi
+    fi
+
+    # We now have a suitable platform independent setup for probing for the
+    # Xerces-C install....
+    if test "X$with_xercesc_root" != "X-"; then
+    if test "X$with_xercesc_root" != "X" ; then
+        # Probe for Xerces-C in the supplied directory
+        xercesc_root=`find $with_xercesc_root/include -type d -name xercesc 2>/dev/null | xargs echo`
+    else
+        # Probe for Xerces-C in standard locations
+        xercesc_root=`find /usr/include /usr/local/include /opt/local/include /sw/include -type d -name xercesc 2>/dev/null | xargs echo`
+    fi
+
+    # What did we find??
+    if test "X$xercesc_root" = "X" ; then
+        g4gdml_xercesc_root=""
+        echo "checking for XercesC install... no"
+    else
+        # We'll have PATH/include/xercesc if we found it
+        g4gdml_xercesc_root=`dirname $xercesc_root`
+        g4gdml_xercesc_root=`dirname $g4gdml_xercesc_root`
+        
+        echo "checking for XercesC install... $g4gdml_xercesc_root"
+    fi
+
+    # If we didn't find anything, fall back to the user...
+    if test "X$g4gdml_xercesc_root" = "X" ; then
+        promptend="no"
+        if test "X$with_xercesc_root" = "X" ; then
+            xercescloc="the standard locations"
+        else
+            xercescloc=$with_xercesc_root
+        fi
       
-      while test "$promptend" = "no"; do
-            g4message=`cat << EOM
-
-Autodetection failed to locate XercesC in $xercesloc on your system. 
+        while test "$promptend" = "no"; do
+                g4message=`cat << EOM
+
+Autodetection failed to locate XercesC in $xercescloc on your system. 
 Please enter the path to your XercesC install (i.e. if XercesC is installed
 in PATH/include/xercesc, enter PATH), or type '-' to CANCEL the build of the 
@@ -5583 +5693 @@
 EOM`
 
-            dflt=$g4gdml_xercesc_root
-            fn='d~(-)'
-            rp=$g4message
-            . ./getfile
-
-            #check for user cancellation
-            if test "X$ans" = "X-"; then
-               g4lib_build_gdml=n
-               g4gdml_xercesc_root=""
-               echo "G4LIB_BUILD_GDML cancelled..."
-                   echo " "
-               promptend=yes
-            else
-               if test -r "$ans/include/xercesc"; then
-                  g4gdml_xercesc_root=$ans
-                  echo "checking for XercesC install... $g4gdml_xercesc_root"
-                  echo " "
-                  promptend=yes
-               else
-                  xercesloc=$ans
-                  echo "checking for Xercesc install... no"
-               fi
+                dflt=$g4gdml_xercesc_root
+                fn='d~(-)'
+                rp=$g4message
+                . ./getfile
+
+                #check for user cancellation
+                if test "X$ans" = "X-"; then
+                    g4lib_build_gdml=n
+                    g4gdml_xercesc_root=""
+                    echo "G4LIB_BUILD_GDML cancelled..."
+                        echo " "
+                    promptend=yes
+                else
+                    if test -r "$ans/include/xercesc"; then
+                            g4gdml_xercesc_root=$ans
+                            echo "checking for XercesC install... $g4gdml_xercesc_root"
+                            echo " "
+                            promptend=yes
+                    else
+                        xercesloc=$ans
+                        echo "checking for Xercesc install... no"
+                    fi
             fi #END OF USER INPUT CHECKING
-      done #END OF WHILE LOOP OVER USER INPUT
-   fi #END OF USER INPUT SECTION
-
-   #
-   # If a filter on g4gdml_xerces_root is needed to remove common system paths
-   # then it should be put here...
-   #
-        if test "x$g4gdml_xercesc_root" = "x/usr" -o "x$g4gdml_xercesc_root" = "x/usr/local" ; then
-                g4gdml_xercesc_root=""
+        done #END OF WHILE LOOP OVER USER INPUT
+    fi #END OF USER INPUT SECTION
+
+    #
+    # If a filter on g4gdml_xerces_root is needed to remove common system paths
+    # then it should be put here...
+    #
+    if test "x$g4gdml_xercesc_root" = "x/usr" -o "x$g4gdml_xercesc_root" = "x/usr/local" ; then
+        g4gdml_xercesc_root=""
         fi
-
+    fi # End outer check of WIN32-VC module cancellation
 fi #END XERCES PROBE
 
@@ -5794 +5904 @@
 g4make='$g4make'
 g4neutronhpcrosssections='$g4neutronhpcrosssections'
+g4neutronxsdata='$g4neutronxsdata'
 g4osname='$g4osname'
 g4radioactivedata='$g4radioactivedata'