Some more osso/hildon config changes

diff --git a/configure.ac b/configure.ac
index 00cd91f30a73754d02aabf0d46defe92a7f508ca..be0726a4e31523c4e5457cd65d5b9181ff3be61f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -124,6 +124,8 @@ if test "x$HAVE_HILDON" = "xyes"; then
   AC_MSG_RESULT(no)
  fi
 
+ if test "x$HAVE_OSSO" = "xyes"; then
+
  PKG_CHECK_MODULES(CONIC, conic, CONIC=yes, CONIC=no)
  if test "x$CONIC" = "xyes"; then
   AC_DEFINE(WITH_CONIC, 1, [build with Nokia Internet Connectivity library])
@@ -131,17 +133,14 @@ if test "x$HAVE_HILDON" = "xyes"; then
   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])
-  AC_SUBST(OSSO_IC_LIBS)
-  AC_SUBST(OSSO_IC_CFLAGS)
- else
-  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
  fi
 
  PKG_CHECK_MODULES(HILDON_HELP, hildon-help, HAVE_HILDON_HELP=yes, HAVE_HILDON_HELP=no)
@@ -151,35 +150,34 @@ if test "x$HAVE_HILDON" = "xyes"; then
   AC_SUBST(HILDON_HELP_CFLAGS)
  else
   AC_MSG_RESULT(no)
+  PKG_CHECK_MODULES(OSSO_HELP, libossohelp, HAVE_OSSO_HELP=yes, HAVE_OSSO_HELP=no)
+  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
 
- 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_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
+ # libosso
  fi
 
- PKG_CHECK_MODULES(HILDONFM1, hildon-fm, HAVE_HILDONFM1=yes, HAVE_HILDONFM1=no)
- if test "x$HAVE_HILDONFM1" = "xyes"; then
+ PKG_CHECK_MODULES(HILDONFM, hildon-fm, HAVE_HILDONFM=yes, HAVE_HILDONFM=no)
+ if test "x$HAVE_HILDONFM" = "xyes"; then
   AC_DEFINE(WITH_HILDONFM, 1, [build with Hildon Filemanager 1])
   AC_SUBST(HILDONFM_LIBS)
   AC_SUBST(HILDONFM_CFLAGS)
  else
   AC_MSG_RESULT(no)
- fi
-
- PKG_CHECK_MODULES(HILDONFM2, hildon-fm-2, HAVE_HILDONFM2=yes, HAVE_HILDONFM2=no)
- if test "x$HAVE_HILDONFM1" = "xyes"; then
-  AC_DEFINE(WITH_HILDONFM, 1, [build with Hildon Filemanager 2])
-  AC_SUBST(HILDONFM_LIBS)
-  AC_SUBST(HILDONFM_CFLAGS)
- else
-  AC_MSG_RESULT(no)
+  PKG_CHECK_MODULES(HILDONFM, hildon-fm-2, HAVE_HILDONFM=yes, HAVE_HILDONFM=no)
+  if test "x$HAVE_HILDONFM" = "xyes"; then
+   AC_DEFINE(WITH_HILDONFM, 1, [build with Hildon Filemanager 2])
+   AC_SUBST(HILDONFM_LIBS)
+   AC_SUBST(HILDONFM_CFLAGS)
+  else
+   AC_MSG_RESULT(no)
+  fi
  fi
 
 fi
@@ -193,8 +191,6 @@ if test "x$ac_cv_libgps" = xyes; then
        AC_DEFINE(WITH_LIBGPS, 1, [build with gpsd])
 fi
 
-AM_CONDITIONAL(WITH_HILDON, test "x$HAVE_HILDON" = "xyes")
-
 PKG_CHECK_MODULES(GEOCLUE, geoclue, HAVE_GEOCLUE=yes, HAVE_GEOCLUE=no)
 
 if test "x$HAVE_GEOCLUE" = "xyes"; then