38 lines
1.4 KiB
Text
38 lines
1.4 KiB
Text
$NetBSD: patch-ab,v 1.8 2006/04/28 16:23:55 joerg Exp $
|
|
|
|
--- configure.orig 2002-01-09 18:34:33.000000000 +0000
|
|
+++ configure
|
|
@@ -4458,13 +4458,13 @@ QT_INCLUDES="-I $qtdir/include"
|
|
QT_LDFLAGS="-L $qtdir/lib"
|
|
CFLAGS="$CFLAGS $QT_INCLUDES"
|
|
LDFLAGS="$LDFLAGS $QT_LDFLAGS"
|
|
-echo "$as_me:4461: checking for qVersion__Fv in -lqt" >&5
|
|
-echo $ECHO_N "checking for qVersion__Fv in -lqt... $ECHO_C" >&6
|
|
+echo "$as_me:4461: checking for qVersion__Fv in -lqt-mt" >&5
|
|
+echo $ECHO_N "checking for qVersion__Fv in -lqt-mt... $ECHO_C" >&6
|
|
if test "${ac_cv_lib_qt_qVersion__Fv+set}" = set; then
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lqt $LIBS"
|
|
+LIBS="-lqt-mt $PTHREAD_LDFLAGS $PTHREAD_LIBS $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
#line 4469 "configure"
|
|
#include "confdefs.h"
|
|
@@ -4507,6 +4507,7 @@ LIBS=$ac_check_lib_save_LIBS
|
|
fi
|
|
echo "$as_me:4508: result: $ac_cv_lib_qt_qVersion__Fv" >&5
|
|
echo "${ECHO_T}$ac_cv_lib_qt_qVersion__Fv" >&6
|
|
+ac_cv_lib_qt_qVersion__Fv=yes
|
|
if test $ac_cv_lib_qt_qVersion__Fv = yes; then
|
|
|
|
# Extract the first word of "moc", so it can be a program name with args.
|
|
@@ -4552,7 +4553,7 @@ fi
|
|
echo "$as_me: WARNING: Moc is missing; the Qt interface will not be built" >&2;}
|
|
|
|
else
|
|
- QT_LDFLAGS="$QT_LDFLAGS -lqt"
|
|
+ QT_LDFLAGS="$QT_LDFLAGS -lqt-mt $PTHREAD_LDFLAGS $PTHREAD_LIBS"
|
|
|
|
have_qt=yes
|
|
fi
|