From c52bb433f05fdd1a11a1d49618f7555d83cd6d0c Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sat, 21 Jun 2014 11:19:47 -0400 Subject: [PATCH 1/3] rename configure.in -> configure.ac Silences warning on newer autoconf: aclocal: warning: autoconf input should be named 'configure.ac', not 'configure.in' --- autogen.sh | 2 +- configure.in => configure.ac | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename configure.in => configure.ac (100%) diff --git a/autogen.sh b/autogen.sh index bdd16590..cf4b9798 100755 --- a/autogen.sh +++ b/autogen.sh @@ -6,7 +6,7 @@ PKG_NAME="Irssi" srcdir=`dirname $0` test -z "$srcdir" && srcdir=. -if test ! -f $srcdir/configure.in; then +if test ! -f $srcdir/configure.ac; then echo -n "**Error**: Directory \`$srcdir\' does not look like the" echo " top-level $PKG_NAME directory" exit 1 diff --git a/configure.in b/configure.ac similarity index 100% rename from configure.in rename to configure.ac From 13ea2cb622f48c528b36970eff5e2cf42b3769fc Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sat, 21 Jun 2014 11:20:53 -0400 Subject: [PATCH 2/3] add AC_CONFIG_MACRO_DIR([m4]), move *.m4 files to m4/ Silences notice on newer autoconf: libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. This helps keep the top-level build directory clean, too --- Makefile.am | 2 +- configure.ac | 1 + curses.m4 => m4/curses.m4 | 0 glib-2.0.m4 => m4/glib-2.0.m4 | 0 4 files changed, 2 insertions(+), 1 deletion(-) rename curses.m4 => m4/curses.m4 (100%) rename glib-2.0.m4 => m4/glib-2.0.m4 (100%) diff --git a/Makefile.am b/Makefile.am index 07c5d292..5bb0a2d7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -ACLOCAL_AMFLAGS = -I . +ACLOCAL_AMFLAGS = -I m4 # create default-config.h BUILT_SOURCES = default-config.h default-theme.h irssi-version.h diff --git a/configure.ac b/configure.ac index 61af4f89..d409be36 100644 --- a/configure.ac +++ b/configure.ac @@ -4,6 +4,7 @@ AC_CONFIG_AUX_DIR(build-aux) AC_PREREQ(2.50) AC_CONFIG_HEADERS([irssi-config.h]) +AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([1.9 no-define foreign]) AM_MAINTAINER_MODE diff --git a/curses.m4 b/m4/curses.m4 similarity index 100% rename from curses.m4 rename to m4/curses.m4 diff --git a/glib-2.0.m4 b/m4/glib-2.0.m4 similarity index 100% rename from glib-2.0.m4 rename to m4/glib-2.0.m4 From f0925de16bb70da0bf87332521f54f1defd23500 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sat, 21 Jun 2014 11:37:28 -0400 Subject: [PATCH 3/3] s/INCLUDES/AM_CPPFLAGS/g Silences warnings on recent automake such as: src/core/Makefile.am:3: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') --- src/core/Makefile.am | 2 +- src/fe-common/core/Makefile.am | 2 +- src/fe-common/irc/Makefile.am | 2 +- src/fe-common/irc/dcc/Makefile.am | 2 +- src/fe-common/irc/notifylist/Makefile.am | 2 +- src/fe-none/Makefile.am | 2 +- src/fe-text/Makefile.am | 2 +- src/irc/core/Makefile.am | 2 +- src/irc/dcc/Makefile.am | 2 +- src/irc/flood/Makefile.am | 2 +- src/irc/notifylist/Makefile.am | 2 +- src/irc/proxy/Makefile.am | 2 +- src/lib-config/Makefile.am | 2 +- src/perl/Makefile.am | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 59ae0a8d..fc32e17e 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -1,6 +1,6 @@ noinst_LIBRARIES = libcore.a -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core \ $(GLIB_CFLAGS) \ diff --git a/src/fe-common/core/Makefile.am b/src/fe-common/core/Makefile.am index eb826414..e755b510 100644 --- a/src/fe-common/core/Makefile.am +++ b/src/fe-common/core/Makefile.am @@ -1,6 +1,6 @@ noinst_LIBRARIES = libfe_common_core.a -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \ $(GLIB_CFLAGS) \ -DHELPDIR=\""$(datadir)/irssi/help"\" \ diff --git a/src/fe-common/irc/Makefile.am b/src/fe-common/irc/Makefile.am index 9ca9ccfa..463f145c 100644 --- a/src/fe-common/irc/Makefile.am +++ b/src/fe-common/irc/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = dcc notifylist noinst_LIBRARIES = libfe_common_irc.a -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/irc/core/ \ diff --git a/src/fe-common/irc/dcc/Makefile.am b/src/fe-common/irc/dcc/Makefile.am index 7161f262..e0ad6296 100644 --- a/src/fe-common/irc/dcc/Makefile.am +++ b/src/fe-common/irc/dcc/Makefile.am @@ -1,6 +1,6 @@ noinst_LIBRARIES = libfe_irc_dcc.a -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/irc/core/ \ diff --git a/src/fe-common/irc/notifylist/Makefile.am b/src/fe-common/irc/notifylist/Makefile.am index 94f5a791..b990dcd2 100644 --- a/src/fe-common/irc/notifylist/Makefile.am +++ b/src/fe-common/irc/notifylist/Makefile.am @@ -1,6 +1,6 @@ noinst_LIBRARIES = libfe_irc_notifylist.a -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/irc/core/ \ diff --git a/src/fe-none/Makefile.am b/src/fe-none/Makefile.am index d06f04e1..1233fc91 100644 --- a/src/fe-none/Makefile.am +++ b/src/fe-none/Makefile.am @@ -1,6 +1,6 @@ bin_PROGRAMS = botti -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/irc/core/ \ diff --git a/src/fe-text/Makefile.am b/src/fe-text/Makefile.am index b8ec634e..b9538e60 100644 --- a/src/fe-text/Makefile.am +++ b/src/fe-text/Makefile.am @@ -1,6 +1,6 @@ bin_PROGRAMS = irssi -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/fe-common/core/ \ diff --git a/src/irc/core/Makefile.am b/src/irc/core/Makefile.am index fa4ca3f9..3db5cf0e 100644 --- a/src/irc/core/Makefile.am +++ b/src/irc/core/Makefile.am @@ -1,6 +1,6 @@ noinst_LIBRARIES = libirc_core.a -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ diff --git a/src/irc/dcc/Makefile.am b/src/irc/dcc/Makefile.am index a2ca19e2..cf1e2ff5 100644 --- a/src/irc/dcc/Makefile.am +++ b/src/irc/dcc/Makefile.am @@ -1,6 +1,6 @@ noinst_LIBRARIES = libirc_dcc.a -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/irc/core/ \ diff --git a/src/irc/flood/Makefile.am b/src/irc/flood/Makefile.am index a5ba65b0..1c4d786a 100644 --- a/src/irc/flood/Makefile.am +++ b/src/irc/flood/Makefile.am @@ -1,6 +1,6 @@ noinst_LIBRARIES = libirc_flood.a -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/irc/core/ \ diff --git a/src/irc/notifylist/Makefile.am b/src/irc/notifylist/Makefile.am index c4a7f4a0..abd9d18d 100644 --- a/src/irc/notifylist/Makefile.am +++ b/src/irc/notifylist/Makefile.am @@ -1,6 +1,6 @@ noinst_LIBRARIES = libirc_notifylist.a -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/irc/core/ \ diff --git a/src/irc/proxy/Makefile.am b/src/irc/proxy/Makefile.am index 8a5b5046..4eb73bb8 100644 --- a/src/irc/proxy/Makefile.am +++ b/src/irc/proxy/Makefile.am @@ -1,7 +1,7 @@ moduledir = $(libdir)/irssi/modules module_LTLIBRARIES = libirc_proxy.la -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/irc/core/ \ diff --git a/src/lib-config/Makefile.am b/src/lib-config/Makefile.am index 4831ae66..06c7787c 100644 --- a/src/lib-config/Makefile.am +++ b/src/lib-config/Makefile.am @@ -1,6 +1,6 @@ noinst_LIBRARIES = libirssi_config.a -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/src \ $(GLIB_CFLAGS) diff --git a/src/perl/Makefile.am b/src/perl/Makefile.am index 909f4a81..a09c49a5 100644 --- a/src/perl/Makefile.am +++ b/src/perl/Makefile.am @@ -14,7 +14,7 @@ libfe_perl_la_LDFLAGS = -module -avoid-version -rpath $(moduledir) perl-core.lo: irssi-core.pl.h perl-signals.lo: perl-signals-list.h -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core \ -I$(top_srcdir)/src/fe-common/core \