]>
Commit | Line | Data |
---|---|---|
6b2b6099 JB |
1 | --- alsa-tools-1.0.14/qlo10k1/acinclude.m4.orig 2007-06-04 13:27:26.000000000 +0200 |
2 | +++ alsa-tools-1.0.14/qlo10k1/acinclude.m4 2007-06-12 19:21:29.646711775 +0200 | |
3 | @@ -87,15 +87,15 @@ | |
2d42b581 | 4 | ;; |
5 | ||
6 | *) | |
7 | - QT_IS_STATIC=`ls $QTDIR/lib/*.a 2> /dev/null` | |
8 | + QT_IS_STATIC="" | |
9 | if test "x$QT_IS_STATIC" = x; then | |
10 | QT_IS_STATIC="no" | |
11 | else | |
12 | QT_IS_STATIC="yes" | |
13 | fi | |
14 | if test x$QT_IS_STATIC = xno ; then | |
15 | - QT_IS_DYNAMIC=`ls $QTDIR/lib/*.so 2> /dev/null` | |
6b2b6099 | 16 | - QT_IS_DYNAMIC64=`ls $QTDIR/lib64/*.so 2> /dev/null` |
2d42b581 | 17 | + QT_IS_DYNAMIC=`ls $QTDIR/lib/libqt*.so 2> /dev/null` |
6b2b6099 JB |
18 | + QT_IS_DYNAMIC64=`ls $QTDIR/lib64/libqt*.so 2> /dev/null` |
19 | if test "x$QT_IS_DYNAMIC" = x && test "x$QT_IS_DYNAMIC64" = x; then | |
2d42b581 | 20 | AC_MSG_ERROR([*** Couldn't find any Qt libraries]) |
21 | fi | |
6b2b6099 JB |
22 | @@ -104,17 +104,17 @@ |
23 | fi | |
2d42b581 | 24 | fi |
25 | ||
6b2b6099 JB |
26 | - if test "x`ls $QTDIR/$QT_LIB_DIR/libqt.{a,so} 2> /dev/null`" != x ; then |
27 | - QT_LIB="-lqt" | |
28 | - QT_IS_MT="no" | |
29 | - elif test "x`ls $QTDIR/$QT_LIB_DIR/libqt-mt.{a,so} 2> /dev/null`" != x ; then | |
30 | + if test "x`ls $QTDIR/$QT_LIB_DIR/libqt-mt.so 2> /dev/null`" != x ; then | |
2d42b581 | 31 | QT_LIB="-lqt-mt" |
32 | QT_IS_MT="yes" | |
6b2b6099 JB |
33 | - elif test "x`ls $QTDIR/$QT_LIB_DIR/libqte.{a,so} 2> /dev/null`" != x ; then |
34 | + elif test "x`ls $QTDIR/$QT_LIB_DIR/libqt.so 2> /dev/null`" != x ; then | |
35 | + QT_LIB="-lqt" | |
36 | + QT_IS_MT="no" | |
37 | + elif test "x`ls $QTDIR/$QT_LIB_DIR/libqte.so 2> /dev/null`" != x ; then | |
2d42b581 | 38 | QT_LIB="-lqte" |
39 | QT_IS_MT="no" | |
40 | QT_IS_EMBEDDED="yes" | |
6b2b6099 JB |
41 | - elif test "x`ls $QTDIR/$QT_LIB_DIR/libqte-mt.{a,so} 2> /dev/null`" != x ; then |
42 | + elif test "x`ls $QTDIR/$QT_LIB_DIR/libqte-mt.so 2> /dev/null`" != x ; then | |
2d42b581 | 43 | QT_LIB="-lqte-mt" |
44 | QT_IS_MT="yes" | |
45 | QT_IS_EMBEDDED="yes" |