- force using shared qt-mt
authorJakub Bogusz <qboosh@pld-linux.org>
Sat, 30 Oct 2004 17:19:53 +0000 (17:19 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    cuyo-qt.patch -> 1.1

cuyo-qt.patch [new file with mode: 0644]

diff --git a/cuyo-qt.patch b/cuyo-qt.patch
new file mode 100644 (file)
index 0000000..cbcac08
--- /dev/null
@@ -0,0 +1,54 @@
+--- cuyo-1.8.5/gwqt.m4.orig    2004-07-07 14:30:39.000000000 +0200
++++ cuyo-1.8.5/gwqt.m4 2004-10-30 19:08:58.435322817 +0200
+@@ -62,7 +62,7 @@
+ # Figure out which version of Qt we are using
+ AC_MSG_CHECKING([Qt version])
+-QT_VER=`grep 'define.*QT_VERSION_STR\W' $QTDIR/include/qglobal.h | perl -p -e 's/\D//g'`
++QT_VER=`grep 'define.*QT_VERSION_STR\W' $QTDIR/include/qt/qglobal.h | perl -p -e 's/\D//g'`
+ case "${QT_VER}" in
+     2*)
+         QT_MAJOR="2"
+@@ -122,39 +122,9 @@
+         ;;
+     *)
+-        QT_IS_DYNAMIC=`ls /usr/lib/libqt*.so $QTDIR/lib/libqt*.so 2> /dev/null` 
+-        if test "x$QT_IS_DYNAMIC" = x;  then
+-            QT_IS_STATIC=`ls /usr/lib/libqt*.a $QTDIR/lib/libqt*.a 2> /dev/null`
+-            if test "x$QT_IS_STATIC" = x; then
+-                AC_MSG_ERROR([*** Couldn't find any Qt libraries])
+-            else
+-                QT_IS_STATIC="yes"
+-            fi
+-      else
+-                QT_IS_STATIC="no"
+-        fi
+-
+-        if test "x`ls $QTDIR/lib/libqt.* 2> /dev/null`" != x ; then
+-            QT_LIB="-lqt"
+-            QT_IS_MT="no"
+-        elif test "x`ls $QTDIR/lib/libqt-mt.* 2> /dev/null`" != x ; then
+-            QT_LIB="-lqt-mt"
+-            QT_IS_MT="yes"
+-        elif test "x`ls $QTDIR/lib/libqte.* 2> /dev/null`" != x ; then
+-            QT_LIB="-lqte"
+-            QT_IS_MT="no"
+-            QT_IS_EMBEDDED="yes"
+-        elif test "x`ls $QTDIR/lib/libqte-mt.* 2> /dev/null`" != x ; then
+-            QT_LIB="-lqte-mt"
+-            QT_IS_MT="yes"
+-            QT_IS_EMBEDDED="yes"
+-        elif test "x`ls /usr/lib/libqt.* 2> /dev/null`" != x ; then
+-            QT_LIB="-lqt"
+-            QT_IS_MT="no"
+-        elif test "x`ls /usr/lib/libqt-mt.* 2> /dev/null`" != x ; then
+-            QT_LIB="-lqt-mt"
+-            QT_IS_MT="yes"
+-        fi
++      QT_IS_STATIC="no"
++      QT_LIB="-lqt-mt"
++      QT_IS_MT="yes"
+         ;;
+ esac
+ AC_MSG_CHECKING([if Qt is static])
This page took 0.104316 seconds and 4 git commands to generate.