libextractor

commit ec1cf87832feeb03d2bc4a2b810ef62fd970a945
parent 14782ff939ea10cca08906770cfd6bb791344e33
Author: Nils Durner <durner@gnunet.org>
Date:   Mon, 28 May 2007 21:56:11 +0000

use gnunet-qt's Qt detection

Diffstat:
M
configure.ac
 | 
31
+++++++++++++++++++------------

1 file changed, 19 insertions(+), 12 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -283,28 +283,35 @@ AC_ARG_WITH(qt,
       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