Start to port to Chinook. Check separately for libossohelp and osso-ic.

diff --git a/configure.ac b/configure.ac
index e778109ba81cb1b4eee22ab44afefcb6c6eecb6f..82e959271612c8b8f990b81da38ab3bfc28c562e 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 libossohelp osso-ic, HAVE_OSSO=yes, HAVE_OSSO=no)
+ PKG_CHECK_MODULES(OSSO, libosso >= 1 osso-ic, 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,24 @@ if test "x$HAVE_HILDON" = "xyes"; then
   AC_MSG_RESULT(no)
  fi
 
+ 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])
+  AC_SUBST(OSSO_IC_LIBS)
+  AC_SUBST(OSSO_IC_CFLAGS)
+ else
+  AC_MSG_RESULT(no)
+ fi
+
+ 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])
+  AC_SUBST(OSSO_HELP_LIBS)
+  AC_SUBST(OSSO_HELP_CFLAGS)
+ else
+  AC_MSG_RESULT(no)
+ 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])