From 192e304b94f239de13b0f10ca01f6694fe6eea40 Mon Sep 17 00:00:00 2001 From: Alexander Barton Date: Sun, 23 Sep 2012 17:55:48 +0200 Subject: Change build system to support new and old GNU automake Starting with GNU automake 1.12, the "de-ANSI-fication support" has been removed, which ngIRCd used to enable building itself on very old systems. Now the problem is, that using automake >= 1.12 isn't working because of the now unsupported M4 macros. Therefore the solution that this patch implements is to dynamically generate the automake input files with our own ./autogen.sh script: configure.ng => configure.in Makefile.ng => Makefile.am This is quite an ugly approach, but it works and enables us to: 1. use current automake >= 1.12 for development and "private builds", 2. still build distribution archives using automake 1.11.x that have "de-ANSI-fication support" enabled in the generated Makefile's. And if you are using Makefile's generated with a automake version newer than 1.11.x (without "de-ANSI-fication support"), the ./configure script warns you not to use this generated build system to generate distribution archives. Drawback of this patch: you MUST use our autogen.sh script, you can't call the autoconf/automake commands directly any more; but autoreconf should still work ... --- src/ipaddr/.gitignore | 1 + src/ipaddr/Makefile.am | 19 ------------------- src/ipaddr/Makefile.ng | 19 +++++++++++++++++++ 3 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 src/ipaddr/.gitignore delete mode 100644 src/ipaddr/Makefile.am create mode 100644 src/ipaddr/Makefile.ng (limited to 'src/ipaddr') diff --git a/src/ipaddr/.gitignore b/src/ipaddr/.gitignore new file mode 100644 index 00000000..08a6d725 --- /dev/null +++ b/src/ipaddr/.gitignore @@ -0,0 +1 @@ +Makefile.am diff --git a/src/ipaddr/Makefile.am b/src/ipaddr/Makefile.am deleted file mode 100644 index 6ce299f2..00000000 --- a/src/ipaddr/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -# -# ipaddr/Makefile.am -# (c) 2008 Florian Westphal , public domain. -# - -AUTOMAKE_OPTIONS = ../portab/ansi2knr - -INCLUDES = -I$(srcdir)/../portab - -noinst_LIBRARIES = libngipaddr.a - -libngipaddr_a_SOURCES = ng_ipaddr.c - -noinst_HEADERS = ng_ipaddr.h - -maintainer-clean-local: - rm -f Makefile Makefile.in - -# -eof- diff --git a/src/ipaddr/Makefile.ng b/src/ipaddr/Makefile.ng new file mode 100644 index 00000000..3d5a5db9 --- /dev/null +++ b/src/ipaddr/Makefile.ng @@ -0,0 +1,19 @@ +# +# ipaddr/Makefile.am +# (c) 2008 Florian Westphal , public domain. +# + +__ng_Makefile_am_template__ + +INCLUDES = -I$(srcdir)/../portab + +noinst_LIBRARIES = libngipaddr.a + +libngipaddr_a_SOURCES = ng_ipaddr.c + +noinst_HEADERS = ng_ipaddr.h + +maintainer-clean-local: + rm -f Makefile Makefile.in + +# -eof- -- cgit 1.4.1