cuyo-qt.patch

   1 --- cuyo-1.8.5/gwqt.m4.orig     2004-07-07 14:30:39.000000000 +0200
   2 +++ cuyo-1.8.5/gwqt.m4  2004-10-30 19:08:58.435322817 +0200
   3 @@ -62,7 +62,7 @@
   4
   5  # Figure out which version of Qt we are using
   6  AC_MSG_CHECKING([Qt version])
   7 -QT_VER=`grep 'define.*QT_VERSION_STR\W' $QTDIR/include/qglobal.h | perl -p -e 's/\D//g'`
   8 +QT_VER=`grep 'define.*QT_VERSION_STR\W' $QTDIR/include/qt/qglobal.h | perl -p -e 's/\D//g'`
   9  case "${QT_VER}" in
  10      2*)
  11          QT_MAJOR="2"
  12 @@ -122,39 +122,9 @@
  13          ;;
  14
  15      *)
  16 -        QT_IS_DYNAMIC=`ls /usr/lib/libqt*.so $QTDIR/lib/libqt*.so 2> /dev/null`
  17 -        if test "x$QT_IS_DYNAMIC" = x;  then
  18 -            QT_IS_STATIC=`ls /usr/lib/libqt*.a $QTDIR/lib/libqt*.a 2> /dev/null`
  19 -            if test "x$QT_IS_STATIC" = x; then
  20 -                AC_MSG_ERROR([*** Couldn't find any Qt libraries])
  21 -            else
  22 -                QT_IS_STATIC="yes"
  23 -            fi
  24 -       else
  25 -                QT_IS_STATIC="no"
  26 -        fi
  27 -
  28 -        if test "x`ls $QTDIR/lib/libqt.* 2> /dev/null`" != x ; then
  29 -            QT_LIB="-lqt"
  30 -            QT_IS_MT="no"
  31 -        elif test "x`ls $QTDIR/lib/libqt-mt.* 2> /dev/null`" != x ; then
  32 -            QT_LIB="-lqt-mt"
  33 -            QT_IS_MT="yes"
  34 -        elif test "x`ls $QTDIR/lib/libqte.* 2> /dev/null`" != x ; then
  35 -            QT_LIB="-lqte"
  36 -            QT_IS_MT="no"
  37 -            QT_IS_EMBEDDED="yes"
  38 -        elif test "x`ls $QTDIR/lib/libqte-mt.* 2> /dev/null`" != x ; then
  39 -            QT_LIB="-lqte-mt"
  40 -            QT_IS_MT="yes"
  41 -            QT_IS_EMBEDDED="yes"
  42 -        elif test "x`ls /usr/lib/libqt.* 2> /dev/null`" != x ; then
  43 -            QT_LIB="-lqt"
  44 -            QT_IS_MT="no"
  45 -        elif test "x`ls /usr/lib/libqt-mt.* 2> /dev/null`" != x ; then
  46 -            QT_LIB="-lqt-mt"
  47 -            QT_IS_MT="yes"
  48 -        fi
  49 +       QT_IS_STATIC="no"
  50 +       QT_LIB="-lqt-mt"
  51 +       QT_IS_MT="yes"
  52          ;;
  53  esac
  54  AC_MSG_CHECKING([if Qt is static])