ayatana-commits team mailing list archive

[Javier Jardón <jjardon@xxxxxxxxx>]

Javier Jardón has proposed merging lp:~jjardon/indicator-me/fix-autotools into lp:indicator-me.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)

For more details, see:
https://code.launchpad.net/~jjardon/indicator-me/fix-autotools/+merge/65018

Update autotools config

Replace deprecated macros
Use new libtool syntax
Use upstream gettext
-- 
https://code.launchpad.net/~jjardon/indicator-me/fix-autotools/+merge/65018
Your team ayatana-commits is subscribed to branch lp:indicator-me.

=== modified file 'Makefile.am'
--- Makefile.am	2011-01-17 17:30:00 +0000
+++ Makefile.am	2011-06-17 15:29:28 +0000
@@ -1,3 +1,4 @@
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 SUBDIRS = \
 	src \

=== modified file 'configure.ac'
--- configure.ac	2011-04-18 03:50:21 +0000
+++ configure.ac	2011-06-17 15:29:28 +0000
@@ -1,27 +1,29 @@
-
-AC_INIT(indicator-me, 0.3.0, ken.vandine@xxxxxxxxxxxxx)
+AC_INIT([indicator-me],
+        [0.3.0],
+        [http://bugs.launchpad.net/indicator-me],
+        [indicator-me],
+        [http://launchpad.net/indicator-me])
 AC_COPYRIGHT([Copyright 2009, 2011 Canonical])
 
-
-AC_PREREQ(2.53)
-
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-me, 0.3.0)
-
-AM_MAINTAINER_MODE
-
-IT_PROG_INTLTOOL([0.35.0])
-
-AC_ISC_POSIX
+AC_PREREQ([2.64])
+
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
+
+
+AM_INIT_AUTOMAKE([1.11 -Wall tar-pax])
+AM_MAINTAINER_MODE([enable])
+
+AM_SILENT_RULES([yes])
+
+# Check for programs
 AC_PROG_CC
 AM_PROG_CC_C_O
-AC_STDC_HEADERS
-AC_PROG_LIBTOOL
-
-AC_SUBST(VERSION)
-AC_CONFIG_MACRO_DIR([m4])
-
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
+# Initialize libtool
+LT_PREREQ([2.2])
+LT_INIT
+
 
 ###########################
 # Dependencies 
@@ -101,19 +103,19 @@
 ###########################
 # Internationalization
 ###########################
-
-GETTEXT_PACKAGE=indicator-me
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the default get text domain])
-AC_DEFINE_PATH(GNOMELOCALEDIR, "${datadir}/locale", [locale directory])
-
-AM_GLIB_GNU_GETTEXT
+IT_PROG_INTLTOOL([0.40.0])
+
+AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT([external])
+
+AC_SUBST([GETTEXT_PACKAGE],[PACKAGE_TARNAME])
+AC_DEFINE([GETTEXT_PACKAGE],[PACKAGE_TARNAME],[Name of the default get text domain])
 
 ###########################
 # Files
 ###########################
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 src/Makefile
 data/Makefile
@@ -132,6 +134,7 @@
 data/icons/scalable/status/Makefile
 po/Makefile.in
 ])
+AC_OUTPUT
 
 ###########################
 # Results

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-02-17 15:58:10 +0000
+++ src/Makefile.am	2011-06-17 15:29:28 +0000
@@ -17,6 +17,7 @@
 libme_la_CFLAGS = \
 	$(APPLET_CFLAGS) \
 	-Wall -Werror \
+	-DLOCALEDIR=\"$(localedir)\" \
 	-DG_LOG_DOMAIN=\"Indicator-Me\"
 libme_la_LIBADD = $(APPLET_LIBS)
 libme_la_LDFLAGS = -module -avoid-version