[maemo-commits] [maemo-commits] r9813 - in projects/haf/branches/hildon-control-panel/refactoring: . src

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-02-13 14:05:34 +0200 (Tue, 13 Feb 2007)
New Revision: 9813

Modified:
   projects/haf/branches/hildon-control-panel/refactoring/ChangeLog
   projects/haf/branches/hildon-control-panel/refactoring/configure.ac
   projects/haf/branches/hildon-control-panel/refactoring/src/Makefile.am
Log:
2007-02-13  Lucas Rocha  <lucas.rocha at nokia.com>

	* configure.ac: remove gtkhtml dependency and add gconf dependency
	checks.


Modified: projects/haf/branches/hildon-control-panel/refactoring/ChangeLog
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/ChangeLog	2007-02-13 11:38:44 UTC (rev 9812)
+++ projects/haf/branches/hildon-control-panel/refactoring/ChangeLog	2007-02-13 12:05:34 UTC (rev 9813)
@@ -1,3 +1,8 @@
+2007-02-13  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* configure.ac: remove gtkhtml dependency and add gconf dependency
+	checks.
+
 2007-01-04  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/hcp-window.c: removed fullscreen support as it's not on UI spec.

Modified: projects/haf/branches/hildon-control-panel/refactoring/configure.ac
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/configure.ac	2007-02-13 11:38:44 UTC (rev 9812)
+++ projects/haf/branches/hildon-control-panel/refactoring/configure.ac	2007-02-13 12:05:34 UTC (rev 9813)
@@ -21,23 +21,24 @@
 
 AC_HEADER_STDC
 
-ALL_LINGUAS="en_GB"
-AC_SUBST(ALL_LINGUAS)
-AM_GLIB_GNU_GETTEXT
-
-if test foobar${hildon_use_debug} = foobaryes 
+if test "x${hildon_use_debug}" = "xyes"
 then
     CFLAGS="$CFLAGS -ggdb -O0 -DDEBUG"
 else
     CFLAGS="$CFLAGS -O2"
 fi
 
-# D-BUS headers do not compile with -pedantic. Once they are fixed, 
-#return the flag
-#CFLAGS="$CFLAGS -Wall -ansi -pedantic -Wmissing-prototypes -Wmissing-declarations -Werror" 
 CFLAGS="$CFLAGS -Wall -ansi -Wmissing-prototypes -Wmissing-declarations -Werror -lcrypt" 
 AC_SUBST(CFLAGS)
 
+ALL_LINGUAS="en_GB"
+AC_SUBST(ALL_LINGUAS)
+AM_GLIB_GNU_GETTEXT
+
+PKG_CHECK_MODULES(OSSOSETTINGS, osso-af-settings >= 0.8.1)
+localedir=`pkg-config osso-af-settings --variable=localedir`
+AC_SUBST(localedir)
+
 PKG_CHECK_MODULES(HILDONFM, hildon-fm)
 AC_SUBST(HILDONFM_LIBS)
 AC_SUBST(HILDONFM_CFLAGS)
@@ -54,20 +55,17 @@
 AC_SUBST(HILDONBASELIB_LIBS)
 AC_SUBST(HILDONBASELIB_CFLAGS)
 
-PKG_CHECK_MODULES(HTML, libgtkhtml-3.8)
-AC_SUBST(HTML_LIBS)
-AC_SUBST(HTML_CFLAGS)
-
-PKG_CHECK_MODULES(OSSOSETTINGS, osso-af-settings >= 0.8.1)
-localedir=`pkg-config osso-af-settings --variable=localedir`
-AC_SUBST(localedir)
-hildondesktopentrydir=`pkg-config osso-af-settings --variable=desktopentrydir`
-AC_SUBST(hildondesktopentrydir)
-
 PKG_CHECK_MODULES(LIBOSSOHELP, libossohelp >= 0.0.4)
 AC_SUBST(LIBOSSOHELP)
 AC_SUBST(LIBOSSOHELP_CFLAGS)
 
+PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.6.2)
+AC_SUBST(GCONF_LIBS)
+AC_SUBST(GCONF_CFLAGS)
+
+hildondesktopentrydir=`pkg-config osso-af-settings --variable=desktopentrydir`
+AC_SUBST(hildondesktopentrydir)
+
 desktopentrydir=${datadir}/applications
 hildoncpdesktopentrydir=${desktopentrydir}/hildon-control-panel
 hildoncplibdir=${libdir}/hildon-control-panel

Modified: projects/haf/branches/hildon-control-panel/refactoring/src/Makefile.am
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/src/Makefile.am	2007-02-13 11:38:44 UTC (rev 9812)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/Makefile.am	2007-02-13 12:05:34 UTC (rev 9813)
@@ -24,7 +24,7 @@
 	$(MAEMO_LAUNCHER_CFLAGS) \
 	$(OSSO_CFLAGS)\
 	$(LIBOSSOHELP_CFLAGS) \
-	$(HTML_CFLAGS)\
+	$(GCONF_CFLAGS) \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DPREFIXDIR=\"$(prefix)\" \
 	-DCONTROLPANEL_ENTRY_DIR=\"$(hildoncpdesktopentrydir)\" \
@@ -66,7 +66,7 @@
 
 controlpanel_LDADD = \
 	$(HILDON_LIBS) $(HILDONBASELIB_LIBS) $(OSSO_LIBS)\
-	$(LIBOSSOHELP_LIBS)  $(HTML_LIBS) $(HILDONFM_LIBS)
+	$(LIBOSSOHELP_LIBS)  $(GCONF_LIBS) $(HILDONFM_LIBS)
 
 hildon_cp_pluginincludeinstdir=$(includedir)/hildon-cp-plugin
 hildon_cp_pluginincludeinst_DATA = hildon-cp-plugin-interface.h