summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Wood <thos@gnome.org>2006-02-07 20:35:24 +0000
committerThomas Wood <thos@src.gnome.org>2006-02-07 20:35:24 +0000
commit67fab8bb38a7b7cd34634550e7edbc87881dc323 (patch)
tree5bb7d59fd088adb1ec00af064672ffb4ecd98453
parentaa9eaeda34b0f31a53be97b405080c1967d002f8 (diff)
downloadgnome-backgrounds-gnome-background-2-12.tar.gz
Require automake 1.9. Fixes bug 330208.gnome-background-2-12
2006-02-07 Thomas Wood <thos@gnome.org> * autogen.sh: * configure.in: Require automake 1.9. Fixes bug 330208. * po/vi.po: Fix bug 326430 (po/vi.po has DOS line endings - breaks build on Solaris)
-rw-r--r--ChangeLog9
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.in5
-rw-r--r--po/vi.po2
4 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c624d7d..9207e32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-02-07 Thomas Wood <thos@gnome.org>
+
+ * autogen.sh:
+ * configure.in:
+ Require automake 1.9. Fixes bug 330208.
+
+ * po/vi.po: Fix bug 326430 (po/vi.po has DOS line endings - breaks
+ build on Solaris)
+
2006-02-06 Thomas Wood <thos@gnome.org>
* NEWS: Updated for 2.12.3 release
diff --git a/autogen.sh b/autogen.sh
index 70ff9ac..2c51fda 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,6 +5,8 @@ srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
PKG_NAME="gnome-backgrounds"
+REQUIRED_AUTOMAKE_VERSION=1.9
+
(test -f $srcdir/configure.in \
&& test -d $srcdir/translucent ) || {
diff --git a/configure.in b/configure.in
index 1b6d2a1..cf67a83 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,6 @@
-AC_INIT(translucent)
-AM_INIT_AUTOMAKE(gnome-backgrounds, 2.12.3)
+AC_INIT([gnome-backgrounds], [2.12.3.1])
+AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.9])
# Internationalization:
GETTEXT_PACKAGE=gnome-backgrounds
diff --git a/po/vi.po b/po/vi.po
index e61c55c..47f3d3f 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -60,4 +60,4 @@ msgstr "Tua cảm (Trong mờ)"
# msgid "Waves (Translucent)"
# msgstr "Biển cả (Trong mờ)"
-
+