diff options
author | Kjartan Maraas <kmaraas@gnome.org> | 2002-05-27 15:45:26 +0000 |
---|---|---|
committer | Kjartan Maraas <kmaraas@src.gnome.org> | 2002-05-27 15:45:26 +0000 |
commit | b0af92b1d8ee22c0b3de73cc1f2d7a782d5f8eba (patch) | |
tree | 8aaa93e63b60976a7f933911084a1861013b8ae9 | |
parent | 068c16b162d1de093e7c930b227788b73c3b1c3a (diff) | |
download | metacity-b0af92b1d8ee22c0b3de73cc1f2d7a782d5f8eba.tar.gz |
Hook up intltoolize here. Initialize intltool. Add this. Add this too Hook
2002-05-27 Kjartan Maraas <kmaraas@gnome.org>
* autogen.sh: Hook up intltoolize here.
* configure.in: Initialize intltool.
* src/metacity.schemas.in: Add this.
* src/metacity.desktop.in: Add this too
* src/Makefile.am: Hook up intltool support for .schemas and .desktop.
* Makefile.am: Dist the intltool files.
-rw-r--r-- | .cvsignore | 1 | ||||
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | Makefile.am | 3 | ||||
-rwxr-xr-x | autogen.sh | 4 | ||||
-rw-r--r-- | configure.in | 1 |
5 files changed, 18 insertions, 1 deletions
@@ -25,3 +25,4 @@ INSTALL intl ABOUT-NLS COPYING +intltool-* @@ -1,3 +1,12 @@ +2002-05-27 Kjartan Maraas <kmaraas@gnome.org> + + * autogen.sh: Hook up intltoolize here. + * configure.in: Initialize intltool. + * src/metacity.schemas.in: Add this. + * src/metacity.desktop.in: Add this too + * src/Makefile.am: Hook up intltool support for .schemas and .desktop. + * Makefile.am: Dist the intltool files. + 2002-05-27 Anders Carlsson <andersca@gnu.org> * src/themes/Gorilla/metacity-theme-1.xml: Apparently someone @@ -11,6 +20,7 @@ the problem where the spacing between the icon & the title got larger as the fontsize went up. +>>>>>>> 1.269 2002-05-26 Havoc Pennington <hp@pobox.com> * src/themes/Atlanta/metacity-theme-1.xml: totally drop the diff --git a/Makefile.am b/Makefile.am index 6351404f..659611e9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,5 @@ SUBDIRS=src po -EXTRA_DIST=HACKING theme-format.txt metacity.spec +EXTRA_DIST=HACKING theme-format.txt metacity.spec \ + intltool-extract.in intltool-merge.in intltool-update.in @@ -96,6 +96,10 @@ do test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 fi fi + if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then + echo "Running intltoolize..." + intltoolize --force --copy --automake + fi if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then echo "Running libtoolize..." libtoolize --force --copy diff --git a/configure.in b/configure.in index c8eaa54a..0b58b2e7 100644 --- a/configure.in +++ b/configure.in @@ -14,6 +14,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE") AM_MAINTAINER_MODE +AC_PROG_INTLTOOL([0.21]) AC_PROG_CC AC_ISC_POSIX AC_HEADER_STDC |