ayatana-commits team mailing list archive
-
ayatana-commits team
-
Mailing list archive
-
Message #03687
[Merge] lp:~jjardon/indicator-datetime/autotools into lp:indicator-datetime
Javier Jardón has proposed merging lp:~jjardon/indicator-datetime/autotools into lp:indicator-datetime.
Requested reviews:
Indicator Applet Developers (indicator-applet-developers)
For more details, see:
https://code.launchpad.net/~jjardon/indicator-datetime/autotools/+merge/68510
Update autotools configuration a bit
Do not use deprecated autoconf macros
Use new libtool syntax
General cleanup
--
https://code.launchpad.net/~jjardon/indicator-datetime/autotools/+merge/68510
Your team ayatana-commits is subscribed to branch lp:indicator-datetime.
=== modified file 'Makefile.am'
--- Makefile.am 2011-02-22 16:20:34 +0000
+++ Makefile.am 2011-07-20 09:54:59 +0000
@@ -1,3 +1,4 @@
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
SUBDIRS = \
libmap \
@@ -16,7 +17,7 @@
echo Creating ChangeLog && \
( cd "$(top_srcdir)" && \
echo '# Generated by Makefile. Do not edit.'; echo; \
- $(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \
+ $(top_srcdir)/build-aux/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \
&& mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
|| (rm -f ChangeLog.tmp; \
echo Failed to generate ChangeLog >&2 ); \
@@ -28,7 +29,7 @@
echo Creating AUTHORS && \
( cd "$(top_srcdir)" && \
echo '# Generated by Makefile. Do not edit.'; echo; \
- $(top_srcdir)/missing --run bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \
+ $(top_srcdir)/build-aux/missing --run bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \
&& mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \
|| (rm -f AUTHORS.tmp; \
echo Failed to generate AUTHORS >&2 ); \
=== modified file 'configure.ac'
--- configure.ac 2011-07-07 21:19:59 +0000
+++ configure.ac 2011-07-20 09:54:59 +0000
@@ -1,27 +1,31 @@
-
-AC_INIT(indicator-datetime, 0.2.91, ted@xxxxxxxxxxxxx)
+AC_INIT([indicator-datetime],
+ [0.2.91],
+ [http://bugs.launchpad.net/indicator-datetime],
+ [indicator-datetime],
+ [http://launchpad.net/indicator-datetime])
AC_COPYRIGHT([Copyright 2009,2010 Canonical])
-AC_PREREQ(2.53)
-
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-datetime, 0.2.91)
-
-AM_MAINTAINER_MODE
-
-IT_PROG_INTLTOOL([0.35.0])
-
-AC_ISC_POSIX
+AC_PREREQ([2.64])
+
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_SRCDIR([configure.ac])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([build-aux])
+
+AM_INIT_AUTOMAKE([1.11 -Wall dist-xz])
+AM_MAINTAINER_MODE([enable])
+
+AM_SILENT_RULES([yes])
+
+# Check for programs
AC_PROG_CC
AM_PROG_CC_C_O
-AC_STDC_HEADERS
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
-
-AC_SUBST(VERSION)
-AC_CONFIG_MACRO_DIR([m4])
-
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+AC_HEADER_STDC
+
+# Initialize libtool
+LT_PREREQ([2.2])
+LT_INIT([disable-static])
+
AC_ARG_ENABLE([deprecations],
[AS_HELP_STRING([--enable-deprecations],
@@ -108,19 +112,6 @@
PKG_CHECK_MODULES(LIBMAP, gio-2.0 >= $GIO_REQUIRED_VERSION
gtk+-3.0 >= $GTK3_REQUIRED_VERSION)
-AC_SUBST(INDICATOR_CFLAGS)
-AC_SUBST(INDICATOR_LIBS)
-
-AC_SUBST(SERVICE_CFLAGS)
-AC_SUBST(SERVICE_LIBS)
-
-AC_SUBST(PREF_CFLAGS)
-AC_SUBST(PREF_LIBS)
-
-AC_SUBST(LIBMAP_CFLAGS)
-AC_SUBST(LIBMAP_LIBS)
-AC_SUBST(LIBMAP_LDFLAGS)
-
###########################
# Grab the GSettings Macros
###########################
@@ -200,6 +191,7 @@
###########################
# Internationalization
###########################
+IT_PROG_INTLTOOL([0.41.0])
GETTEXT_PACKAGE=indicator-datetime
AC_SUBST(GETTEXT_PACKAGE)
@@ -212,7 +204,7 @@
# Files
###########################
-AC_OUTPUT([
+AC_CONFIG_FILES([
Makefile
libmap/Makefile
src/Makefile
@@ -220,6 +212,7 @@
tests/Makefile
po/Makefile.in
])
+AC_OUTPUT
###########################
# Results
Follow ups