[maemo-commits] [maemo-commits] r9234 - in projects/haf/trunk/hildon-fm: . hildon-fm

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-01-22 20:18:42 +0200 (Mon, 22 Jan 2007)
New Revision: 9234

Modified:
   projects/haf/trunk/hildon-fm/configure.ac
   projects/haf/trunk/hildon-fm/hildon-fm/Makefile.am
Log:
	Removed support for Gtk+ 2.6.
	
        * configure.ac: Require Gtk+ 2.10.0.  Do not check for osso-ic, it
	is unused.  Removed --with-gtk-2-10 configure option.  Removed all
	traces of l10n stuff.

	* hildon-fm/Makefile.am (INCLUDES): Do not use OSSOIC_CFLAGS.
	(libhildonfm_la_LDFLAGS): Bumped major version to 2.


Modified: projects/haf/trunk/hildon-fm/configure.ac
===================================================================
--- projects/haf/trunk/hildon-fm/configure.ac	2007-01-22 16:43:23 UTC (rev 9233)
+++ projects/haf/trunk/hildon-fm/configure.ac	2007-01-22 18:18:42 UTC (rev 9234)
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(hildon-fm, 2.1)
+AM_INIT_AUTOMAKE(libhildonfm, 2.1)
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_HOST
@@ -30,7 +30,7 @@
 PKG_CHECK_MODULES(OUTO, outo >= 0.1.1)
 AC_SUBST(OUTO_CFLAGS)
 
-GTK_VERSION=2.6.0
+GTK_VERSION=2.10.0
 
 PKG_CHECK_MODULES(GTK, hildon-libs >= 0.12.0)
 AC_SUBST(GTK_LIBS)
@@ -47,14 +47,10 @@
 AC_SUBST(OSSO_THUMBNAIL_CFLAGS)
 AC_SUBST(OSSO_THUMBNAIL_LIBS)
 
-PKG_CHECK_MODULES(GWCONNECT, gwconnect >= 0.58 osso-ic)
+PKG_CHECK_MODULES(GWCONNECT, gwconnect >= 0.58)
 AC_SUBST(GWCONNECT_CFLAGS)
 AC_SUBST(GWCONNECT_LIBS)
 
-PKG_CHECK_MODULES(OSSOIC, osso-ic)
-AC_SUBST(OSSOIC_CFLAGS)
-AC_SUBST(OSSOIC_LIBS)
-
 PKG_CHECK_MODULES(LIBOSSOMIME, libossomime >= 1.4)
 AC_SUBST(LIBOSSOMIME_CFLAGS)
 AC_SUBST(LIBOSSOMIME_LIBS)
@@ -68,22 +64,9 @@
 PKG_CHECK_MODULES(LIBOSSO, libosso >= 0.8.8)
 AC_SUBST(LIBOSSO_CFLAGS)
 
-# Now also mce has a pkgconfig file.
 PKG_CHECK_MODULES(MCE, mce >= 0.8.5)
 AC_SUBST(MCE_CFLAGS)
 
-ALL_LINGUAS="en_GB"
-AC_SUBST(ALL_LINGUAS)
-AM_GLIB_GNU_GETTEXT
-
-# Temporary configure option for the Gtk+ migration
-
-AC_ARG_WITH(gtk-2-10, [  --with-gtk-2-10         compile for Gtk+ 2.10 instead of 2.6 ])
-
-if test "x$with_gtk_2_10" = "xyes" ; then
-  AC_DEFINE(WITH_GTK_2_10, 1, [Define when compiling for Gtk+ 2.10])
-fi
-
 ##################################################
 # Check for gtk-doc.
 ##################################################
@@ -128,7 +111,6 @@
 
 AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
 
-localedir=${datadir}/locale
 outomoduledir=${libdir}/outo
 
 AC_ARG_ENABLE(doc-dir, [ --with-doc-dir=PATH path to installed docs ])
@@ -141,7 +123,6 @@
 HTML_DIR=${docdir}/html
 
 AC_SUBST(docdir)
-AC_SUBST(localedir)
 AC_SUBST(outomoduledir)
 AC_SUBST(HTML_DIR)
 
@@ -169,7 +150,5 @@
 AC_OUTPUT(Makefile \
         hildon-fm/Makefile \
 	ut/Makefile \
-	po/Makefile \
-	po/porules.mk \
 	doc/Makefile \
 	hildon-fm.pc)

Modified: projects/haf/trunk/hildon-fm/hildon-fm/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/Makefile.am	2007-01-22 16:43:23 UTC (rev 9233)
+++ projects/haf/trunk/hildon-fm/hildon-fm/Makefile.am	2007-01-22 18:18:42 UTC (rev 9234)
@@ -1,6 +1,6 @@
 
 INCLUDES = $(GTK_CFLAGS) $(GCONF_CFLAGS) $(OSSO_THUMBNAIL_CFLAGS)	\
-	   $(GWCONNECT_CFLAGS) $(OSSOIC_CFLAGS) $(DBUSGLIB_CFLAGS)	\
+	   $(GWCONNECT_CFLAGS) $(DBUSGLIB_CFLAGS)			\
            $(LIBOSSO_CFLAGS)						\
            $(MCE_CFLAGS) -DLOCALEDIR=\"$(localedir)\"			\
            $(LIBOSSOMIME_CFLAGS) -I$(srcdir)/..				\
@@ -17,7 +17,7 @@
 libhildonfm_la_LIBADD = $(GTK_LIBS) $(GCONF_LIBS) $(OSSO_THUMBNAIL_LIBS) \
 	$(GWCONNECT_LIBS) $(DBUSGLIB_LIBS) $(LIBOSSOMIME_LIBS)
 
-libhildonfm_la_LDFLAGS = -version-info 1:0:0
+libhildonfm_la_LDFLAGS = -version-info 2:0:0
 libhildonfm_la_SOURCES =			\
 	hildon-file-common-private.h		\
 	hildon-file-selection.c			\