|
18 | 18 | # you may fetch it yourself from your nearest archive site.)
|
19 | 19 | #
|
20 | 20 |
|
21 |
| -# $Id: Configure,v 1.126.2.1 2010/03/18 09:59:14 gcosmo Exp $ |
| 21 | +# $Id: Configure,v 1.126.2.2 2010/09/08 13:40:22 gcosmo Exp $ |
22 | 22 | #
|
23 |
| -# Generated on Thu Mar 11 15:55:53 GMT 2010 [metaconfig 3.0 PL70] |
| 23 | +# Generated on Thu Jun 24 16:21:02 BST 2010 [metaconfig 3.0 PL70] |
24 | 24 |
|
25 | 25 | cat >/tmp/c1$$ <<EOF
|
26 | 26 | WARNING!!!!!
|
@@ -2524,7 +2524,7 @@ if test "x\$g4_qt_is_configured" = "x" ; then
|
2524 | 2524 | # will have a lib64 dir even on an i*86 machine...
|
2525 | 2525 | # We don't ever cross-compile Geant4, so must have the native libraries.
|
2526 | 2526 | # Double check for this craziness...
|
2527 |
| - case `uname -m` in |
| 2527 | + case "`uname -m`" in |
2528 | 2528 | i*86)
|
2529 | 2529 | g4_qt_lib_dir=\$g4_qt_dir/lib
|
2530 | 2530 | ;;
|
@@ -3470,11 +3470,11 @@ EOM`
|
3470 | 3470 | g4data_customize="yes"
|
3471 | 3471 |
|
3472 | 3472 | g4levelgammadata="$g4data/$g4data_photonevaporation_version"
|
3473 |
| - g4radioactivedata="$g4data/$g4data_radioactivedecay_version" |
3474 |
| - g4ledata="$g4data/$g4data_g4emlow_version" |
3475 |
| - g4neutronhpcrosssections="$g4data/$g4data_g4ndl_version" |
3476 |
| - g4abladata="$g4data/$g4data_g4abla_version" |
3477 |
| - g4realsurfacedata="$g4data/$g4data_realsurface_version" |
| 3473 | + g4radioactivedata="$g4data/$g4data_radioactivedecay_version" |
| 3474 | + g4ledata="$g4data/$g4data_g4emlow_version" |
| 3475 | + g4neutronhpcrosssections="$g4data/$g4data_g4ndl_version" |
| 3476 | + g4abladata="$g4data/$g4data_g4abla_version" |
| 3477 | + g4realsurfacedata="$g4data/$g4data_realsurface_version" |
3478 | 3478 |
|
3479 | 3479 | else
|
3480 | 3480 | #try again
|
|
3620 | 3620 |
|
3621 | 3621 | # Now see if make/gmake are GNU make.
|
3622 | 3622 | if test "x$g4_make_loc" != "xno" ; then
|
3623 |
| - g4_make_version=`$g4_make_loc -v 2>/dev/null` |
| 3623 | + g4_make_version=`$g4_make_loc -v 2>/dev/null | sed s"/'//"` |
3624 | 3624 |
|
3625 | 3625 | case $g4_make_version in
|
3626 | 3626 | GNU*)
|
|
3635 | 3635 |
|
3636 | 3636 | if test "x$g4osname" != "xWIN32" ; then
|
3637 | 3637 | if test "x$g4_gmake_loc" != "xno" ; then
|
3638 |
| - g4_gmake_version=`$g4_gmake_loc -v 2>/dev/null` |
| 3638 | + g4_gmake_version=`$g4_gmake_loc -v 2>/dev/null | sed s"/'//"` |
3639 | 3639 |
|
3640 | 3640 | case $g4_gmake_version in
|
3641 | 3641 | GNU*)
|
@@ -3674,7 +3674,7 @@ EOM`
|
3674 | 3674 | gans=$ans
|
3675 | 3675 |
|
3676 | 3676 | #Check if this is GNU make...
|
3677 |
| - g4_user_make_version=`$gans -v 2>/dev/null` |
| 3677 | + g4_user_make_version=`$gans -v 2>/dev/null | sed s"/'//"` |
3678 | 3678 |
|
3679 | 3679 | case $g4_user_make_version in
|
3680 | 3680 | "GNU Make"*)
|
@@ -5596,77 +5596,106 @@ esac
|
5596 | 5596 | #
|
5597 | 5597 | if test "X$g4lib_build_gdml" != "Xn"; then
|
5598 | 5598 |
|
5599 |
| - if test "X$g4gdml_xercesc_root" = "X"; then |
5600 |
| - #probe for Xerces, using example from UI and Vis |
5601 |
| - xercesc_root=`find $g4gdml_xercesc_root /usr/include /usr/local/include \ |
5602 |
| -/opt/local/include /sw/include -type d -name xercesc 2>/dev/null | xargs echo` |
5603 |
| -
|
5604 |
| - #If we got something, strip off the include/xerces part |
5605 |
| - if test "X$xercesc_root" != "X"; then |
5606 |
| - g4gdml_xercesc_root=`dirname $xercesc_root` |
5607 |
| - g4gdml_xercesc_root=`dirname $g4gdml_xercesc_root` |
5608 |
| -
|
5609 |
| - echo "checking for XercesC install... $g4gdml_xercesc_root" |
5610 |
| - echo " " |
5611 |
| - else |
5612 |
| - g4gdml_xercesc_root="" |
5613 |
| - echo "checking for XercesC install... no" |
5614 |
| - fi |
5615 |
| - fi #END OF XERCES AUTOPROBE |
5616 |
| -
|
5617 |
| - # |
5618 |
| - # If the autoprobe failed, prompt the user to enter the path to the Xerces |
5619 |
| - # install |
5620 |
| - # |
5621 |
| - if test "X$g4gdml_xercesc_root" = "X"; then |
5622 |
| -
|
5623 |
| - promptend="no" |
5624 |
| - xercesloc="the standard locations" |
| 5599 | + # If g4system is WIN32-VC, we need to force the input of a search path |
| 5600 | + # though we can use with_xercesc_root as the dflt. |
| 5601 | + if test "X$g4system" = "XWIN32-VC" ; then |
| 5602 | + g4message=`cat << EOM |
| 5603 | +You have requested GDML support for Geant4 built on WIN32-VC. |
| 5604 | +This requires the Xerces-C library built for MSVC. |
| 5605 | +Please enter the path to the Xerces-C install (i.e. if XercesC is installed |
| 5606 | +in PATH\include\xercesc, enter PATH), or type '-' to CANCEL the build of the |
| 5607 | +GDML module. |
| 5608 | +XercesC path: |
| 5609 | +EOM` |
| 5610 | + dflt=$with_xercesc_root |
| 5611 | + fn='d~(-)' |
| 5612 | + rp=$g4message |
| 5613 | + . ./getfile |
| 5614 | + with_xercesc_root=$ans |
| 5615 | + if test "X$with_xercesc_root" = "X-" ; then |
| 5616 | + g4lib_build_gdml=n |
| 5617 | + g4gdml_xercesc_root="" |
| 5618 | + echo "G4LIB_BUILD_GDML cancelled..." |
| 5619 | + echo " " |
| 5620 | + fi |
| 5621 | + fi |
| 5622 | +
|
| 5623 | + # We now have a suitable platform independent setup for probing for the |
| 5624 | + # Xerces-C install.... |
| 5625 | + if test "X$with_xercesc_root" != "X-"; then |
| 5626 | + if test "X$with_xercesc_root" != "X" ; then |
| 5627 | + # Probe for Xerces-C in the supplied directory |
| 5628 | + xercesc_root=`find $with_xercesc_root/include -type d -name xercesc 2>/dev/null | xargs echo` |
| 5629 | + else |
| 5630 | + # Probe for Xerces-C in standard locations |
| 5631 | + xercesc_root=`find /usr/include /usr/local/include /opt/local/include /sw/include -type d -name xercesc 2>/dev/null | xargs echo` |
| 5632 | + fi |
| 5633 | +
|
| 5634 | + # What did we find?? |
| 5635 | + if test "X$xercesc_root" = "X" ; then |
| 5636 | + g4gdml_xercesc_root="" |
| 5637 | + echo "checking for XercesC install... no" |
| 5638 | + else |
| 5639 | + # We'll have PATH/include/xercesc if we found it |
| 5640 | + g4gdml_xercesc_root=`dirname $xercesc_root` |
| 5641 | + g4gdml_xercesc_root=`dirname $g4gdml_xercesc_root` |
| 5642 | + |
| 5643 | + echo "checking for XercesC install... $g4gdml_xercesc_root" |
| 5644 | + fi |
| 5645 | +
|
| 5646 | + # If we didn't find anything, fall back to the user... |
| 5647 | + if test "X$g4gdml_xercesc_root" = "X" ; then |
| 5648 | + promptend="no" |
| 5649 | + if test "X$with_xercesc_root" = "X" ; then |
| 5650 | + xercescloc="the standard locations" |
| 5651 | + else |
| 5652 | + xercescloc=$with_xercesc_root |
| 5653 | + fi |
5625 | 5654 |
|
5626 |
| - while test "$promptend" = "no"; do |
5627 |
| - g4message=`cat << EOM |
| 5655 | + while test "$promptend" = "no"; do |
| 5656 | + g4message=`cat << EOM |
5628 | 5657 |
|
5629 |
| -Autodetection failed to locate XercesC in $xercesloc on your system. |
| 5658 | +Autodetection failed to locate XercesC in $xercescloc on your system. |
5630 | 5659 | Please enter the path to your XercesC install (i.e. if XercesC is installed
|
5631 | 5660 | in PATH/include/xercesc, enter PATH), or type '-' to CANCEL the build of the
|
5632 | 5661 | GDML module.
|
5633 | 5662 | XercesC path:
|
5634 | 5663 | EOM`
|
5635 | 5664 |
|
5636 |
| - dflt=$g4gdml_xercesc_root |
5637 |
| - fn='d~(-)' |
5638 |
| - rp=$g4message |
5639 |
| - . ./getfile |
5640 |
| -
|
5641 |
| - #check for user cancellation |
5642 |
| - if test "X$ans" = "X-"; then |
5643 |
| - g4lib_build_gdml=n |
5644 |
| - g4gdml_xercesc_root="" |
5645 |
| - echo "G4LIB_BUILD_GDML cancelled..." |
5646 |
| - echo " " |
5647 |
| - promptend=yes |
5648 |
| - else |
5649 |
| - if test -r "$ans/include/xercesc"; then |
5650 |
| - g4gdml_xercesc_root=$ans |
5651 |
| - echo "checking for XercesC install... $g4gdml_xercesc_root" |
5652 |
| - echo " " |
5653 |
| - promptend=yes |
5654 |
| - else |
5655 |
| - xercesloc=$ans |
5656 |
| - echo "checking for Xercesc install... no" |
5657 |
| - fi |
| 5665 | + dflt=$g4gdml_xercesc_root |
| 5666 | + fn='d~(-)' |
| 5667 | + rp=$g4message |
| 5668 | + . ./getfile |
| 5669 | +
|
| 5670 | + #check for user cancellation |
| 5671 | + if test "X$ans" = "X-"; then |
| 5672 | + g4lib_build_gdml=n |
| 5673 | + g4gdml_xercesc_root="" |
| 5674 | + echo "G4LIB_BUILD_GDML cancelled..." |
| 5675 | + echo " " |
| 5676 | + promptend=yes |
| 5677 | + else |
| 5678 | + if test -r "$ans/include/xercesc"; then |
| 5679 | + g4gdml_xercesc_root=$ans |
| 5680 | + echo "checking for XercesC install... $g4gdml_xercesc_root" |
| 5681 | + echo " " |
| 5682 | + promptend=yes |
| 5683 | + else |
| 5684 | + xercesloc=$ans |
| 5685 | + echo "checking for Xercesc install... no" |
| 5686 | + fi |
5658 | 5687 | fi #END OF USER INPUT CHECKING
|
5659 |
| - done #END OF WHILE LOOP OVER USER INPUT |
5660 |
| - fi #END OF USER INPUT SECTION |
5661 |
| -
|
5662 |
| - # |
5663 |
| - # If a filter on g4gdml_xerces_root is needed to remove common system paths |
5664 |
| - # then it should be put here... |
5665 |
| - # |
5666 |
| - if test "x$g4gdml_xercesc_root" = "x/usr" -o "x$g4gdml_xercesc_root" = "x/usr/local" ; then |
5667 |
| - g4gdml_xercesc_root="" |
5668 |
| - fi |
| 5688 | + done #END OF WHILE LOOP OVER USER INPUT |
| 5689 | + fi #END OF USER INPUT SECTION |
5669 | 5690 |
|
| 5691 | + # |
| 5692 | + # If a filter on g4gdml_xerces_root is needed to remove common system paths |
| 5693 | + # then it should be put here... |
| 5694 | + # |
| 5695 | + if test "x$g4gdml_xercesc_root" = "x/usr" -o "x$g4gdml_xercesc_root" = "x/usr/local" ; then |
| 5696 | + g4gdml_xercesc_root="" |
| 5697 | + fi |
| 5698 | + fi # End outer check of WIN32-VC module cancellation |
5670 | 5699 | fi #END XERCES PROBE
|
5671 | 5700 |
|
5672 | 5701 | #END OF GDML/XERCES PROBE
|
|
0 commit comments