Merge lp:~jjardon/intltool/autoreconf into lp:intltool

Proposed by Javier Jardón on 2012-03-28
Status: Merged
Merged at revision: 738
Proposed branch: lp:~jjardon/intltool/autoreconf
Merge into: lp:intltool
Diff against target: 41 lines (+16/-18)
1 file modified
autogen.sh (+16/-18)
To merge this branch: bzr merge lp:~jjardon/intltool/autoreconf
Reviewer Review Type Date Requested Status
dobey (community) 2012-03-28 Approve on 2013-05-12
Review via email: mp+99802@code.launchpad.net

Description of the Change

autoreconf is the "upstream" tool and can replace gnome-common completely.
Also gnome-common is a bit unmaintained and there are plans to deprecate it.

To post a comment you must log in.
dobey (dobey) wrote :

Does it support all of the things which gnome-common did now?

review: Needs Information
Javier Jardón (jjardon) wrote :

autoreconf do all the things intltool needs from gnome-common

dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'autogen.sh'
2--- autogen.sh 2009-04-26 19:15:06 +0000
3+++ autogen.sh 2012-03-28 18:45:23 +0000
4@@ -1,21 +1,19 @@
5 #!/bin/sh
6 # Run this to generate all the initial makefiles, etc.
7
8-srcdir=`dirname $0`
9-test -z "$srcdir" && srcdir=.
10-
11-PKG_NAME="intltool"
12-REQUIRED_AUTOMAKE_VERSION="1.6"
13-
14-(test -f $srcdir/intltoolize.in) || {
15- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
16- echo " top-level $PKG_NAME directory"
17- exit 1
18-}
19-
20-which gnome-autogen.sh || {
21- echo "You need to install gnome-common from the GNOME CVS"
22- exit 1
23-}
24-
25-USE_GNOME2_MACROS=1 . gnome-autogen.sh
26+test -n "$srcdir" || srcdir=`dirname "$0"`
27+test -n "$srcdir" || srcdir=.
28+
29+olddir=`pwd`
30+cd $srcdir
31+
32+AUTORECONF=`which autoreconf`
33+if test -z $AUTORECONF; then
34+ echo "*** No autoreconf found, please intall it ***"
35+ exit 1
36+fi
37+
38+autoreconf --force --install --verbose
39+
40+cd $olddir
41+test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"

Subscribers

People subscribed via source and target branches