Changeset 884 for trunk/Configure

Timestamp:

Nov 14, 2008, 5:29:15 PM (16 years ago)

Author:

garnier

Message:

new version from Ben

File:

• trunk/Configure (modified) (9 diffs)

trunk/Configure

@@ -19 +19 @@
 #
 
-# $Id: Configure,v 1.104 2008/07/03 14:17:16 bmorgan Exp $
+# $Id: Configure,v 1.107 2008/11/14 15:14:46 bmorgan Exp $
 #
-# Generated on Thu Jul  3 14:50:17 BST 2008 [metaconfig 3.0 PL70]
+# Generated on Fri Nov 14 15:14:32 GMT 2008 [metaconfig 3.0 PL70]
 
 cat >/tmp/c1$$ <<EOF
@@ -143 +143 @@
 osname=''
 osvers=''
+g4_qt_cxxflags=''
+g4_qt_gl_cxxflags=''
+g4_qt_gl_libs=''
+g4_qt_libs=''
+g4_qt_moc=''
+g4_qt_version=''
 Author=''
 Date=''
@@ -206 +212 @@
 g4vis_xmhome=''
 g4vis_xmlibs=''
-g4_qtmochome=''
-g4_qtincdir=''
-g4_qtlibdir=''
 g4ui_build_qt_session=''
 g4ui_use_qt=''
@@ -291 +294 @@
 g4ui_build_qt_session='n'
 g4ui_use_qt='n'
-g4_qtmochome=''
-g4_qtincdir=''
-g4_qtlibdir=''
+g4_qthome=''
 #END QT UI OPTIONS
 #INITIALIZE QT UI OPTIONS
 g4ui_build_qt_session='n'
 g4ui_use_qt='n'
-g4_qtmochome=''
-g4_qtincdir=''
-g4_qtlibdir=''
 #END QT UI OPTIONS
 #INITIALIZE QT VIS DRIVER OPTIONS
 g4vis_build_openglqt_driver='n'
-g4ui_use_openglqt='n'
+g4vis_use_openglqt='n'
 #END QT VIS DRIVER OPTIONS
 
@@ -483 +481 @@
 override=''
 knowitall=''
-echo "*********"
-echo `pwd`
-echo "*********"
 rm -f optdef.sh
 cat >optdef.sh <<EOS
@@ -2236 +2231 @@
 esac
 
+cat <<EOSC >qt
+$startsh
+#
+# Autoconf(ish) style check for Qt headers, libraries and moc application
+#
+
+#
+# These are variables that the final unit generated script may use
+#
+with_qt_dir="\$qt_search_dir"
+
+#
+# Only run if we haven't succesfully found Qt already
+#
+if test "x\$g4_qt_is_configured" = "x" ; then
+    #
+    # Flag specifying if we've configured Qt o.k.
+    #
+    g4_qt_is_configured="yes" # Optimism
+
+    # Flag to be set if any part of configuration fails
+    g4_havegoodqt="yes" # Optimism
+
+    # Qt4 flag
+    g4_is_qt4="no"
+
+    # Variables to be set
+    g4_qt_include_dir=''
+    g4_qt_lib_dir=''
+    g4_qt_moc=''
+
+    g4_qt_version=''
+    g4_qt_cxxflags=''
+    g4_qt_gl_cxxflags=''
+    g4_qt_libs=''
+    g4_qt_gl_libs=''
+
+    #
+    # User may supply a value for 'QTDIR' and in that case we ASSUME a
+    # Trolltech style installation or a Mac Framework
+    #
+    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
+                                        \$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"
+
+        # Check for qglobal.h
+        g4_qglobal_loc=\`./loc qglobal.h no \$g4_qt_possible_qt_include_dirs\`
+
+        if test "x\$g4_qglobal_loc" = "xno" ; then
+            g4_havegoodqt=no
+            g4_qt_include_dir=no
+        fi
+        echo "checking for qglobal.h... \$g4_qglobal_loc"
+
+        if test "x\$g4_qglobal_loc" != "xno" ; then
+            g4_qt_include_dir="\`dirname \$g4_qglobal_loc\`"
+        fi
+
+    else
+        # We use standard search paths...
+        qt_direct_test_header="qglobal.h"
+
+        g4_qt_include_path_list="
+            \`ls -dr /Library/Frameworks/QtCore.framework/Headers 2>/dev/null\` 
+            \`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 /opt/qt*/include/QtCore 2>/dev/null\` 
+            \`ls -dr /usr/qt*/include/QtCore 2>/dev/null\`
+            \`ls -dr /usr/qt/*/include/QtCore 2>/dev/null\` 
+            \`ls -dr /usr/include/qt/*/QtCore 2>/dev/null\`
+            \`ls -dr /sw/include/QtCore 2>/dev/null\`
+            \`ls -dr /sw/qt*/include/QtCore 2>/dev/null\`
+            \`ls -dr /sw/qt/*/include/QtCore 2>/dev/null\`
+            /usr/include
+            \`ls -dr /usr/include/qt* 2>/dev/null\`
+            \`ls -dr /opt/qt*/include 2>/dev/null\` 
+            \`ls -dr /usr/qt*/include 2>/dev/null\`
+            \`ls -dr /usr/qt/*/include 2>/dev/null\` 
+            \`ls -dr /usr/include/qt/* 2>/dev/null\`
+            \`ls -dr /sw/include 2>/dev/null\`
+            \`ls -dr /sw/qt*/include 2>/dev/null\`
+            \`ls -dr /sw/qt/*/include 2>/dev/null\`
+            /usr/include/Qt
+            \`ls -dr /usr/include/qt*/Qt 2>/dev/null\` 
+            \`ls -dr /opt/qt*/include/Qt 2>/dev/null\` 
+            \`ls -dr /usr/qt*/include/Qt 2>/dev/null\`
+            \`ls -dr /usr/qt/*/include/Qt 2>/dev/null\` 
+            \`ls -dr /usr/include/qt/*/Qt 2>/dev/null\`
+            \`ls -dr /sw/include/Qt 2>/dev/null\`
+            \`ls -dr /sw/qt*/include/Qt 2>/dev/null\`
+            \`ls -dr /sw/qt/*/include/Qt 2>/dev/null\`
+        "
+
+        # Find ALL installed versions of qglobal.h
+        for g4_qt_dir in \$g4_qt_include_path_list ; do
+            if test -r "\$g4_qt_dir/\$qt_direct_test_header" ; then
+                g4_qt_found_dirs="\$g4_qt_found_dirs \$g4_qt_dir"
+            fi
+        done
+
+        # Which one relates to the newest Qt?
+        g4_qt_prev_ver=0
+        for g4_qt_dir in \$g4_qt_found_dirs ; do
+            g4_qt_this_ver=\`grep -w '#define QT_VERSION' \$g4_qt_dir/\$qt_direct_test_header | sed s/'#define QT_VERSION'//\`
+
+            if expr \$g4_qt_this_ver '>' \$g4_qt_prev_ver > /dev/null ; then
+                g4_qt_include_dir=\$g4_qt_dir
+                g4_qt_prev_ver=\$g4_qt_this_ver
+            fi
+        done
+
+        if test "x\$g4_qt_include_dir" = "x" ; then
+            g4_qt_include_dir=no
+            g4_havegoodqt=no
+        fi
+
+        echo "checking for qglobal.h... \$g4_qt_include_dir/qglobal.h"
+    fi # END TEST with_qt_dir is set
+
+    #
+    # Result of above tests should have given us g4_qt_include_dir
+    # We can now use this to check other things, taking care to deal with the
+    # correct paths...
+    #
+
+    # 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
+        fi
+    else
+        # Probably have Unix-style installation, in which case estimated
+        # 'QTDIR' equivalent is $with_qt_dir if supplied, or directory
+        # one level below the 'include' directory in \$g4_qt_include_dir
+        if test "x\$with_qt_dir" = "x" ; then
+            # We need to strip g4_qt_include_dir, if it was found
+            g4_qt_dir=\$g4_qt_include_dir
+
+            # Only do this IF there's an 'include' in the path name!
+            if test "x\`echo \$g4_qt_dir | grep include\`" != "x" ; then
+                while test "x\`basename \$g4_qt_dir\`" != "xinclude" ;
+                do
+                    g4_qt_dir=\`dirname \$g4_qt_dir\`
+                done
+            fi
+
+            #Now should be one level above equivalent QTDIR
+            g4_qt_dir=\`dirname \$g4_qt_dir\`
+        fi
+
+        # At this point, we need get Qt version of detected qglobal.h because
+        # Qt3/4 libraries MAY be installed alongside each other...
+        qt_direct_test_header=qglobal.h
+        g4_qt_major_ver=\`grep QT_VERSION_STR \$g4_qt_include_dir/\$qt_direct_test_header 2>/dev/null | sed 's/.* \"\([0-9]\)\..*\"/\1/'\`
+
+        #
+        # We might have an odd install where our found qglobal.h #includes
+        # the real qglobal...
+        #
+        if test "x\$g4_qt_major_ver" = "x" ; then
+            # check for a #include of qglobal...
+            possible_actual_qglobal=\`grep '#include.*qglobal' \$g4_qt_include_dir/\$qt_direct_test_header 2>/dev/null\`
+
+            if test "x\$possible_actual_qglobal" != "x" ; then
+                #We did get something, and it's likely the include
+                #will give us a relative path (but an ASSUMPTION at present)
+                relative_path_to_qglobal=\`grep '#include.*qglobal' \$g4_qt_include_dir/\$qt_direct_test_header 2>/dev/null | sed 's/.*\"\(.*\)\"/\1/'\`
+
+                if test -r \$g4_qt_include_dir/\$relative_path_to_qglobal ; then
+                    g4_qt_major_ver=\`grep QT_VERSION_STR \$g4_qt_include_dir/\$relative_path_to_qglobal 2>/dev/null | sed 's/.* \"\([0-9]\)\..*\"/\1/'\`
+                else
+                    g4_qt_major_ver=no
+                    g4_havegoodqt=no
+                fi
+            else
+                g4_qt_major_ver=no
+                g4_havegoodqt=no
+            fi
+        fi #END TEST odd qglobal includes qglobal behaviour
+            
+        if test "x\$g4_qt_major_ver" = "x4" ; then
+            g4_is_qt4=yes
+        else
+            g4_is_qt4=no
+        fi
+        echo "checking Qt major version... \$g4_qt_major_ver"
+
+        #
+        # We also need to check for Qt4 installations with QtCore type
+        # directory structures. That being the case, make sure we have
+        # the extra headers..
+        #
+        if test "x\`basename \$g4_qt_include_dir\`" = "xQtCore" ; then
+            g4_qt_extra_headers=""
+            g4_qt_gl_headers=""
+            g4_qt_extra_packages="QtGui"
+            g4_qt_gl_packages="QtOpenGL"
+
+            for i in \$g4_qt_extra_packages ; do
+                if test -d "\`dirname \$g4_qt_include_dir\`/\$i" ; then
+                    echo "checking for \$i headers... yes"
+                    g4_qt_extra_headers="\$g4_qt_extra_headers \`dirname \$g4_qt_include_dir\`/\$i"
+                else
+                    echo "checking for \$i headers... no"
+                    g4_havegoodqt=no
+                fi
+            done
+
+            for i in \$g4_qt_gl_packages ; do
+                if test -d "\`dirname \$g4_qt_include_dir\`/\$i" ; then
+                    echo "checking for \$i headers... yes"
+                    g4_qt_gl_headers="\$g4_qt_gl_headers \`dirname \$g4_qt_include_dir\`/\$i"
+                else
+                    echo "checking for \$i headers... no"
+                    g4_havegoodqt=no
+                fi
+            done
+
+        fi #END TEST QtCore style install
+
+
+        #
+        # Now check for appropriate library...
+        #
+        if test -d "\$g4_qt_dir/lib64" ; then
+            g4_qt_lib_dir=\$g4_qt_dir/lib64
+        else
+            g4_qt_lib_dir=\$g4_qt_dir/lib
+        fi
+
+        if test "x\$g4_is_qt4" = "xyes" ; then
+            g4_qt_lib="\`ls \$g4_qt_lib_dir/libQtCore* 2> /dev/null | sed -n 1p |
+                    sed s@\$g4_qt_lib_dir/lib@@ | sed s@[.].*@@\`"
+
+            if test "x\$g4_qt_lib" = "x" ; then
+                # We might be on Windows...
+                g4_qt_lib="\`ls \$g4_qt_lib_dir/QtCore4.lib 2> /dev/null | sed -n 1p | sed s@\$g4_qt_lib_dir/@@\`"
+            fi
+
+            if test "x\$g4_qt_lib" != "x" ; then
+                echo "checking for QtCore library... \$g4_qt_lib"
+            else
+                echo "checking for QtCore library... no"
+                g4_havegoodqt=no
+            fi
+        else
+            g4_qt_lib="\`ls \$g4_qt_lib_dir/libqt-mt.* \$g4_qt_lib_dir/libqt.* 2> /dev/null | sed -n 1p | sed s@\$g4_qt_lib_dir/lib@@ | sed s@[.].*@@\`"
+
+            if test "x\$g4_qt_lib" != "x" ; then
+                echo "checking for qt-mt or qt library... \$g4_qt_lib"
+
+                # On Darwin we also need libqui for Qt3
+                if test "x\$osname" = "xdarwin" ; then
+                    g4_qt_lib_qui="\`ls \$g4_qt_lib_dir/libqui.* 2> /dev/null | 
+                                    sed -n 1p | sed s@\$g4_qt_lib_dir/lib@@ | 
+                                    sed s@[.].*@@\`"
+                    if test "x\$g4_qt_lib_qui" != "x" ; then
+                        echo "checking for qui library... yes"
+                    else
+                        echo "checking for qui library... no"
+                        g4_havegoodqt=no
+                    fi
+                fi
+            else
+                echo "checking for qt-mt or qt library... no"
+                g4_havegoodqt=no
+            fi
+        fi #END TEST for Qt4/3 libraries
+
+        #
+        # Finally, we need to search for moc
+        #
+        g4_qt_bin_dir=\$g4_qt_dir/bin
+        g4_qtmoc=no
+        if test -x "\$g4_qt_bin_dir/moc" ; then
+           g4_qtmoc="\$g4_qt_bin_dir/moc"
+        elif test -x "\$g4_qt_bin_dir/moc-qt4" ; then
+           g4_qtmoc="\$g4_qt_bin_dir/moc-qt4"
+        elif test -x "\$g4_qt_bin_dir/qt4-moc" ; then
+           g4_qtmoc="\$g4_qt_bin_dir/qt4-moc"
+        else
+            g4_havegoodqt=no
+        fi
+        echo "checking for moc... \$g4_qtmoc"
+
+        ## THIS IS POINT AT WHICH TO DO FALLBACK TESTS I.E DOES
+        ## COMPILATION OF SMALL TEST PROGRAM WORK - THEN HEADERS AND
+        ## LIBS ARE AUTOMATICALLY FOUND BY LINKER
+
+        #
+        ## Finally, set output variables, raw for now
+        #
+        if test "x\$g4_havegoodqt" = "xyes" ; then
+            g4_qt_version=\$g4_qt_major_ver
+            
+            # Take care of Qt4 style header structure...
+            if test "x\`basename \$g4_qt_include_dir\`" = "xQtCore"; then
+                g4_qt_cxxflags="-I\`dirname \$g4_qt_include_dir\` -I\$g4_qt_include_dir"
+            else
+                g4_qt_cxxflags="-I\$g4_qt_include_dir"
+            fi
+            if test "x\$g4_is_qt4" = "xyes" ; then
+                for i in \$g4_qt_extra_headers ; do
+                    g4_qt_cxxflags="\$g4_qt_cxxflags -I\$i"
+                done
+                for i in \$g4_qt_gl_headers ; do
+                    g4_qt_gl_cxxflags="\$g4_qt_gl_cxxflags -I\$i"
+                done
+            fi
+
+            g4_qt_libs="-L\$g4_qt_lib_dir"
+            if test "x\$g4_qt_lib" = "xQtCore4.lib" ; then
+                #We have Windows...
+                g4_qt_libs="\$g4_qt_libs QtCore4.lib QtGui4.lib"
+                g4_qt_gl_libs="QtOpenGL4.lib"
+            else
+                g4_qt_libs="\$g4_qt_libs -l\$g4_qt_lib"
+                if test "x\$g4_is_qt4" = "xyes" ; then
+                    g4_qt_libs="\$g4_qt_libs -lQtGui"
+                    g4_qt_gl_libs="-lQtOpenGL"
+                fi
+            fi
+            if test "x\$g4_qt_lib_qui" != "x" ; then
+                g4_qt_libs="\$g4_qt_libs -lqui"
+            fi
+
+
+            g4_qt_moc=\$g4_qtmoc
+
+            g4_qt_is_configured=yes
+        else
+            g4_qt_is_configured=''
+        fi
+    fi #END TEST for Darwin Framework
+
+else
+    #Probably also want flags here to reset variables if requested
+    echo "configure: Qt already configured, no recheck neccessary"
+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
 case "$d_portable" in
@@ -4309 +4678 @@
 #
 
-#
-# We only perform the query/probe for Linux-g++ and Darwin-g++ systems..
-#
-#if test "x$g4system" = "xLinux-g++" -o "x$g4system" = "xDarwin-g++" ; then
-
-# Now, IF g4ui_none HAS NOT BEEN SET TO Y, proceed to the query/probe section
+# Checks applied for all systems ONLY IF g4ui_none HAS NOT BEEN SET TO y
 if test "x$g4ui_none" = "xn" ; then
-
-   # Query the user to see if they want to build the Qt UI module
-
-   g4message=`cat << EOM
-
-   G4UI_BUILD_QT_SESSION
-   G4UI_USE_QT
+    # Query the user to see if build of Qt UI module is needed
+    g4message=`cat <<EOM
+
+    G4UI_BUILD_QT_SESSION
+    G4UI_USE_QT
 
 Setting these variables will enable the building of the G4 Qt based 
 user interface module and the use of this module in your applications
 respectively.
-The Qt headers, libraries and binaries are required to enable the
-building of this module.
+The Qt3 or Qt4 headers, libraries and moc application are required to enable
+the building of this module.
 Do you want to enable build and use of this module?
 EOM`
 
-   #
-   # read in the user response
-   #
-   dflt=$g4ui_build_qt_session
-   rp=$g4message
-   . ./myread
-   gans=$ans
-
-   #
-   # Check response
-   #
-   case $gans in
-        n*|N*)
-                g4ui_build_qt_session=n
-                g4ui_use_qt=n
-                ;;
+    # Read in the user response
+    dflt=$g4ui_build_qt_session
+    rp=$g4message
+    . ./myread
+    gans=$ans
+
+    # Check response and take set variables as needed.
+    case $gans in
+        n*|N*)
+            g4ui_build_qt_session=n
+            g4ui_use_qt=n
+            ;;
         y*|Y*)
-                g4ui_build_qt_session=y
-                g4ui_use_qt=y
-                ;;
-   esac
-
-
-   #########################################
-
-
-   #####################################################################
-   # Now, if we want to build/use the Qt UI module, we need to probe for
-   # a Qt4 installation
-   #
-   if test "x$g4ui_build_qt_session" = "xy" ; then
-       
-       echo " "
-       g4_havegoodqt=no
-       
-      # Look for qt4 moc
-       g4_qtmochome=`./loc moc no $QTDIR/bin     /usr/lib/qt4/bin     /usr/lib/qt/bin     /usr/local/qt/bin     /usr/local/bin     /usr/bin      /bin            /usr/share/qt4/bin     /usr/X11R6/bin     /sw/bin`
-       if test "x$g4_qtmochome" = "xno" ; then
-        # Look for qt3 moc
-           g4_qtmochome=`./loc moc no /usr/lib/qt3/bin     /usr/share/qt3/bin`
-       fi
-       
-      # if not found
-       if test "x$g4_qtmochome" != "xno" ; then
-           echo "checking Qt moc tool in... $g4_qtmochome"
-          # check Qt version
-           g4_qtver=`$g4_qtmochome 2>&1 -v | $sed 's/.* .Qt \([0-9]\)\..*/\1/' `
-           echo "checking Qt version... $g4_qtver"
-           if test "x$g4_qtver" = "x3" || test "x$g4_qtver" = "x4" ;then
-               
-              # checking includes first get QTDIR location, then qt$g4_qtver, sw, standard, shared, X11
-               
-               incQtFiles=" $QTDIR/include /usr/include/qt$g4_qtver /usr/include/qt$g4_qtver/Qt  /usr/lib/qt$g4_qtver/include /sw/include/qt /usr/lib/qt/include /usr/local/qt/include /usr/local/include /usr/include  /usr/include/qt /usr/share/qt$g4_qtver/include /usr/X11R6/include /usr/X11R6/include/qt$g4_qtver  /usr/X11R6/include/qt" 
-               
-               if test "X$g4osname" = "XDarwin" && test "X$g4_qtver" = "X4"; then
-                   incQtFiles="$incQtFiles /Library/Frameworks/QtCore.framework/Headers/"
-                   g4_qtincdir=`./loc qglobal.h no $incQtFiles`
-                   if test "x$g4_qtincdir" != "xno" ; then
-                       g4_qtincdir="/Library/Frameworks"
-                   fi
-               else
-                   g4_qtincdir=`./loc qglobal.h no $incQtFiles`
-               fi
-               
-               
-               if test "x$g4_qtincdir" != "xno" ; then
-                   if test "x$g4_qtincdir" != "x/Library/Frameworks" ; then
-                       g4_qtincdir=`dirname $g4_qtincdir`
-                   fi
-                   echo "checking Qt includes dir in... $g4_qtincdir"
-                   
-                   
-                  # checking libs, includes first get QTDIR location, then qt$g4_qtver, sw, standard, shared, X11
-                   
-                   libQtFiles="$QTDIR/lib     $QTDIR/lib64     /usr/lib/qt$g4_qtver/lib      /usr/lib/qt$g4_qtver/lib64     /usr/lib/qt$g4_qtver     /usr/lib/qt$g4_qtver        /sw/lib  /sw/lib/qt   /sw/lib/qt$g4_qtver    /sw/lib/qt$g4_qtver/lib         /usr/lib/qt/lib     /usr/local/qt/lib     /usr/local/lib     /usr/lib      /usr/lib/qt   /usr/share/qt$g4_qtver/lib      /usr/X11R6/lib/qt     /usr/X11R6/lib/qt$g4_qtver     /usr/X11R6/lib  /usr/X11R6/lib/qt"
-                   
-                   if test "X$g4osname" = "XDarwin" && test "X$g4_qtincdir" = "X/Library/Frameworks" ; then
-                       g4_qtlibdir=`./loc QtCore no  /Library/Frameworks/QtCore.framework/Versions/$g4_qtver/ $libQtFiles`
-                       g4_qtlibdir=`dirname $g4_qtlibdir`
-                       g4_qtlibdir=`dirname $g4_qtlibdir`
-                       g4_qtlibdir=`dirname $g4_qtlibdir`
-                   else
-                       g4_qtlibdir=`./loc libqt* no $libQtFiles`
-                   fi
-                   if test "x$g4_qtlibdir" != "xno" ; then
-                       g4_qtlibdir=`dirname $g4_qtlibdir`
-                       echo "checking Qt lib dir in... $g4_qtlibdir"
-                       g4_havegoodqt=yes
-                   else
-                       echo "Failed to find Qt lib dir in : $libQtFiles"
-                   fi
-               else
-                   echo "Failed to find Qt includes dir in : $incQtFiles"
-               fi #END CHECK QTLIBS
-           else
-               echo "Qt $g4_qtver is not actually support with this driver"
-           fi #END CHECK QTINC
-       fi #END CHECK QTMOC
-      #
-      # END QT AUTOPROBE
-      ####################################################################
-
-
-      ####################################################################
-      # Based on result of Qt autoprobe, we decide if user input is needed to
-      # locate Qt...
-      #
-       if test "x$g4_havegoodqt" = "xno" ; then
-           promptend="no"
-           qthomeloc="the standard locations"
-
-           g4message=`cat << EOM
-
-Autodetection failed to locate Qt on your system.
-Please enter the path to your Qt install (i.e. if Qt is installed
-in PATH/include/Qt, or PATH/include  $PATH/include/qt, enter PATH), or type '-' to
-CANCEL the build of the Qt UI module.
+            g4ui_build_qt_session=y
+            g4ui_use_qt=y
+            ;;
+    esac
+
+    ##########
+
+    ##########
+    # Now, if user chose to build module, we need to check for a Qt
+    # installation
+    #
+    if test "x$g4ui_build_qt_session" = "xy" ; then
+        echo " "
+        # NB Have to supply arg to qt script, just blank in this case!
+        qt_search_dir=""
+        . ./qt
+
+        # If we didn't find Qt automatically, then ask user if they know
+        # where it's installed...
+        if test "x$g4_havegoodqt" = "xno" ; then
+            promptend="no"
+            user_qthome="the standard locations"
+
+            while test "x$promptend" = "xno" ; do
+                g4message=`cat << EOM
+
+Autodetection failed to locate Qt3 or Qt4 in $qthomeloc on your system.
+Please enter the path to your Qt3 OR Qt4 install (i.e. if Qt4 is installed
+in PATH/include/QT, PATH/include or PATH/include/qt4, enter PATH),
+or type '-' to CANCEL the build of the Qt UI module.
 Qt path:
 EOM`
-           dflt="/usr"
-           g4_qtmochome="/usr"
-           fn='d~(-)'
-           rp=$g4message
-           . ./getfile
-
-               #Check for user cancellation
-           if test "x$ans" = "x-" ; then
-               g4ui_build_qt_session=n
-               g4ui_use_qt=n
-               echo "build/use of Qt UI module cancelled..."
-               promptend=yes
-
-           else
-                  #We want to probe for Qt in the user supplied directory
-               echo " "
-               qthomeloc=$ans
-               g4_havegoodqt=no
-
-
-                  # check for moc
-
-               g4_qtmochome=`./loc moc no $ans/bin`
-               if test "x$g4_qtmochome" = "xno" ; then
-                   while test "x$promptend" = "xno" ; do
-                       g4message=`cat << EOM
-
-Failed to locate Qt moc tool on your system.
-Please enter the path to your Qt moc tool install or type '-' to
-CANCEL the build of the Qt UI module.
-Qt moc path:
-EOM`
-                       fn='d~(-)'
-                       rp=$g4message
-                       . ./getfile
-                       
-                          #Check for user cancellation
-                       if test "x$ans" = "x-" ; then
-                           g4ui_build_qt_session=n
-                           g4ui_use_qt=n
-                           echo "build/use of Qt UI module cancelled..."
-                           promptend=yes
-                           
-                       else
-                              #We want to probe for Qt in the user supplied directory
-                           echo " "
-                              # check for moc
-                           g4_qtmochome=`./loc moc no $ans/bin`
-                           if test "x$g4_qtmochome" != "xno" ; then
-                               promptend=yes
-                           fi
-                       fi 
-                   done
-               fi # ASK FOR QT MOC
-               if test "x$g4_qtmochome" != "xno" ; then
-                   echo "checking Qt moc tool in... $g4_qtmochome"
-               fi
-
-                  # if moc ok, then check for version
-               if test "x$g4_qtmochome" != "xno" ; then
-                   g4_qtver=`$g4_qtmochome 2>&1 -v | $sed 's/.* .Qt \([0-9]\)\..*/\1/' `
-                   echo "checking Qt version... $g4_qtver"
-
-                   if test "x$g4_qtver" = "x3" || test "x$g4_qtver" = "x4";then
-
-                          # if version ok check for includes
-                          # checking includes in qt$g4_qtver, then standard
-                       incQtFiles="$qthomeloc/lib/qt$g4_qtver/include $qthomeloc/include/qt$g4_qtver/Qt $qthomeloc/include/qt$g4_qtver  $qthomeloc/include $qthomeloc/include/Qt "
-                       
-                       if test "X$g4osname" = "XDarwin" && test "X$g4_qtver" = "X4"; then
-                           incQtFiles="$incQtFiles /Library/Frameworks/QtCore.framework/Headers/ $qthomeloc/QtCore.framework/Headers/"
-                           g4_qtincdir=`./loc qglobal.h no $incQtFiles`
-                           if test "x$g4_qtincdir" != "xno" ; then
-                               g4_qtincdir=`dirname $g4_qtincdir`
-                               g4_qtincdir=`dirname $g4_qtincdir`
-                           fi
-                       else
-                           g4_qtincdir=`./loc qglobal.h no $incQtFiles`
-                       fi
-                       if test "x$g4_qtincdir" = "xno" ; then
-                           while test "x$promptend" = "xno" ; do
-                               g4message=`cat << EOM
-
-Failed to locate Qt include directory on your system.
-Please enter the path to your Qt include directory install or type '-' to
-CANCEL the build of the Qt UI module.
-Qt include path:
-EOM`
-                               fn='d~(-)'
-                               rp=$g4message
-                               . ./getfile
-                               
-                                  #Check for user cancellation
-                               if test "x$ans" = "x-" ; then
-                                   g4ui_build_qt_session=n
-                                   g4ui_use_qt=n
-                                   echo "build/use of Qt UI module cancelled..."
-                                   promptend=yes
-                                   
-                               else
-                                     #We want to probe for Qt in the user supplied directory
-                                   echo " "
-                                      # check for include
-                                   g4_qtincdir=`./loc qglobal.h no $ans`
-                                   if test "x$g4_qtincdir" != "xno" ; then
-                                       promptend=yes
-                                   fi
-                               fi 
-                           done
-                       fi # ASK FOR QT INC
-                       if test "x$g4_qtincdir" != "xno" ; then
-                           g4_qtincdir=`dirname $g4_qtincdir`
-                           echo "checking Qt inc dir in... $g4_qtincdir"
-                       fi
-                          # if qt inc ok, then check for libs
-                       if test "x$g4_qtincdir" != "xno" ; then
-
-                              # checking libraries in qt$g4_qtver, then standard
-                           libQtFiles="$qthomeloc/lib/qt$g4_qtver/lib      $qthomeloc/lib/qt$g4_qtver     $qthomeloc/lib/qt$g4_qtver    $qthomeloc/lib/qt$g4_qtver/lib64  $qthomeloc/lib     $qthomeloc/lib64     $qthomeloc/lib/qt/lib     $qthomeloc/lib/qt     $qthomeloc/lib64"
-                           
-                           if test "X$g4osname" = "XDarwin" && test "X$g4_qtincdir" = "X/Library/Frameworks" ; then
-                               g4_qtlibdir=`./loc QtCore no  /Library/Frameworks/QtCore.framework/Versions/$g4_qtver/ $libQtFiles`
-                               g4_qtlibdir=`dirname $g4_qtlibdir`
-                               g4_qtlibdir=`dirname $g4_qtlibdir`
-                               g4_qtlibdir=`dirname $g4_qtlibdir`
-                           else
-                               g4_qtlibdir=`./loc libqt* no $libQtFiles`
-                           fi
-                           if test "x$g4_qtlibdir" = "xno" ; then
-                               while test "x$promptend" = "xno" ; do
-                                   g4message=`cat << EOM
-
-Failed to locate Qt lib directory on your system.
-Please enter the path to your Qt lib directory install or type '-' to
-CANCEL the build of the Qt UI module.
-Qt library path:
-EOM`
-                                   fn='d~(-)'
-                                   rp=$g4message
-                                   . ./getfile
-                                   
-                                  #Check for user cancellation
-                                   if test "x$ans" = "x-" ; then
-                                       g4ui_build_qt_session=n
-                                       g4ui_use_qt=n
-                                       echo "build/use of Qt UI module cancelled..."
-                                       promptend=yes
-                                       
-                                   else
-                                     #We want to probe for Qt in the user supplied directory
-                                       echo " "
-                                      # check for libraries
-                                       if test "X$g4osname" = "XDarwin" && test "X$g4_qtincdir" = "X/Library/Frameworks" ; then
-                                           g4_qtlibdir=`./loc QtCore* no $libQtFiles /Library/Frameworks/`
-                                       else
-                                           g4_qtlibdir=`./loc libqt* no $libQtFiles`
-                                       fi
-                                       if test "x$g4_qtlibdir" != "xno" ; then
-                                           promptend=yes
-                                       fi
-                                   fi 
-                               done
-                           fi # END OF LIB CHECK
-                           if test "x$g4_qtlibdir" != "xno" ; then
-                               g4_qtlibdir=`dirname $g4_qtlibdir`
-                               echo "checking Qt lib dir in... $g4_qtlibdir"
-                               promptend=yes
-                               g4_havegoodqt=yes
-                           fi
-                           
-                       else # END OF INC CHECK
-                           g4_qtincdir=no
-                       fi                     
-                   else # END OF VERSION CHECK
-                       g4_qtmochome=no
-                   fi
-               fi # END OF MOC CHECK
-
-           fi #END CHECK USER CANCELLATION
-           
-       fi #END USER DIRECTED QT DETECTION
-
-      #
-      #END QT USER INPUT PROBE
-      ####################################################################
-      
-   fi #END CHECK OF G4UI_BUILD_QT_SESSION=Y
-   ###########################################
-
-fi #END TEST G4UI_NONE=N
-#fi #END TEST G4SYSTEM = Linux-g++ OR Darwin-g++
-########################
+                dflt=""
+                fn='d~(-)'
+                rp=$g4message
+                . ./getfile
+                user_qthome=$ans
+
+                if test "x$user_qthome" = "x-" ; then
+                    # Cancel build...
+                    g4ui_build_qt_session=n
+                    g4ui_use_qt=n
+                    echo "configure: build/use of Qt UI module cancelled"
+                    promptend=yes
+                else
+                    # Check for installation in user directory
+                    echo " "
+                    qt_search_dir=$user_qthome
+                    . ./qt
+
+                    if test "x$g4_havegoodqt" = "xyes" ; then
+                        promptend=yes
+                    fi
+                fi #END TEST user_qthome = -
+            done #END while promptend=no (for user input of Qt install)
+        fi #END TEST g4_havegoodqt = no (for user prompt)
+    fi #END TEST g4ui_build_qt_session (whether to build at all)
+fi #END TEST g4ui_none = n
+
 echo " "
 case "$g4vis_none" in
@@ -5921 +6044 @@
 # BEGIN QTVIS/QT PROBE
 #
-
+# Because the vis driver only works with UI, only probe if g4ui_none is
+# NOT set AND also that g4vis_none is NOT set
 #
-# We only run on a Linux-g++ or Darwin-g++ system
-#
-if test "x$g4system" = "xLinux-g++" -o "x$g4system" = "xDarwin-g++" ; then
-    
-   # Only proceed further if g4vis_none is not set
-    if test "x$g4vis_none" = "xn" ; then
-      #Query the user on whether to activate the module
-        g4message=`cat << EOM
-
-    G4VIS_BUILD_OPENGLQT_DRIVER
-    G4VIS_USE_OPENGLQT
-
-Setting these variables will enable the building of the G4 OpenGL Qt based
+if test "x$g4ui_none" = "xn" -a "x$g4vis_none" = "xn" ; then
+    # Query the user to see if build of Qt UI module is needed
+    g4message=`cat <<EOM
+
+    G4UI_BUILD_OPENGLQT_DRIVER
+    G4UI_USE_OPENGLQT
+
+Setting these variables will enable the building of the G4 OpenGL Qt based 
 visualisation driver and the use of this driver in your applications
 respectively.
-The Qt headers, libraries and binaries are required to enable the
-building of this module.
+The Qt3 or Qt4 headers, libraries and moc application are required to enable
+the building of this module.
 Do you want to enable build and use of this module?
 EOM`
-        
-      #Read the user response
-        dflt=$g4vis_build_openglqt_driver
-        rp=$g4message
-        . ./myread
-        gans=$ans
-        
-        #
-        # Check response
-        #
-        case $gans in
-            n*|N*)
-            g4vis_build_openglqt_driver=n
+
+    # Read in the user response
+    dflt=$g4vis_build_openglqt_driver
+    rp=$g4message
+    . ./myread
+    gans=$ans
+
+    # Check response and take set variables as needed.
+    case $gans in
+        n*|N*)
+            g4vis_build_openglqt_driver=n
             g4vis_use_openglqt=n
-            ;;
-            y*|Y*)
-            g4vis_build_openglqt_driver=y
+            ;;
+        y*|Y*)
+            g4vis_build_openglqt_driver=y
             g4vis_use_openglqt=y
             ;;
-        esac
-
-        ###################
-
-
-
-        ####################################################################
-        # Now, if we have selected to build the driver, we need to check for
-        # a Qt installation, which may have been done for use by the UI
-        # module...
-        #
-        if test "x$g4vis_build_openglqt_driver" = "xy" ; then
-            
-            #Now check whether g4_qthome has been set previously - if it hasn't
-            #proceed to probe for Qt... (assume it's unfiltered, i.e. not
-            #set to '' by earlier probe if it was /usr or /usr/local
-            if test "x$g4_qtmochome" != "x" && test "x$g4_qtlibdir" != "x" && test "x$g4_qtincdir" != "x"  ; then
-                echo " "
-                echo "configure: Qt preconfigured, no recheck neccessary"
-            else
-         #################################################################
-            #We repeat the search used for the UI module
-                
-                echo " "
-                g4_havegoodqt=no
-                
-            # Look for qt4 moc
-                g4_qtmochome=`./loc moc no $QTDIR/bin     /usr/lib/qt4/bin     /usr/lib/qt/bin     /usr/local/qt/bin     /usr/local/bin     /usr/bin      /bin            /usr/share/qt4/bin     /usr/X11R6/bin     /sw/bin`
-                if test "x$g4_qtmochome" = "xno" ; then
-              # Look for qt3 moc
-                    g4_qtmochome=`./loc moc no /usr/lib/qt3/bin     /usr/share/qt3/bin`
-                fi
-                
-            # if not found
-                if test "x$g4_qtmochome" != "xno" ; then
-                    echo "checking Qt moc tool in... $g4_qtmochome"
-                # check Qt version
-                    g4_qtver=`$g4_qtmochome 2>&1 -v | $sed 's/.* .Qt \([0-9]\)\..*/\1/' `
-                    echo "checking Qt version... $g4_qtver"
-                    if test "x$g4_qtver" = "x3" || test "x$g4_qtver" = "x4" ;then
-                        
-                  # checking includes first get QTDIR location, then qt$g4_qtver, sw, standard, shared, X11
-                        
-                        incQtFiles=" $QTDIR/include /usr/include/qt$g4_qtver /usr/include/qt$g4_qtver/Qt  /usr/lib/qt$g4_qtver/include /sw/include/qt /usr/lib/qt/include /usr/local/qt/include /usr/local/include /usr/include  /usr/include/qt /usr/share/qt$g4_qtver/include /usr/X11R6/include /usr/X11R6/include/qt$g4_qtver  /usr/X11R6/include/qt" 
-                        
-                        if test "X$g4osname" = "XDarwin" && test "X$g4_qtver" = "X4"; then
-                            incQtFiles="$incQtFiles /Library/Frameworks/QtCore.framework/Headers/"
-                            g4_qtincdir=`./loc qglobal.h no $incQtFiles`
-                            if test "x$g4_qtincdir" != "xno" ; then
-                                g4_qtincdir="/Library/Frameworks"
-                            fi
-                        else
-                            g4_qtincdir=`./loc qglobal.h no $incQtFiles`
-                        fi
-                        
-                        
-                        if test "x$g4_qtincdir" != "xno" ; then
-                            if test "x$g4_qtincdir" != "x/Library/Frameworks" ; then
-                                g4_qtincdir=`dirname $g4_qtincdir`
-                            fi
-                            echo "checking Qt includes dir in... $g4_qtincdir"
-                            
-                            
-                       # checking libs, includes first get QTDIR location, then qt$g4_qtver, sw, standard, shared, X11
-                            
-                            libQtFiles="$QTDIR/lib     $QTDIR/lib64     /usr/lib/qt$g4_qtver/lib      /usr/lib/qt$g4_qtver/lib64     /usr/lib/qt$g4_qtver     /usr/lib/qt$g4_qtver        /sw/lib  /sw/lib/qt   /sw/lib/qt$g4_qtver    /sw/lib/qt$g4_qtver/lib         /usr/lib/qt/lib     /usr/local/qt/lib     /usr/local/lib     /usr/lib      /usr/lib/qt   /usr/share/qt$g4_qtver/lib      /usr/X11R6/lib/qt     /usr/X11R6/lib/qt$g4_qtver     /usr/X11R6/lib  /usr/X11R6/lib/qt"
-                            
-                            if test "X$g4osname" = "XDarwin" && test "X$g4_qtincdir" = "X/Library/Frameworks" ; then
-                                g4_qtlibdir=`./loc QtCore no  /Library/Frameworks/QtCore.framework/Versions/$g4_qtver/ $libQtFiles`
-                                g4_qtlibdir=`dirname $g4_qtlibdir`
-                                g4_qtlibdir=`dirname $g4_qtlibdir`
-                                g4_qtlibdir=`dirname $g4_qtlibdir`
-                            else
-                                g4_qtlibdir=`./loc libqt* no $libQtFiles`
-                            fi
-                            if test "x$g4_qtlibdir" != "xno" ; then
-                                g4_qtlibdir=`dirname $g4_qtlibdir`
-                                echo "checking Qt lib dir in... $g4_qtlibdir"
-                                g4_havegoodqt=yes
-                            else
-                                echo "Failed to find Qt lib dir in : $libQtFiles"
-                            fi
-                        else
-                            echo "Failed to find Qt includes dir in : $incQtFiles"
-                        fi #END CHECK QTLIBS
-                    else
-                        echo "Qt $g4_qtver is not actually support with this driver"
-                    fi #END CHECK QTINC
-                fi #END CHECK QTVER
-            fi # END OF PRECONFIG
-            #
-            # END QT AUTOPROBE
-            ####################################################################
-            
-
-
-
-
-
-            ####################################################################
-            # Based on result of Qt autoprobe, we decide if user input is needed to
-            # locate Qt...
-            #
-            if test "x$g4_havegoodqt" = "xno" ; then
-                promptend="no"
-                qthomeloc="the standard locations"
-
-                g4message=`cat << EOM
-
-Autodetection failed to locate Qt on your system.
-Please enter the path to your Qt install (i.e. if Qt is installed
-in PATH/include/Qt, or PATH/include  $PATH/include/qt, enter PATH), or type '-' to
-CANCEL the build of the Qt UI module.
+    esac
+
+    ##########
+
+    ##########
+    # Now, if user chose to build module, we need to check for a Qt
+    # installation
+    #
+    if test "x$g4vis_build_openglqt_driver" = "xy" ; then
+        echo " "
+        # NB Have to supply arg to qt script, just blank in this case!
+        qt_search_dir=""
+        . ./qt
+
+        # If we didn't find Qt automatically, then ask user if they know
+        # where it's installed...
+        if test "x$g4_havegoodqt" = "xno" ; then
+            promptend="no"
+            user_qthome="the standard locations"
+
+            while test "x$promptend" = "xno" ; do
+                g4message=`cat << EOM
+
+Autodetection failed to locate Qt3 or Qt4 in $qthomeloc on your system.
+Please enter the path to your Qt3 OR Qt4 install (i.e. if Qt4 is installed
+in PATH/include/QT, PATH/include or PATH/include/qt4, enter PATH),
+or type '-' to CANCEL the build of the Qt UI module.
 Qt path:
 EOM`
-                dflt="/usr"
-                g4_qtmochome="/usr"
+                dflt=""
                 fn='d~(-)'
-                rp=$g4message
-                . ./getfile
-
-                     #Check for user cancellation
-                if test "x$ans" = "x-" ; then
-                    g4ui_build_qt_session=n
-                    g4ui_use_qt=n
-                    echo "build/use of Qt UI module cancelled..."
-                    promptend=yes
-
-                else
-                        #We want to probe for Qt in the user supplied directory
-                    echo " "
-                    qthomeloc=$ans
-                    g4_havegoodqt=no
-
-
-                        # check for moc
-
-                    g4_qtmochome=`./loc moc no $ans/bin`
-                    if test "x$g4_qtmochome" = "xno" ; then
-                        while test "x$promptend" = "xno" ; do
-                            g4message=`cat << EOM
-
-Failed to locate Qt moc tool on your system.
-Please enter the path to your Qt moc tool install or type '-' to
-CANCEL the build of the Qt UI module.
-Qt moc path:
-EOM`
-                            fn='d~(-)'
-                            rp=$g4message
-                            . ./getfile
-                            
-                                #Check for user cancellation
-                            if test "x$ans" = "x-" ; then
-                                g4ui_build_qt_session=n
-                                g4ui_use_qt=n
-                                echo "build/use of Qt UI module cancelled..."
-                                promptend=yes
-                                
-                            else
-                              #We want to probe for Qt in the user supplied directory
-                                echo " "
-                              # check for moc
-                                g4_qtmochome=`./loc moc no $ans/bin`
-                                if test "x$g4_qtmochome" != "xno" ; then
-                                    promptend=yes
-                                fi
-                            fi 
-                        done
-                    fi # ASK FOR QT MOC
-                    if test "x$g4_qtmochome" != "xno" ; then
-                        echo "checking Qt moc tool in... $g4_qtmochome"
-                    fi
-
-                        # if moc ok, then check for version
-                    if test "x$g4_qtmochome" != "xno" ; then
-                        g4_qtver=`$g4_qtmochome 2>&1 -v | $sed 's/.* .Qt \([0-9]\)\..*/\1/' `
-                        echo "checking Qt version... $g4_qtver"
-
-                        if test "x$g4_qtver" = "x3" || test "x$g4_qtver" = "x4";then
-
-                                # if version ok check for includes
-                                # checking includes in qt$g4_qtver, then standard
-                            incQtFiles="$qthomeloc/lib/qt$g4_qtver/include $qthomeloc/include/qt$g4_qtver/Qt $qthomeloc/include/qt$g4_qtver  $qthomeloc/include $qthomeloc/include/Qt "
-                            
-                            if test "X$g4osname" = "XDarwin" && test "X$g4_qtver" = "X4"; then
-                                incQtFiles="$incQtFiles /Library/Frameworks/QtCore.framework/Headers/ $qthomeloc/QtCore.framework/Headers/"
-                                g4_qtincdir=`./loc qglobal.h no $incQtFiles`
-                                if test "x$g4_qtincdir" != "xno" ; then
-                                    g4_qtincdir=`dirname $g4_qtincdir`
-                                    g4_qtincdir=`dirname $g4_qtincdir`
-                                fi
-                            else
-                                g4_qtincdir=`./loc qglobal.h no $incQtFiles`
-                            fi
-                            if test "x$g4_qtincdir" = "xno" ; then
-                                while test "x$promptend" = "xno" ; do
-                                    g4message=`cat << EOM
-
-Failed to locate Qt include directory on your system.
-Please enter the path to your Qt include directory install or type '-' to
-CANCEL the build of the Qt UI module.
-Qt include path:
-EOM`
-                                    fn='d~(-)'
-                                    rp=$g4message
-                                    . ./getfile
-                                    
-                                        #Check for user cancellation
-                                    if test "x$ans" = "x-" ; then
-                                        g4ui_build_qt_session=n
-                                        g4ui_use_qt=n
-                                        echo "build/use of Qt UI module cancelled..."
-                                        promptend=yes
-                                        
-                                    else
-                                           #We want to probe for Qt in the user supplied directory
-                                        echo " "
-                                            # check for include
-                                        g4_qtincdir=`./loc qglobal.h no $ans`
-                                        if test "x$g4_qtincdir" != "xno" ; then
-                                            promptend=yes
-                                        fi
-                                    fi 
-                                done
-                            fi # ASK FOR QT INC
-                            if test "x$g4_qtincdir" != "xno" ; then
-                                g4_qtincdir=`dirname $g4_qtincdir`
-                                echo "checking Qt inc dir in... $g4_qtincdir"
-                            fi
-                                # if qt inc ok, then check for libs
-                            if test "x$g4_qtincdir" != "xno" ; then
-
-                                    # checking libraries in qt$g4_qtver, then standard
-                                libQtFiles="$qthomeloc/lib/qt$g4_qtver/lib      $qthomeloc/lib/qt$g4_qtver     $qthomeloc/lib/qt$g4_qtver    $qthomeloc/lib/qt$g4_qtver/lib64  $qthomeloc/lib     $qthomeloc/lib64     $qthomeloc/lib/qt/lib     $qthomeloc/lib/qt     $qthomeloc/lib64"
-                                
-                                if test "X$g4osname" = "XDarwin" && test "X$g4_qtincdir" = "X/Library/Frameworks" ; then
-                                    g4_qtlibdir=`./loc QtCore no  /Library/Frameworks/QtCore.framework/Versions/$g4_qtver/ $libQtFiles`
-                                    g4_qtlibdir=`dirname $g4_qtlibdir`
-                                    g4_qtlibdir=`dirname $g4_qtlibdir`
-                                    g4_qtlibdir=`dirname $g4_qtlibdir`
-                                else
-                                    g4_qtlibdir=`./loc libqt* no $libQtFiles`
-                                fi
-                                if test "x$g4_qtlibdir" = "xno" ; then
-                                    while test "x$promptend" = "xno" ; do
-                                        g4message=`cat << EOM
-
-Failed to locate Qt lib directory on your system.
-Please enter the path to your Qt lib directory install or type '-' to
-CANCEL the build of the Qt UI module.
-Qt library path:
-EOM`
-                                        fn='d~(-)'
-                                        rp=$g4message
-                                        . ./getfile
-                                        
-                                        #Check for user cancellation
-                                        if test "x$ans" = "x-" ; then
-                                            g4ui_build_qt_session=n
-                                            g4ui_use_qt=n
-                                            echo "build/use of Qt UI module cancelled..."
-                                            promptend=yes
-                                            
-                                        else
-                                           #We want to probe for Qt in the user supplied directory
-                                            echo " "
-                                            # check for libraries
-                                            if test "X$g4osname" = "XDarwin" && test "X$g4_qtincdir" = "X/Library/Frameworks" ; then
-                                                g4_qtlibdir=`./loc QtCore* no $libQtFiles /Library/Frameworks/`
-                                            else
-                                                g4_qtlibdir=`./loc libqt* no $libQtFiles`
-                                            fi
-                                            if test "x$g4_qtlibdir" != "xno" ; then
-                                                promptend=yes
-                                            fi
-                                        fi 
-                                    done
-                                fi # END OF LIB CHECK
-                                if test "x$g4_qtlibdir" != "xno" ; then
-                                    g4_qtlibdir=`dirname $g4_qtlibdir`
-                                    echo "checking Qt lib dir in... $g4_qtlibdir"
-                                    promptend=yes
-                                    g4_havegoodqt=yes
-                                fi
-                                
-                            else # END OF INC CHECK
-                                g4_qtincdir=no
-                            fi                     
-                        else # END OF VERSION CHECK
-                            g4_qtmochome=no
-                        fi
-                    fi # END OF MOC CHECK
-
-                fi #END CHECK USER CANCELLATION
-                
-            fi #END USER DIRECTED QT DETECTION
-            #
-            #END QT USER INPUT PROBE
-            ####################################################################
-            
-        fi #END TEST G4VIS_BUILD_OPENGLQT_DRIVER = y
-        
-        
-      #
-      # Put a filter in here on /usr and /usr/local as QTHOME in line
-      # with other paths - done here as this is the last place QT is
-      # checked for
-      #DEACTIVATED AT PRESENT BECAUSE OF USE OF MOC
-      #
-      #if test "x$g4_qthome" = "x/usr" -o "x$g4_qthome" = "x/usr/local" ; then
-        # g4_qthome=""
-      #fi
-        
-
-    fi #END TEST G4VIS_NONE IS N
-    
-fi #END TEST G4SYSTEM IS Linux-g++ OR Darwin-g++
-
-#
-# END OF QTVIS/QT PROBE
+                rp=$g4message
+                . ./getfile
+                user_qthome=$ans
+
+                if test "x$user_qthome" = "x-" ; then
+                    # Cancel build...
+                    g4vis_build_openglqt_driver=n
+                    g4vis_use_openglqt=n
+                    echo "configure: build/use of Qt OpenGl driver cancelled"
+                    promptend=yes
+                else
+                    # Check for installation in user directory
+                    echo " "
+                    qt_search_dir=$user_qthome
+                    . ./qt
+
+                    if test "x$g4_havegoodqt" = "xyes" ; then
+                        promptend=yes
+                    fi
+                fi #END TEST user_qthome = -
+            done #END while promptend=no (for user input of Qt install)
+        fi #END TEST g4_havegoodqt = no (for user prompt)
+    fi #END TEST g4vis_build_openglqt_driver (whether to build at all)
+fi #END TEST g4ui_none = n AND g4vis_none=n
 
 #
 # BEGIN GDML/XERCESC PROBE 
-# 
+#
 
 # Set default build option to no
@@ -6699 +6551 @@
 g4_make='$g4_make'
 g4_make_version='$g4_make_version'
-g4_qtmochome='$g4_qtmochome'
-g4_qtincdir='$g4_qtincdir'
-g4_qtlibdir='$g4_qtlibdir'
+g4_qt_cxxflags='$g4_qt_cxxflags'
+g4_qt_gl_cxxflags='$g4_qt_gl_cxxflags'
+g4_qt_gl_libs='$g4_qt_gl_libs'
+g4_qt_libs='$g4_qt_libs'
+g4_qt_moc='$g4_qt_moc'
+g4_qt_version='$g4_qt_version'
 g4abladata='$g4abladata'
 g4base='$g4base'