From: Alsor Zhou Date: Thu, 22 Oct 2009 08:59:27 +0000 (+0800) Subject: Add gtk-immodule support in configure.ac X-Git-Url: http://git.maemo.org/git/?p=mim;a=commitdiff_plain;h=99ee6f5f7a9b6607a8d424f83bcbd793e50e91aa Add gtk-immodule support in configure.ac Turn off -Werror, to prevent gtkimmodule global function missing warning to error, pass build --- diff --git a/configure.ac b/configure.ac index dac2270..f90c8ae 100644 --- a/configure.ac +++ b/configure.ac @@ -9,6 +9,7 @@ AC_PROG_CC AM_PROG_CC_STDC AC_HEADER_STDC AM_PROG_LIBTOOL +AC_CHECK_PROGS([GTK_QUERY_IMMODULES], [gtk-query-immodules-2.0]) AC_CONFIG_MACRO_DIR(m4) @@ -61,8 +62,9 @@ if test "x$LD_DMALLOC_FLAGS" = "x"; then else AC_MSG_RESULT($LD_DMALLOC_FLAGS) fi - -CFLAGS="$CFLAGS -DGCONF_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -Wall -Werror -Wmissing-declarations -Wmissing-prototypes" +dnl Turn off -Werror, prevent gtkimmodule global function missing warning to error +dnl CFLAGS="$CFLAGS -DGCONF_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -Wall -Werror -Wmissing-declarations -Wmissing-prototypes" +CFLAGS="$CFLAGS -DGCONF_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -Wall -Wno-error -Wmissing-declarations -Wmissing-prototypes" GTK_DOC_CHECK(1.5) @@ -129,13 +131,9 @@ dnl Packages and versions to be checked PKG_CHECK_MODULES(PACKAGE, [ dbus-glib-1 >= 0.61 hildon-1 - gtk+-2.0 -]) - -dnl Messaging ui lib specific -PKG_CHECK_MODULES(RTCOM_MSG_UI, [ gconf-2.0 ]) +PKG_CHECK_MODULES(GTK, [gtk+-2.0 pango]) dnl hildonmime PKG_CHECK_MODULES(HILDONMIME, [ @@ -168,6 +166,8 @@ AC_OUTPUT([ Makefile m4/Makefile src/Makefile + src/mim/Makefile + src/ui/Makefile util/Makefile data/Makefile data/org.ifanr.MiM.service