[poppler] Branch 'poppler-0.12' - m4/qt.m4

Albert Astals Cid aacid at kemper.freedesktop.org
Sun Sep 27 08:19:59 PDT 2009


 m4/qt.m4 |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 119c1ec73644ac7b90ba404b93e94bf673d18888
Author: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
Date:   Sun Sep 27 17:17:32 2009 +0200

    Fix the linking not to use the .so directly but the lib
    
    Fixes check on cygwin

diff --git a/m4/qt.m4 b/m4/qt.m4
index c309e75..8de2628 100644
--- a/m4/qt.m4
+++ b/m4/qt.m4
@@ -69,7 +69,7 @@ if test "x$have_qt" = "xyes"; then
     save_CXXFLAGS=$CXXFLAGS
     save_LIBS=$LIBS
     CXXFLAGS="$CXXFLAGS -I$qt_incdir"
-    LIBS="$LIBS $qt_libdir/$qt_test_library"
+    LIBS="$LIBS -L$qt_libdir -lqt-mt"
     AC_MSG_CHECKING([if Qt needs -pthread])
     AC_TRY_LINK([#include <qt.h>], [QString s;], [pthread_needed=no], [pthread_needed=yes])
     if test "x$pthread_needed" = "xyes"; then
@@ -89,7 +89,7 @@ if test "x$have_qt" = "xyes"; then
     fi
 
     $1[]_CXXFLAGS="-I$qt_incdir"
-    $1[]_LIBS="$qtpthread $qt_libdir/$qt_test_library"
+    $1[]_LIBS="$qtpthread -L$qt_libdir -lqt-mt"
     ifelse([$2], , :, [$2])
 else
     ifelse([$3], , [AC_MSG_FAILURE(dnl


More information about the poppler mailing list