diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | capplet/Makefile.am | 1 | ||||
| -rw-r--r-- | configure.in | 18 | ||||
| -rw-r--r-- | po/LINGUAS | 30 | ||||
| -rw-r--r-- | test/Makefile.am | 1 |
5 files changed, 47 insertions, 9 deletions
@@ -1,3 +1,9 @@ +2007-06-22 svu + + * test/Makefile.am, configure.in, capplet/Makefile.am, po/LINGUAS: use + po/LINGUAS, upgrade automake requirement, closing + http://bugzilla.gnome.org/show_bug.cgi?id=450141 + 2007-06-21 svu * configure.in, libgnomekbdui.pc.in, libgnomekbd.pc.in: improving diff --git a/capplet/Makefile.am b/capplet/Makefile.am index e099f66..3b192b0 100644 --- a/capplet/Makefile.am +++ b/capplet/Makefile.am @@ -22,6 +22,7 @@ gkbd_indicator_plugins_capplet_CFLAGS = \ -DGLADEDIR=\"$(gladedir)\" \ -DDATADIR=\"$(datadir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ -DLIBDIR=\"$(libdir)\" gkbd_indicator_plugins_capplet_SOURCES = gkbd-indicator-plugins-capplet.c \ diff --git a/configure.in b/configure.in index fbb14a7..6df76ab 100644 --- a/configure.in +++ b/configure.in @@ -8,7 +8,7 @@ VERSION_INFO=1:0:0 AC_SUBST(VERSION_INFO) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(1.8) +AM_INIT_AUTOMAKE([1.9]) AC_CONFIG_MACRO_DIR(m4) dnl *************************************************************************** @@ -36,9 +36,7 @@ AC_SUBST([LIBXKLAVIER_REQUIRED]) dnl *************************************************************************** -AM_MAINTAINER_MODE - -AC_PROG_INTLTOOL +GNOME_COMMON_INIT GNOME_COMPILE_WARNINGS AC_ISC_POSIX @@ -46,15 +44,19 @@ AC_PROG_CC AC_STDC_HEADERS AM_PROG_LIBTOOL +# **** +# i18n +# **** + GETTEXT_PACKAGE=libgnomekbd AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package]) -ALL_LINGUAS="ar be@latin bg bn_IN ca da dz en_GB el es et fr gl gu hu it ja ko lt mk nb pa pt pt_BR sv ru uk" - AM_GLIB_GNU_GETTEXT -GLIB_DEFINE_LOCALEDIR(GNOMELOCALEDIR) +IT_PROG_INTLTOOL([0.35.0]) + +# ***************************************************************************** AC_CHECK_FUNCS(setlocale) @@ -116,5 +118,3 @@ test/Makefile capplet/Makefile capplet/gkbd-indicator-plugins-capplet.desktop.in ]) - - diff --git a/po/LINGUAS b/po/LINGUAS new file mode 100644 index 0000000..2304427 --- /dev/null +++ b/po/LINGUAS @@ -0,0 +1,30 @@ +ar +be@latin +bg +bn_IN +ca +da +dz +el +en_GB +es +et +fr +gl +gu +hu +it +ja +ko +lt +mk +nb +oc +pa +pt +pt_BR +ru +si +sv +uk +zh_CN diff --git a/test/Makefile.am b/test/Makefile.am index d0fb49b..aa0d3b0 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -22,6 +22,7 @@ gkbd_indicator_test_CFLAGS= \ -I$(top_srcdir)/intl \ -DSYS_PLUGIN_DIR=\"$(libdir)/gnomekbd/\" \ -DG_LOG_DOMAIN=\"GnomeKbdIndicatorTest\" \ + -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ -DDATADIR=\"$(datadir)\" gkbd_indicator_test_LDFLAGS= \ |