The Me Menu

Merge lp:~jjardon/indicator-me/fix-autotools into lp:indicator-me

  1. fix-autotools
  2. Merge into trunk
Proposed by Javier Jardón
Status: Rejected
Rejected by: Sebastien Bacher
Proposed branch: lp:~jjardon/indicator-me/fix-autotools
Merge into: lp:indicator-me
Diff against target: 109 lines (+33/-28)
3 files modified
Makefile.am (+1/-0)
configure.ac (+31/-28)
src/Makefile.am (+1/-0)
To merge this branch: bzr merge lp:~jjardon/indicator-me/fix-autotools
Reviewer Review Type Date Requested Status
Sebastien Bacher Needs Fixing
Review via email: mp+65018@code.launchpad.net

Description of the change

Update autotools config

Replace deprecated macros
Use new libtool syntax
Use upstream gettext

To post a comment you must log in.
lp:~jjardon/indicator-me/fix-autotools updated
150. By Javier Jardón

Fix GNOMELOCALEDIR definition

Revision history for this message
Sebastien Bacher (seb128) wrote :
review: Needs Fixing
Revision history for this message
Sebastien Bacher (seb128) wrote :

setting as rejected, that's an old merge request on an indicator that got deprecated since

Unmerged revisions

150. By Javier Jardón

Fix GNOMELOCALEDIR definition

149. By Javier Jardón

Use upstream gettext instead the glib one

148. By Javier Jardón

Update autotools configuration

Replace deprecated macros
Use new libtool syntax

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2011-01-17 17:30:00 +0000
3+++ Makefile.am 2011-06-17 15:35:04 +0000
4@@ -1,3 +1,4 @@
5+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
6
7 SUBDIRS = \
8 src \
9
10=== modified file 'configure.ac'
11--- configure.ac 2011-04-18 03:50:21 +0000
12+++ configure.ac 2011-06-17 15:35:04 +0000
13@@ -1,27 +1,29 @@
14-
15-AC_INIT(indicator-me, 0.3.0, ken.vandine@canonical.com)
16+AC_INIT([indicator-me],
17+ [0.3.0],
18+ [http://bugs.launchpad.net/indicator-me],
19+ [indicator-me],
20+ [http://launchpad.net/indicator-me])
21 AC_COPYRIGHT([Copyright 2009, 2011 Canonical])
22
23-
24-AC_PREREQ(2.53)
25-
26-AM_CONFIG_HEADER(config.h)
27-AM_INIT_AUTOMAKE(indicator-me, 0.3.0)
28-
29-AM_MAINTAINER_MODE
30-
31-IT_PROG_INTLTOOL([0.35.0])
32-
33-AC_ISC_POSIX
34+AC_PREREQ([2.64])
35+
36+AC_CONFIG_HEADERS([config.h])
37+AC_CONFIG_MACRO_DIR([m4])
38+
39+
40+AM_INIT_AUTOMAKE([1.11 -Wall tar-pax])
41+AM_MAINTAINER_MODE([enable])
42+
43+AM_SILENT_RULES([yes])
44+
45+# Check for programs
46 AC_PROG_CC
47 AM_PROG_CC_C_O
48-AC_STDC_HEADERS
49-AC_PROG_LIBTOOL
50-
51-AC_SUBST(VERSION)
52-AC_CONFIG_MACRO_DIR([m4])
53-
54-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
55+
56+# Initialize libtool
57+LT_PREREQ([2.2])
58+LT_INIT
59+
60
61 ###########################
62 # Dependencies
63@@ -101,19 +103,19 @@
64 ###########################
65 # Internationalization
66 ###########################
67-
68-GETTEXT_PACKAGE=indicator-me
69-AC_SUBST(GETTEXT_PACKAGE)
70-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the default get text domain])
71-AC_DEFINE_PATH(GNOMELOCALEDIR, "${datadir}/locale", [locale directory])
72-
73-AM_GLIB_GNU_GETTEXT
74+IT_PROG_INTLTOOL([0.40.0])
75+
76+AM_GNU_GETTEXT_VERSION([0.17])
77+AM_GNU_GETTEXT([external])
78+
79+AC_SUBST([GETTEXT_PACKAGE],[PACKAGE_TARNAME])
80+AC_DEFINE([GETTEXT_PACKAGE],[PACKAGE_TARNAME],[Name of the default get text domain])
81
82 ###########################
83 # Files
84 ###########################
85
86-AC_OUTPUT([
87+AC_CONFIG_FILES([
88 Makefile
89 src/Makefile
90 data/Makefile
91@@ -132,6 +134,7 @@
92 data/icons/scalable/status/Makefile
93 po/Makefile.in
94 ])
95+AC_OUTPUT
96
97 ###########################
98 # Results
99
100=== modified file 'src/Makefile.am'
101--- src/Makefile.am 2011-02-17 15:58:10 +0000
102+++ src/Makefile.am 2011-06-17 15:35:04 +0000
103@@ -53,6 +53,7 @@
104 status-provider-telepathy-marshal.c
105 indicator_me_service_CFLAGS = $(MESERVICE_CFLAGS) \
106 -Wall -Werror \
107+ -DGNOMELOCALEDIR=\"$(localedir)\" \
108 -DG_LOG_DOMAIN=\"Indicator-Me\"
109 indicator_me_service_LDADD = $(MESERVICE_LIBS)
110

Subscribers

People subscribed via source and target branches