From: Kaj-Michael Lang <milang@angel.tal.org>
Date: Sat, 4 Aug 2007 08:56:20 +0000 (+0300)
Subject: Check separately for hildon-fm
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62fbc8df8d3fc7754b14592a06a6f4474ba4da70;p=mapper

Check separately for hildon-fm
---

diff --git a/configure.ac b/configure.ac
index 50c51b9..a1d2e32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,6 +45,10 @@ AC_SUBST(GLIBGTK_CFLAGS)
 dnl Ckeck for hildon-libs
 PKG_CHECK_MODULES(HILDON, hildon-libs, HAVE_HILDON=yes, HAVE_HILDON=no)
 
+if test "x$HAVE_HILDON" = "xno"; then
+ PKG_CHECK_MODULES(HILDON, hildon-1, HAVE_HILDON=yes, HAVE_HILDON=no)
+fi
+
 if test "x$HAVE_HILDON" = "xyes"; then
   AC_DEFINE(WITH_HILDON, 1, [build with Maemo/Hildon user interface])
 else
@@ -65,9 +69,14 @@ if test "x$HAVE_HILDON" = "xyes"; then
   AC_MSG_RESULT(no)
  fi
 
- PKG_CHECK_MODULES(HILDON, hildon-libs >= 0.9.50 hildon-fm)
- AC_SUBST(HILDON_LIBS)
- AC_SUBST(HILDON_CFLAGS)
+ PKG_CHECK_MODULES(HILDONFM, hildon-fm, HAVE_HILDONFM=yes, HAVE_HILDONFM=no)
+ if test "x$HAVE_OSSO" = "xyes"; then
+  AC_DEFINE(WITH_HILDONFM, 1, [build with Hildon filemanager])
+  AC_SUBST(HILDONFM_LIBS)
+  AC_SUBST(HILDONFM_CFLAGS)
+ else
+  AC_MSG_RESULT(no)
+ fi
 fi
 
 AM_CONDITIONAL(WITH_HILDON, test "x$HAVE_HILDON" = "xyes")