From 5faba37f113b6a4d75d7526cbbc1f363a465c39f Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 1 May 2013 15:09:36 -0500
Subject: Automated update from Qt3

---
 configure | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 469b920d..51551329 100755
--- a/configure
+++ b/configure
@@ -734,9 +734,6 @@ while [ "$#" -gt 0 ]; do
     glibmainloop)
 	if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
 	    CFG_GLIBMAINLOOP="$VAL"
-	    if [ "$VAL" = "yes" ]; then
-		echo "WARNING: glib main loop support is ***incomplete*** and will cause problems with threaded applications and/or those using non-standard event loops!"
-	    fi
 	else
 	    UNKNOWN_OPT=yes
 	fi
@@ -2644,13 +2641,11 @@ if [ "$CFG_GLIBMAINLOOP" = "no" ]; then
 elif [ "$CFG_GLIBMAINLOOP" = "yes" ]; then
     QMAKE_CONFIG="$QMAKE_CONFIG glibmainloop"
 
-    GLIB_CFLAGS="`pkg-config --cflags glib-2.0`"
+    GLIB_CFLAGS="`pkg-config --cflags glib-2.0` `pkg-config --cflags gthread-2.0`"
     QMAKE_VARS="$QMAKE_VARS \"QMAKE_CFLAGS_GLIB=$GLIB_CFLAGS\""
 
-    GLIB_LINKFLAG="`pkg-config --libs glib-2.0`"
+    GLIB_LINKFLAG="`pkg-config --libs glib-2.0` `pkg-config --libs gthread-2.0`"
     QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_GLIB=$GLIB_LINKFLAG\""
-    
-
 fi
 if [ "$CFG_GIF" = "no" ]; then
     QMAKE_CONFIG="$QMAKE_CONFIG no-gif"
-- 
cgit v1.2.3