[GNUnet-SVN] r4842 - Extractor

[gnunet]

Author: durner
Date: 2007-05-28 15:56:11 -0600 (Mon, 28 May 2007)
New Revision: 4842

Modified:
   Extractor/configure.ac
Log:
use gnunet-qt's Qt detection

Modified: Extractor/configure.ac
===================================================================
--- Extractor/configure.ac      2007-05-28 21:55:12 UTC (rev 4841)
+++ Extractor/configure.ac      2007-05-28 21:56:11 UTC (rev 4842)
@@ -283,28 +283,35 @@
       no)
         ;;
       yes)
-        AC_CHECK_HEADERS(qpixmap.h,
+        AC_CHECK_HEADERS([Qt/qpixmap.h],
           AC_CHECK_LIB([QtGui4], [_ZN7QPixmap12defaultDepthEv],
-            qt=1, [AC_CHECK_LIB([QtGui], [_ZN7QPixmap12defaultDepthEv],
-                   qt=1)]))
+            qt=1,
+              AC_CHECK_LIB([QtGui], [_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,
+        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, [AC_CHECK_LIB([QtGui], [_ZN7QPixmap12defaultDepthEv],
-                   EXT_LIB_PATH="-L$with_qt/lib $EXT_LIB_PATH"
-                   qt=1)]))
+            qt=1,
+              AC_CHECK_LIB([QtGui], [_ZN7QPixmap12defaultDepthEv],
+              EXT_LIB_PATH="-L$with_qt/lib $EXT_LIB_PATH"
+              qt=1)))
         ;;
     esac
    ],
    [AC_MSG_RESULT([--with-qt not specified])
-    AC_CHECK_HEADERS(qpixmap.h,
-     AC_CHECK_LIB([QtGui4], [_ZN7QPixmap12defaultDepthEv],
-      qt=1, [AC_CHECK_LIB([QtGui], [_ZN7QPixmap12defaultDepthEv],
-             qt=1)]))])
+    LDFLAGS="-L/usr/lib $LDFLAGS"
+    CPPFLAGS="-I/usr/include -I/usr/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,
+              AC_CHECK_LIB([QtGui], [_ZN7QPixmap12defaultDepthEv],
+              EXT_LIB_PATH="-L$with_qt/lib $EXT_LIB_PATH"
+              qt=1)))])
 
 # check for Qt SVG module
 qt_svg=0