summaryrefslogtreecommitdiff
path: root/macros2
diff options
context:
space:
mode:
authorMartin Baulig <baulig@suse.de>2000-07-24 14:57:59 +0000
committerMartin Baulig <martin@src.gnome.org>2000-07-24 14:57:59 +0000
commit718cd7f95168ed3e0a95884c52e3b9f77841ca69 (patch)
tree4a1e5760cd0c6b3f157aa3358a4bebd9defd551d /macros2
parent7c80f5d7dfbf54c1ed432dc7f06dc32d3a0d43ed (diff)
downloadshared-mime-info-718cd7f95168ed3e0a95884c52e3b9f77841ca69.tar.gz
Make it work with AM_GNOME2_GETTEXT. New file.
2000-07-24 Martin Baulig <baulig@suse.de> * autogen.sh: Make it work with AM_GNOME2_GETTEXT. * check-utmp.m4: New file. svn path=/trunk/; revision=1312
Diffstat (limited to 'macros2')
-rw-r--r--macros2/ChangeLog1
-rw-r--r--macros2/Makefile.am2
-rw-r--r--macros2/autogen.sh4
3 files changed, 4 insertions, 3 deletions
diff --git a/macros2/ChangeLog b/macros2/ChangeLog
index 6a0fc356..edd50eb8 100644
--- a/macros2/ChangeLog
+++ b/macros2/ChangeLog
@@ -1,5 +1,6 @@
2000-07-24 Martin Baulig <baulig@suse.de>
+ * autogen.sh: Make it work with AM_GNOME2_GETTEXT.
* check-utmp.m4: New file.
2000-07-24 Martin Baulig <baulig@suse.de>
diff --git a/macros2/Makefile.am b/macros2/Makefile.am
index f40ba187..2b190c4b 100644
--- a/macros2/Makefile.am
+++ b/macros2/Makefile.am
@@ -5,7 +5,7 @@ GNOME2_MACROS= \
gnome-fileutils.m4 gnome-gettext.m4 gnome-gnorba-check.m4 \
gnome-pthread-check.m4 gnome-support.m4 \
gnome-x-checks.m4 gnome.m4 linger.m4 need-declaration.m4 \
- aclocal-include.m4
+ aclocal-include.m4 check-utmp.m4
EXTRA_DIST=$(GNOME2_MACROS) autogen.sh
MAINTAINERCLEANFILES=macros2.dep
diff --git a/macros2/autogen.sh b/macros2/autogen.sh
index 18cfd607..9bd4170d 100644
--- a/macros2/autogen.sh
+++ b/macros2/autogen.sh
@@ -38,7 +38,7 @@ grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && {
}
}
-grep "^AM_GNOME_GETTEXT" $srcdir/configure.in >/dev/null && {
+grep "^AM_GNOME2?_GETTEXT" $srcdir/configure.in >/dev/null && {
grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
(gettext --version) < /dev/null > /dev/null 2>&1 || {
echo
@@ -130,7 +130,7 @@ do
test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
fi
fi
- if grep "^AM_GNOME_GETTEXT" configure.in >/dev/null; then
+ if grep "^AM_GNOME2?_GETTEXT" configure.in >/dev/null; then
echo "Creating $dr/aclocal.m4 ..."
test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
echo "Running gettextize... Ignore non-fatal messages."