Re: bird redhat repo missing rpms for 1.6.3

2017-05-30 Thread Ruben Kerkhof
On Tue, May 30, 2017 at 2:55 PM, Ondrej Zajicek wrote: > Perhaps it would be possible to install also newer libtinfo/libncurses from > Fedora? That shouldn't be needed. I see indeed that the rpm from the bird.network.cz repo for redhat depends on a newer libncurses: rpm -qp --requires bird-1.6.3

Re: bird redhat repo missing rpms for 1.6.3

2017-05-30 Thread Ruben Kerkhof
On Tue, May 30, 2017 at 2:31 PM, Martin Huněk wrote: > Hi, > > I've tested that 1.6.3 on CentOS 7 and that RPM is not usable on it. What RPM exactly? Iif you rebuild the Fedora rpm bird will link against the older libs: $ rpm -qp --requires bird-1.6.3-3.el7.centos.x86_64.rpm | grep -E 'lib(ncurse

Re: bird redhat repo missing rpms for 1.6.3

2017-05-24 Thread Ruben Kerkhof
epel7 mockbuild Kind regards, Ruben Kerkhof

[PATCH 13/13] No need to look for clock_gettime in libc

2017-03-18 Thread Ruben Kerkhof
AC_SEARCH_LIBS already does this before it looks in other libraries. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 868b989b..c3fee2d7 100644 --- a/configure.ac +++ b/configure.ac @@ -146,7 +146,7 @@ fi AC_SUBST([CONFIG_FILE]

[PATCH 12/13] Simplify check for syslog.h

2017-03-18 Thread Ruben Kerkhof
--- configure.ac | 3 +-- sysdep/unix/log.c | 8 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index d8f81d09..868b989b 100644 --- a/configure.ac +++ b/configure.ac @@ -313,8 +313,7 @@ case $sysdesc in ;; esac -AC_CHECK_HEADER([sys

[PATCH 11/13] Simplify check for alloca.h

2017-03-18 Thread Ruben Kerkhof
AC_CHECK_HEADERS_ONCE defines HAVE_ALLOCA_H if it is found. --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ee352790..d8f81d09 100644 --- a/configure.ac +++ b/configure.ac @@ -314,7 +314,8 @@ case $sysdesc in esac AC_CHEC

[PATCH 10/13] configure.ac: reorganize a bit

2017-03-18 Thread Ruben Kerkhof
--- configure.ac | 65 ++-- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/configure.ac b/configure.ac index 7a7ae0ca..ee352790 100644 --- a/configure.ac +++ b/configure.ac @@ -6,6 +6,39 @@ AC_INIT AC_CONFIG_SRCDIR([conf/con

[PATCH 09/13] Remove dead code

2017-03-18 Thread Ruben Kerkhof
--- configure.ac | 8 1 file changed, 8 deletions(-) diff --git a/configure.ac b/configure.ac index 658595a7..7a7ae0ca 100644 --- a/configure.ac +++ b/configure.ac @@ -135,14 +135,6 @@ if test -z "$GCC" ; then AC_MSG_ERROR([This program requires the GNU C Compiler.]) fi -# Enable t

[PATCH 08/13] Consistently quote all macro arguments

2017-03-18 Thread Ruben Kerkhof
--- configure.ac | 140 ++- 1 file changed, 82 insertions(+), 58 deletions(-) diff --git a/configure.ac b/configure.ac index 633805cb..658595a7 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl ** (c) 1999--2000 Martin Mares

[PATCH 07/13] configure.ac: use AS_HELP_STRING for help text

2017-03-18 Thread Ruben Kerkhof
--- configure.ac | 71 ++-- 1 file changed, 60 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index ed236751..633805cb 100644 --- a/configure.ac +++ b/configure.ac @@ -6,17 +6,66 @@ AC_INIT AC_CONFIG_SRCDIR([conf/co

[PATCH 06/13] configure.ac: fix indentation

2017-03-18 Thread Ruben Kerkhof
consistenly indent the file with 2 spaces --- configure.ac | 328 +++ 1 file changed, 171 insertions(+), 157 deletions(-) diff --git a/configure.ac b/configure.ac index 734768d2..ed236751 100644 --- a/configure.ac +++ b/configure.ac @@ -6,39

[PATCH 04/13] Remove check for struct ip_mreqn

2017-03-18 Thread Ruben Kerkhof
It has been available since Linux 2.2 --- aclocal.m4 | 12 configure.ac | 1 - sysdep/linux/sysio.h | 10 -- 3 files changed, 23 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 29049d18..d48846af 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -57,18 +5

[PATCH 05/13] aclocal.m4: consistently quote and indent

2017-03-18 Thread Ruben Kerkhof
--- aclocal.m4 | 232 +++-- 1 file changed, 149 insertions(+), 83 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index d48846af..cddc9e31 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -2,100 +2,166 @@ dnl ** Additional Autoconf tests for BI

[PATCH 03/13] use fixed width integers types from

2017-03-18 Thread Ruben Kerkhof
--- aclocal.m4 | 33 - configure.ac| 1 - sysdep/config.h | 22 -- 3 files changed, 12 insertions(+), 44 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 36749c58..29049d18 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,39 +1,6

[PATCH 00/13] Some more cleanup for configure.ac and aclocal.m4

2017-03-18 Thread Ruben Kerkhof
Ruben Kerkhof (13): aclocal.m4: remove unused macro aclocal.m4: use normal macro for function use fixed width integers types from Remove check for struct ip_mreqn aclocal.m4: consistently quote and indent configure.ac: fix indentation configure.ac: use AS_HELP_STRING for help text

[PATCH 02/13] aclocal.m4: use normal macro for function

2017-03-18 Thread Ruben Kerkhof
--- aclocal.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index a13b71f3..36749c58 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -134,7 +134,7 @@ AC_DEFUN([BIRD_ADD_GCC_OPTION], # BIRD_CHECK_PROG_FLAVOR_GNU(PROGRAM-PATH, IF-SUCCESS, [IF-FAILURE

[PATCH 01/13] aclocal.m4: remove unused macro

2017-03-18 Thread Ruben Kerkhof
--- aclocal.m4 | 36 1 file changed, 36 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index f2775422..a13b71f3 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -34,42 +34,6 @@ for size in 1 2 4 8; do done ]) -dnl BIRD_CHECK_ENDIAN is unused and obsol

Re: Some autoconf cleanups

2017-03-14 Thread Ruben Kerkhof
On Tue, Mar 14, 2017 at 2:08 PM, Ondrej Zajicek wrote: > On Tue, Mar 07, 2017 at 03:20:09PM +0100, Ruben Kerkhof wrote: >> On Tue, Mar 7, 2017 at 12:17 AM, Ondrej Zajicek >> wrote: >> > On Sat, Mar 04, 2017 at 06:13:16PM +0100, Ruben Kerkhof wrote: >> > Th

Re: Some autoconf cleanups

2017-03-07 Thread Ruben Kerkhof
On Tue, Mar 7, 2017 at 12:17 AM, Ondrej Zajicek wrote: > On Sat, Mar 04, 2017 at 06:13:16PM +0100, Ruben Kerkhof wrote: >> The goal of this series is to make it possible to run autoreconf on a git >> checkout. >> >> It does this by moving configure.in to configu

[PATCH 11/11] Remove header template

2017-03-04 Thread Ruben Kerkhof
It can now safely be generated. This will mean you need to run autoreconf from now on after you cloned the git repo. --- .gitignore | 1 + sysdep/autoconf.h.in | 70 2 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644

[PATCH 09/11] Define templates for integer types

2017-03-04 Thread Ruben Kerkhof
Right now there are empty defines for these in sysdeps/autoconf.h.in, but if we want to start using autoheader we'll need to generate these. --- m4/bird.m4 | 5 + 1 file changed, 5 insertions(+) diff --git a/m4/bird.m4 b/m4/bird.m4 index e7676368..f2775422 100644 --- a/m4/bird.m4 +++ b/m4/bir

[PATCH 08/11] Quote macro definitions in bird.m4

2017-03-04 Thread Ruben Kerkhof
autoreconf: running: aclocal m4/bird.m4:4: warning: underquoted definition of BIRD_CHECK_INTEGERS m4/bird.m4:4: run info Automake 'Extending aclocal' m4/bird.m4:4: or see http://www.gnu.org/software/automake/manual/automake.html#Extending-aclocal --- m4/bird.m4 | 16 1 file c

[PATCH 10/11] Define templates for protocols

2017-03-04 Thread Ruben Kerkhof
Right now there are empty defines for these in sysdeps/autoconf.h.in, but if we want to start using autoheader we'll need to generate these. --- configure.ac | 9 + 1 file changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac index d9213ed6..fdf2c69d 100644 --- a/configure.ac

[PATCH 06/11] Fix some autoheader warnings

2017-03-04 Thread Ruben Kerkhof
AC_DEFINE and AC_DEFINE_UNQUOTED without a description have been deprecated for a while. $ autoreconf -v autoreconf: Entering directory `.' autoreconf: configure.ac: not using Gettext autoreconf: configure.ac: not using aclocal autoreconf: configure.ac: tracing autoreconf: configure.ac: not using

[PATCH 07/11] Move bird-specific macros to m4/bird.m4

2017-03-04 Thread Ruben Kerkhof
--- .gitignore | 1 + configure.ac | 1 + aclocal.m4 => m4/bird.m4 | 0 3 files changed, 2 insertions(+) rename aclocal.m4 => m4/bird.m4 (100%) diff --git a/.gitignore b/.gitignore index 52510836..4945b84e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +/acloc

[PATCH 03/11] Remove unused AC_REVISION macro

2017-03-04 Thread Ruben Kerkhof
$Id$ is never expanded in the git repo --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac index 301e2ebe..97d9dbce 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,6 @@ dnl ** This is a configure script template for BIRD dnl ** Process it with a

[PATCH 05/11] AC_TRY_COMPILE is deprecated

2017-03-04 Thread Ruben Kerkhof
--- configure.ac | 23 +-- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 4ca956b7..75e90629 100644 --- a/configure.ac +++ b/configure.ac @@ -242,12 +242,23 @@ esac AC_CHECK_HEADER(syslog.h, [AC_DEFINE(HAVE_SYSLOG)]) AC_CHECK_

[PATCH 04/11] Use AC_MSG_RESULT to format output

2017-03-04 Thread Ruben Kerkhof
--- configure.ac | 22 ++ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 97d9dbce..4ca956b7 100644 --- a/configure.ac +++ b/configure.ac @@ -299,16 +299,14 @@ AC_OUTPUT rm -f $objdir/sysdep/paths.h -cat >&AC_FD_MSG <

[PATCH 02/11] Stop using deprecated form of AC_INIT

2017-03-04 Thread Ruben Kerkhof
--- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 57fa0079..301e2ebe 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,8 @@ dnl ** Process it with autoconf to get ./configure dnl ** (c) 1999--2000 Martin Mares AC_REV

[PATCH 01/11] Rename configure.in to configure.ac

2017-03-04 Thread Ruben Kerkhof
configure.in has been deprecated for a long time --- configure.in => configure.ac | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename configure.in => configure.ac (100%) diff --git a/configure.in b/configure.ac similarity index 100% rename from configure.in rename to configure.ac -- 2.1

Some autoconf cleanups

2017-03-04 Thread Ruben Kerkhof
The goal of this series is to make it possible to run autoreconf on a git checkout. It does this by moving configure.in to configure.ac and fixes deprecation warnings and errors generated by autoheader. I have some follow up patches with more cleanups, but this series is already large enough a