Changeset 4625

Timestamp:

09/23/06 23:19:26 (2 years ago)

Author:

erijo

Message:

Applied patch from Geoffrey Lee to have qt-gui do proper detection of Qt under Mac OS X (#1401).

Files:

• trunk/qt-gui/acinclude.m4.in (modified) (3 diffs)

trunk/qt-gui/acinclude.m4.in

@@ -59 +59 @@
       for qt_dir in $qt_library_dirs; do
         if test -z $ac_kde || test "$ac_kde" = "no" || test "$kde_version" -ge 3; then
-          if test -r "$qt_dir/libqt-mt.so"; then
+          if test -r "$qt_dir/libqt-mt.so" -o -r "$qt_dir/libqt-mt.dylib"; then
             ac_qt_libname=-lqt-mt
             ac_qt_libdir=$qt_dir
@@ -67 +67 @@
           fi
 
-          if test -r "$qt_dir/libqt-mt.so.3"; then
+          if test -r "$qt_dir/libqt-mt.so.3" -o -r "$qt_dir/libqt-mt.so.3.dylib"; then
             ac_qt_libname=-lqt-mt
             ac_qt_libdir=$qt_dir
@@ -144 +144 @@
 
       if test -n "$QTDIR"; then
-        qt_include_dirs="$QTDIR/include $qt_include_dirs"
+        qt_include_dirs="$QTDIR/include $QTDIR/include/qt $QTDIR/include/qt3 $qt_include_dirs"
       fi