diff options
| -rw-r--r-- | .cvsignore | 30 | ||||
| -rw-r--r-- | .tm_project2.cache | bin | 52012 -> 0 bytes | |||
| -rw-r--r-- | capplet/.cvsignore | 8 | ||||
| -rw-r--r-- | libgnomekbd/.cvsignore | 12 | ||||
| -rw-r--r-- | m4/intltool.m4 | 39 | ||||
| -rw-r--r-- | po/.cvsignore | 7 | ||||
| -rw-r--r-- | test/.cvsignore | 8 |
7 files changed, 23 insertions, 81 deletions
diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 615898e..0000000 --- a/.cvsignore +++ /dev/null @@ -1,30 +0,0 @@ -COPYING -INSTALL -Makefile -Makefile.in -aclocal.m4 -autom4te.cache -compile -config.guess -config.h -config.h.in -config.log -config.status -config.sub -configure -depcomp -install-sh -intltool-extract -intltool-extract.in -intltool-merge -intltool-merge.in -intltool-update -intltool-update.in -libgnomekbd-0.1.tar.gz -libgnomekbd.pc -libgnomekbdui.pc -libtool -ltmain.sh -missing -mkinstalldirs -stamp-h1 diff --git a/.tm_project2.cache b/.tm_project2.cache Binary files differdeleted file mode 100644 index 35c9d12..0000000 --- a/.tm_project2.cache +++ /dev/null diff --git a/capplet/.cvsignore b/capplet/.cvsignore deleted file mode 100644 index d5ea908..0000000 --- a/capplet/.cvsignore +++ /dev/null @@ -1,8 +0,0 @@ -Makefile -Makefile.in -gkbd-indicator-plugins-capplet -gkbd-indicator-plugins-capplet.desktop -gkbd-indicator-plugins-capplet.desktop.in -.libs -.deps - diff --git a/libgnomekbd/.cvsignore b/libgnomekbd/.cvsignore deleted file mode 100644 index 4ae2094..0000000 --- a/libgnomekbd/.cvsignore +++ /dev/null @@ -1,12 +0,0 @@ -Makefile -Makefile.in -desktop_gnome_peripherals_keyboard_xkb.schemas -gkbd-config-registry-client.h -gkbd-config-registry-server.h -gkbd-indicator-marshal.c -gkbd-indicator-marshal.h -gkbd-keyboard-drawing-marshal.c -gkbd-keyboard-drawing-marshal.h -.libs -.deps - diff --git a/m4/intltool.m4 b/m4/intltool.m4 index 0269f8e..f27ec0f 100644 --- a/m4/intltool.m4 +++ b/m4/intltool.m4 @@ -23,7 +23,7 @@ ## the same distribution terms that you use for the rest of that program. dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 35 IT_PROG_INTLTOOL +# serial 36 IT_PROG_INTLTOOL AC_DEFUN([IT_PROG_INTLTOOL], [AC_PREREQ([2.50])dnl @@ -36,7 +36,7 @@ case "$am__api_version" in esac if test -n "$1"; then - AC_MSG_CHECKING(for intltool >= $1) + AC_MSG_CHECKING([for intltool >= $1]) INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` @@ -65,6 +65,7 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcar INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' AC_SUBST(INTLTOOL_DESKTOP_RULE) AC_SUBST(INTLTOOL_DIRECTORY_RULE) @@ -84,6 +85,21 @@ AC_SUBST(INTLTOOL_CAVES_RULE) AC_SUBST(INTLTOOL_SCHEMAS_RULE) AC_SUBST(INTLTOOL_THEME_RULE) AC_SUBST(INTLTOOL_SERVICE_RULE) +AC_SUBST(INTLTOOL_POLICY_RULE) + +# Check the gettext tools to make sure they are GNU +AC_PATH_PROG(XGETTEXT, xgettext) +AC_PATH_PROG(MSGMERGE, msgmerge) +AC_PATH_PROG(MSGFMT, msgfmt) +if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +fi +xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" +mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" +mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" +if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +fi # Use the tools built into the package, not the ones that are installed. AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') @@ -106,19 +122,16 @@ if test "x$2" != "xno-xml"; then fi fi -AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv) -AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt) -AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge) -AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext) - # Substitute ALL_LINGUAS so we can use it in po/Makefile AC_SUBST(ALL_LINGUAS) # Set DATADIRNAME correctly if it is not set yet # (copied from glib-gettext.m4) if test -z "$DATADIRNAME"; then - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[]], + [[extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr]])], [DATADIRNAME=share], [case $host in *-*-solaris*) @@ -159,10 +172,6 @@ AC_CONFIG_COMMANDS([intltool], [ for file in intltool-extract intltool-merge intltool-update; do sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ - -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \ - -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \ - -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \ - -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \ -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ < ${ac_aux_dir}/${file}.in > ${file}.out if cmp -s ${file} ${file}.out 2>/dev/null; then @@ -177,9 +186,7 @@ done ], [INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" -INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}' -INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}' -INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}']) +INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}']) ]) diff --git a/po/.cvsignore b/po/.cvsignore deleted file mode 100644 index d175319..0000000 --- a/po/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -Makefile -Makefile.in -Makefile.in.in -POTFILES -*.gmo -stamp-it -.intltool-merge-cache diff --git a/test/.cvsignore b/test/.cvsignore deleted file mode 100644 index eb8ffe0..0000000 --- a/test/.cvsignore +++ /dev/null @@ -1,8 +0,0 @@ -Makefile -Makefile.in -gkbd-config-registry-server -gkbd-indicator-test -gkbd-keyboard-drawing-test -.libs -.deps - |