Check for hildon-help and conic

diff --git a/configure.ac b/configure.ac
index 82e959271612c8b8f990b81da38ab3bfc28c562e..508ba67fe79c64bc019b5938fc7e70fb4bc09fbd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -115,7 +115,7 @@ if test "x$HAVE_HILDON" = "xyes"; then
  AC_SUBST(HILDON_CFLAGS)
  AC_SUBST(HILDON_LIBS)
 
- PKG_CHECK_MODULES(OSSO, libosso >= 1 osso-ic, HAVE_OSSO=yes, HAVE_OSSO=no)
+ PKG_CHECK_MODULES(OSSO, libosso >= 1, HAVE_OSSO=yes, HAVE_OSSO=no)
  if test "x$HAVE_OSSO" = "xyes"; then
   AC_DEFINE(WITH_OSSO, 1, [build with Nokia osso])
   AC_SUBST(OSSO_LIBS)
@@ -124,6 +124,16 @@ if test "x$HAVE_HILDON" = "xyes"; then
   AC_MSG_RESULT(no)
  fi
 
+ PKG_CHECK_MODULES(CONIC, conic, CONIC=yes, CONIC=no)
+ if test "x$CONIC" = "xyes"; then
+  AC_DEFINE(CONIC, 1, [build with Nokia Internet Connectivity library])
+  AC_SUBST(CONIC_LIBS)
+  AC_SUBST(CONIC_CFLAGS)
+ else
+  AC_MSG_RESULT(no)
+ fi
+
+ if test "x$CONIC" = "xno"; then
  PKG_CHECK_MODULES(OSSO_IC, osso-ic, HAVE_OSSO_IC=yes, HAVE_OSSO_IC=no)
  if test "x$HAVE_OSSO_IC" = "xyes"; then
   AC_DEFINE(WITH_OSSO_IC, 1, [build with Nokia osso ic])
@@ -132,19 +142,31 @@ if test "x$HAVE_HILDON" = "xyes"; then
  else
   AC_MSG_RESULT(no)
  fi
+ fi
 
+ PKG_CHECK_MODULES(HILDON_HELP, hildon-help, HAVE_HILDON_HELP=yes, HAVE_HILDON_HELP=no)
+ if test "x$HAVE_HILDON_HELP" = "xyes"; then
+  AC_DEFINE(WITH_HILDON_HELP, 1, [build with Nokia hildon help (new)])
+  AC_SUBST(HILDON_HELP_LIBS)
+  AC_SUBST(HILDON_HELP_CFLAGS)
+ else
+  AC_MSG_RESULT(no)
+ fi
+
+ if test "x$HAVE_HILDON_HELP" = "xno"; then
  PKG_CHECK_MODULES(OSSO_HELP, libossohelp, HAVE_OSSO_HELP=yes, HAVE_OSSO_HELP=no)
- if test "x$HAVE_OSSO" = "xyes"; then
-  AC_DEFINE(WITH_OSSO_HELP, 1, [build with Nokia osso help])
+ if test "x$HAVE_OSSO_HELP" = "xyes"; then
+  AC_DEFINE(WITH_OSSO_HELP, 1, [build with Nokia osso help (old)])
   AC_SUBST(OSSO_HELP_LIBS)
   AC_SUBST(OSSO_HELP_CFLAGS)
  else
   AC_MSG_RESULT(no)
  fi
+ fi
 
  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_DEFINE(WITH_HILDONFM, 1, [build with Hildon Filemanager])
   AC_SUBST(HILDONFM_LIBS)
   AC_SUBST(HILDONFM_CFLAGS)
  else