libextractor

commit 14782ff939ea10cca08906770cfd6bb791344e33
parent 7843df46d2a1d94d147759b3f8517122e4054270
Author: Nils Durner <durner@gnunet.org>
Date:   Mon, 28 May 2007 20:36:33 +0000

trying to fix Qt detection on fedora (Mantis #1168)

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

1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -285,7 +285,8 @@ AC_ARG_WITH(qt,
       yes)
         AC_CHECK_HEADERS(qpixmap.h,
           AC_CHECK_LIB([QtGui4], [_ZN7QPixmap12defaultDepthEv],
-            qt=1))
+            qt=1, [AC_CHECK_LIB([QtGui], [_ZN7QPixmap12defaultDepthEv],
+	            qt=1)]))
         ;;
       *)
         LDFLAGS="-L$with_qt/lib $LDFLAGS"
@@ -293,14 +294,17 @@ AC_ARG_WITH(qt,
         AC_CHECK_HEADERS(qpixmap.h,
           AC_CHECK_LIB([QtGui4], [_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))])
+      qt=1, [AC_CHECK_LIB([QtGui], [_ZN7QPixmap12defaultDepthEv],
+	      qt=1)]))])
 
 # check for Qt SVG module
 qt_svg=0
@@ -314,7 +318,8 @@ AC_ARG_WITH(qt,
       yes)
         AC_CHECK_HEADERS(qsvgrenderer.h,
           AC_CHECK_LIB([QtSvg4], [_ZN10QSvgWidgetD0Ev],
-            qt_svg=1))
+            qt_svg=1, [AC_CHECK_LIB([QtSvg], [_ZN10QSvgWidgetD0Ev],
+	            qt_svg=1)]))
         ;;
       *)
         LDFLAGS="-L$with_qt/lib $LDFLAGS"
@@ -322,14 +327,17 @@ AC_ARG_WITH(qt,
         AC_CHECK_HEADERS(qsvgrenderer.h,
           AC_CHECK_LIB([QtSvg4], [_ZN10QSvgWidgetD0Ev],
             EXT_LIB_PATH="-L$with_qt/lib $EXT_LIB_PATH"
-            qt_svg=1))
+            qt_svg=1, [AC_CHECK_LIB([QtSvg], [_ZN10QSvgWidgetD0Ev],
+	            EXT_LIB_PATH="-L$with_qt/lib $EXT_LIB_PATH"
+	            qt_svg=1)]))
         ;;
     esac
    ],
    [AC_MSG_RESULT([--with-qt not specified])
     AC_CHECK_HEADERS(qsvgrenderer.h,
      AC_CHECK_LIB([QtSvg4], [_ZN10QSvgWidgetD0Ev],
-      qt_svg=1))])
+      qt_svg=1, [AC_CHECK_LIB([QtSvg], [_ZN10QSvgWidgetD0Ev],
+	      qt_svg=1)]))])
 
 AC_MSG_CHECKING([whether to enable xpdf-based extractor])
 AC_ARG_ENABLE(xpdf,