[GNUnet-SVN] r3087 - gnunet-qt

[durner]

Author: durner
Date: 2006-07-03 12:37:56 -0700 (Mon, 03 Jul 2006)
New Revision: 3087

Modified:
   gnunet-qt/configure.ac
Log:
Debian fixes

Modified: gnunet-qt/configure.ac
===================================================================
--- gnunet-qt/configure.ac      2006-07-03 18:04:55 UTC (rev 3086)
+++ gnunet-qt/configure.ac      2006-07-03 19:37:56 UTC (rev 3087)
@@ -126,17 +126,22 @@
       no)
         ;;
       yes)
-        AC_CHECK_HEADERS(qpixmap.h,
+        AC_CHECK_HEADERS([Qt/qpixmap.h],
           AC_CHECK_LIB([QtGui4], [_ZN7QPixmap12defaultDepthEv],
-            qt=1))
+            qt=1,
+              AC_CHECK_LIB([QtGui4], [_ZN7QPixmap12defaultDepthEv],
+              qt=1)))
         ;;
       *)
-        LDFLAGS="-L$with_qt/lib $LDFLAGS"
-        CPPFLAGS="-I$with_qt/include -I$with_qt/include/Qt $CPPFLAGS"
-        AC_CHECK_HEADERS(qpixmap.h,
+        LDFLAGS="-L$with_qt/lib -L$with_qt/lib/qt4 $LDFLAGS"
+        CPPFLAGS="-I$with_qt/include -I$with_qt/include/qt4 $CPPFLAGS"
+        AC_CHECK_HEADERS([Qt/qpixmap.h],
           AC_CHECK_LIB([QtGui4], [_ZN7QPixmap12defaultDepthEv],
-            EXT_LIB_PATH="-L$with_qt/lib $EXT_LIB_PATH"
-            qt=1))
+            EXT_LIB_PATH="-L$with_qt/lib -L$with_qt/lib/qt4 $EXT_LIB_PATH"
+            qt=1,
+              AC_CHECK_LIB([QtGui], [_ZN7QPixmap12defaultDepthEv],
+              EXT_LIB_PATH="-L$with_qt/lib -L$with_qt/lib/qt4 $EXT_LIB_PATH"
+              qt=1)))
         ;;
     esac
    ],