[maemo-commits] [maemo-commits] r10721 - projects/haf/trunk/hildon-desktop

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-03-22 17:07:25 +0200 (Thu, 22 Mar 2007)
New Revision: 10721

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/configure.ac
Log:

2007-03-22  Johan Bilien  <johan.bilien at nokia.com>

	* configure.ac: retrieve home, statusbar and home directories
	from osso-af-settings



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-03-22 13:36:21 UTC (rev 10720)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-03-22 15:07:25 UTC (rev 10721)
@@ -1,5 +1,10 @@
-2007-03-21  Moises Martinez  <moises.martinez at nokia.com>
+2007-03-22  Johan Bilien  <johan.bilien at nokia.com>
 
+	* configure.ac: retrieve home, statusbar and home directories
+	from osso-af-settings
+
+2007-03-22  Moises Martinez  <moises.martinez at nokia.com>
+
 	* src/hn-app-switcher.c: 
 	- Set default no of items to 3.
 	- Bigger main menu button.

Modified: projects/haf/trunk/hildon-desktop/configure.ac
===================================================================
--- projects/haf/trunk/hildon-desktop/configure.ac	2007-03-22 13:36:21 UTC (rev 10720)
+++ projects/haf/trunk/hildon-desktop/configure.ac	2007-03-22 15:07:25 UTC (rev 10721)
@@ -69,9 +69,36 @@
 AC_DEFINE(GETTEXT_PACKAGE, ["maemo-af-desktop"], [Package name for gettext])
 
 PKG_CHECK_MODULES(OSSOSETTINGS, 
-		  [osso-af-settings >= 0.8.1],
-                  localedir=`pkg-config osso-af-settings --variable=localedir`, 
-		  localedir="${datadir}/locale")
+		  [osso-af-settings >= 0.9.0],
+                  [
+                  localedir=`pkg-config osso-af-settings --variable=localedir` 
+                  hildondesktopentrydir=`pkg-config osso-af-settings --variable=desktopentrydir`
+                  hildondesktoplibdir=`pkg-config osso-af-settings --variable=hildondesktoplibdir`
+
+
+                  hildonnavigatordesktopentrydir=`pkg-config osso-af-settings --variable=tasknavigatordesktopentrydir`
+                  hildonhomedesktopentrydir=`pkg-config osso-af-settings --variable=homedesktopentrydir`
+                  hildonstatusbardesktopentrydir=`pkg-config osso-af-settings --variable=statusbardesktopentrydir`,
+                  
+                  hildonnavigatorlibdir=`pkg-config osso-af-settings --variable=legacynavigatorlibdir`
+                  hildonhomelibdir=`pkg-config osso-af-settings --variable=legacyhomelibdir`
+                  hildonstatusbarlibdir=`pkg-config osso-af-settings --variable=legacystatusbarlibdir`
+
+                  ],[
+
+		  localedir="${datadir}/locale"
+                  hildondesktopentrydir="${datadir}/applications"
+                  hildondesktoplibdir="${libdir}/hildon-desktop"
+                  
+                  hildonnavigatordesktopentrydir="${datadir}/applications/hildon-navigator"
+                  hildonhomedesktopentrydir="${datadir}/applications/hildon-home"
+                  hildonstatusbardesktopentrydir="${datadir}/applications/hildon-status-bar"
+
+                  hildonnavigatorlibdir="${libdir}/hildon-navigator"
+                  hildonhomelibdir="${libdir}/hildon-home"
+                  hildonstatusbarlibdir="${libdir}/hildon-status-bar"
+                  ])
+
 AC_SUBST(localedir)
 
 #+++++++++++++++++++++
@@ -152,34 +179,26 @@
 # Directories setup
 #+++++++++++++++++++
 
-hildondesktopentrydir=`pkg-config osso-af-settings --variable=desktopentrydir`
-hildondesktoplibdir=${libdir}/hildon-desktop
 hildondesktopconfdir=${sysconfdir}/hildon-desktop
 AC_SUBST(hildondesktopentrydir)
 AC_SUBST(hildondesktoplibdir)
 AC_SUBST(hildondesktopconfdir)
 
-hildonnavigatordesktopentrydir=${datadir}/applications/hildon-navigator
 # Expand nested variables
 eval "hildonnavigatordesktopentrydir=$hildonnavigatordesktopentrydir"
 eval "hildonnavigatordesktopentrydir=$hildonnavigatordesktopentrydir"
-hildonnavigatorlibdir=${libdir}/hildon-navigator
 AC_SUBST(hildonnavigatordesktopentrydir)
 AC_SUBST(hildonnavigatorlibdir)
 
-hildonhomedesktopentrydir=${datadir}/applications/hildon-home
 # Expand nested variables
 eval "hildonhomedesktopentrydir=$hildonhomedesktopentrydir"
 eval "hildonhomedesktopentrydir=$hildonhomedesktopentrydir"
-hildonhomelibdir=${libdir}/hildon-home
 AC_SUBST(hildonhomedesktopentrydir)
 AC_SUBST(hildonhomelibdir)
 
-hildonstatusbardesktopentrydir=${datadir}/applications/hildon-status-bar
 # Expand nested variables
 eval "hildonstatusbardesktopentrydir=$hildonstatusbardesktopentrydir"
 eval "hildonstatusbardesktopentrydir=$hildonstatusbardesktopentrydir"
-hildonstatusbarlibdir=${libdir}/hildon-status-bar
 AC_SUBST(hildonstatusbardesktopentrydir)
 AC_SUBST(hildonstatusbarlibdir)