4c702a8
unixODBC's configure tends to pick the wrong libraries on a multilib
4c702a8
machine.  Force it to use the location reported by /etc/profile.d/qt.sh
4c702a8
which we invoke in the specfile (yeah, a crude hack...)
4c702a8
4c702a8
dea5432
diff -Naur unixODBC-2.2.14.orig/qt.m4 unixODBC-2.2.14/qt.m4
dea5432
--- unixODBC-2.2.14.orig/qt.m4	2008-06-30 11:13:44.000000000 -0400
dea5432
+++ unixODBC-2.2.14/qt.m4	2008-11-25 12:01:47.000000000 -0500
dea5432
@@ -230,40 +230,7 @@
4c702a8
 
4c702a8
   # Ensure we have the lib dir...
4c702a8
   if test "x$qt_libraries" = "x" ; then
4c702a8
-    # see if it is relative to the includes
4c702a8
-    qt_tree="$qt_includes"
dea5432
-
dea5432
-	#
dea5432
-	# the cygwin dirhame only strips up to the first /
dea5432
-	#
dea5432
-
dea5432
-	case $host_os in
dea5432
-	  cygwin*) empty_dir="x/" ;;
dea5432
-	  *) empty_dir="x" ;;
dea5432
-	esac
dea5432
-
dea5432
-    while test "x$qt_tree" != $empty_dir ; do
4c702a8
-      # first go around will fail...
4c702a8
-      if expr "$QTVERSION" '>=' "040000" > /dev/null ; then
4c702a8
-        if ls $qt_tree/lib/libQt* > /dev/null 2> /dev/null ; then
4c702a8
-          qt_libraries=$qt_tree/lib
4c702a8
-          break
4c702a8
-        else
4c702a8
-          # lop off tail of path
4c702a8
-          dnl not as portable as it should be...
4c702a8
-          qt_tree="`dirname $qt_tree`"
4c702a8
-	fi
4c702a8
-      else
4c702a8
-        if ls $qt_tree/lib/libqt* > /dev/null 2> /dev/null ; then
4c702a8
-          qt_libraries=$qt_tree/lib
4c702a8
-          break
4c702a8
-        else
4c702a8
-          # lop off tail of path
4c702a8
-          dnl not as portable as it should be...
4c702a8
-          qt_tree="`dirname $qt_tree`"
4c702a8
-	fi
4c702a8
-      fi
4c702a8
-    done
4c702a8
+    qt_libraries="$QTLIB"
4c702a8
   fi  
4c702a8
 
4c702a8
   # Use QTVERSION and gotthread to set libs we need...