[Turqstat-commits] [SCM] Turquoise SuperStat - http://www.softwolves.pp.se/sw/software/turquoise branch, xturqstat-win32, updated. release-3.0-2-16-g60148a3

[Peter Karlsson]

The following commit has been merged in the xturqstat-win32 branch:
commit 7af4533a58193dd1dcab0362073590c77a18cb9c
Author: Peter Karlsson <peter at softwolves.pp.se>
Date:   Wed Mar 26 11:04:02 2008 +0100

    Fixed autoconf Qt4 library detection in.

diff --git a/ChangeLog b/ChangeLog
index 509d929..e36e4e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-26 - Peter Karlsson <peter at softwolves.pp.se>
+  configure.in
+    Fixes for Qt 4.
+
 2008-03-24 - Peter Karlsson <peter at softwolves.pp.se>
   Makefile.in
   configure.in
diff --git a/configure b/configure
index 89df02c..0e8eb6f 100755
--- a/configure
+++ b/configure
@@ -8602,21 +8602,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
   QTLIB=""
   for lib in QtCore QtGui; do
-    if test "$lib" = QtCore; then
-      symbol=QEventLoop
-    elif test "$lib" = QtGui; then
-      symbol=QWidget
-    fi
-
     ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-    as_ac_Lib=`echo "ac_cv_lib_$lib''_$symbol" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $symbol in -l$lib" >&5
-echo $ECHO_N "checking for $symbol in -l$lib... $ECHO_C" >&6; }
+    as_ac_Lib=`echo "ac_cv_lib_$lib''_main" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for main in -l$lib" >&5
+echo $ECHO_N "checking for main in -l$lib... $ECHO_C" >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -8629,17 +8623,11 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $symbol ();
+
 int
 main ()
 {
-return $symbol ();
+return main ();
   ;
   return 0;
 }
diff --git a/configure.in b/configure.in
index c5f3358..64ada17 100644
--- a/configure.in
+++ b/configure.in
@@ -438,14 +438,8 @@ dnl Check Qt version
 dnl Locate Qt libraries
   QTLIB=""
   for lib in QtCore QtGui; do
-    if test "$lib" = QtCore; then
-      symbol=QEventLoop
-    elif test "$lib" = QtGui; then
-      symbol=QWidget
-    fi
-
     AC_LANG_CPLUSPLUS
-    AC_CHECK_LIB($lib, $symbol, QTLIBTHIS="-l$lib")
+    AC_CHECK_LIB($lib, main, QTLIBTHIS="-l$lib")
     AC_LANG_C
     if test "$QTLIBTHIS" = ""; then
       AC_MSG_CHECKING(for $lib library path)

-- 
Turquoise SuperStat - http://www.softwolves.pp.se/sw/software/turquoise