[nautilus-sendto] build: Do not use deprecated autoconf/libtool macros
- From: Javier JardÃn <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-sendto] build: Do not use deprecated autoconf/libtool macros
- Date: Wed, 21 Mar 2012 17:07:56 +0000 (UTC)
commit 2c8466e5413dbafe4cad8db83d62edb96a702816
Author: Javier JardÃn <jjardon gnome org>
Date: Wed Mar 21 16:41:12 2012 +0000
build: Do not use deprecated autoconf/libtool macros
Makefile.am | 2 ++
configure.in | 13 ++++++++-----
2 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index db1cd24..aa7a9e0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
SUBDIRS = data src docs po
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-nautilusdir='$${libdir}/nautilus/extensions-2.0-distcheck'
diff --git a/configure.in b/configure.in
index ea20773..b431374 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_INIT([nautilus-sendto],
[https://bugzilla.gnome.org/enter_bug.cgi?product=nautilus-sendto],
[nautilus-sendto])
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip check-news])
@@ -14,17 +14,19 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
AM_MAINTAINER_MODE
-AM_DISABLE_STATIC
+# Check for programs
AC_PROG_CC
-AM_PROG_LIBTOOL
AC_PROG_INSTALL
AC_PROG_MAKE_SET
+
+# Initialize libtool
+LT_INIT([disable-static])
+
GLIB_GSETTINGS
dnl gtk-doc checks
GTK_DOC_CHECK(1.9)
-GNOME_COMMON_INIT
GNOME_DEBUG_CHECK
GNOME_COMPILE_WARNINGS([maximum])
GNOME_CXX_WARNINGS
@@ -212,7 +214,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [GetText Package])
AM_GLIB_GNU_GETTEXT
-AC_OUTPUT([
+AC_CONFIG_FILES([
Makefile
data/Makefile
data/nautilus-sendto.pc
@@ -230,6 +232,7 @@ docs/nautilus-sendto/Makefile
docs/nautilus-sendto/version.xml
po/Makefile.in
])
+AC_OUTPUT
echo "-------------------------------------------------------"
echo " "
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]