[GNUnet-SVN] r8201 - gnunet-qt

[gnunet]

Author: durner
Date: 2009-02-07 04:40:20 -0700 (Sat, 07 Feb 2009)
New Revision: 8201

Modified:
   gnunet-qt/configure.ac
Log:
check for LE first

Modified: gnunet-qt/configure.ac
===================================================================
--- gnunet-qt/configure.ac      2009-02-06 16:55:10 UTC (rev 8200)
+++ gnunet-qt/configure.ac      2009-02-07 11:40:20 UTC (rev 8201)
@@ -159,6 +159,34 @@
 # test for qmake (FIXME: do we still need qmake!?? -- how about checking for 
moc?
 AC_CHECK_PROG([QMAKE], [qmake-qt4], [qmake-qt4], [qmake])
 
+# test for libextractor
+extractor=0
+AC_MSG_CHECKING(for libextractor)
+AC_ARG_WITH(extractor,
+   [  --with-extractor=PFX    Base of libextractor installation],
+   [AC_MSG_RESULT([$with_extractor])
+    case $with_extractor in
+      no)
+        ;;
+      yes)
+        AC_CHECK_HEADERS(extractor.h,extractor=1)
+        ;;
+      *)
+       LDFLAGS="-L$with_extractor/lib $LDFLAGS"
+       LIBPATH="$with_extractor/lib $LIBPATH"
+        CPPFLAGS="-I$with_extractor/include $CPPFLAGS"
+        INCLUDEPATH="$with_extractor/include  $INCLUDEPATH"
+        AC_CHECK_HEADERS(extractor.h,extractor=1)
+        ;;
+    esac
+   ],
+   [AC_MSG_RESULT([--with-extractor not specified])
+    AC_CHECK_HEADERS(extractor.h,extractor=1)])
+if test "$extractor" != 1
+then
+ AC_MSG_ERROR([gnunet-qt requires libextractor headers])
+fi
+
 # test for GNUnet core
 gnunet=0
 AC_MSG_CHECKING(for GNUnet core)
@@ -207,34 +235,6 @@
              AC_MSG_ERROR([gnunet-qt requires libgnunetstats_api]))
 LIBS=$SAVELIBS
 
-# test for libextractor
-extractor=0
-AC_MSG_CHECKING(for libextractor)
-AC_ARG_WITH(extractor,
-   [  --with-extractor=PFX    Base of libextractor installation],
-   [AC_MSG_RESULT([$with_extractor])
-    case $with_extractor in
-      no)
-        ;;
-      yes)
-        AC_CHECK_HEADERS(extractor.h,extractor=1)
-        ;;
-      *)
-       LDFLAGS="-L$with_extractor/lib $LDFLAGS"
-       LIBPATH="$with_extractor/lib $LIBPATH"
-        CPPFLAGS="-I$with_extractor/include $CPPFLAGS"
-        INCLUDEPATH="$with_extractor/include  $INCLUDEPATH"
-        AC_CHECK_HEADERS(extractor.h,extractor=1)
-        ;;
-    esac
-   ],
-   [AC_MSG_RESULT([--with-extractor not specified])
-    AC_CHECK_HEADERS(extractor.h,extractor=1)])
-if test "$extractor" != 1
-then
- AC_MSG_ERROR([gnunet-qt requires libextractor headers])
-fi
-
 # check for Qt 4 (yucky)
 AC_LANG_PUSH([C++])
 AC_MSG_CHECKING(for Qt)