Merge branch 'master' into int-new (525a88d8) · Commits · 戴 / Bird

aclocal.m4

+10 −86

Original line number	Diff line number	Diff line
		dnl ** Additional Autoconf tests for BIRD configure script
		dnl ** (c) 1999 Martin Mares <mj@ucw.cz>

		AC_DEFUN(BIRD_CHECK_INTEGERS,
		[AC_CHECK_SIZEOF(char, 0)
		AC_CHECK_SIZEOF(short int, 0)
		AC_CHECK_SIZEOF(int, 0)
		AC_CHECK_SIZEOF(long int, 0)
		AC_CHECK_SIZEOF(long long int, 0)
		for size in 1 2 4 8; do
		bits=`expr $size "*" 8`
		AC_MSG_CHECKING([for $bits-bit type])
		if test $ac_cv_sizeof_int = $size ; then
		res=int
		elif test $ac_cv_sizeof_char = $size ; then
		res=char
		elif test $ac_cv_sizeof_short_int = $size ; then
		res="short int"
		elif test $ac_cv_sizeof_long_int = $size ; then
		res="long int"
		elif test $ac_cv_sizeof_long_long_int = $size ; then
		res="long long int"
		else
		AC_MSG_RESULT([not found])
		AC_MSG_ERROR([Cannot find $bits-bit integer type.])
		fi
		AC_MSG_RESULT($res)
		AC_DEFINE_UNQUOTED(INTEGER_$bits, $res)
		done
		])

		dnl BIRD_CHECK_ENDIAN is unused and obsolete
		AC_DEFUN(BIRD_CHECK_ENDIAN,
		[AC_CACHE_CHECK([CPU endianity], bird_cv_c_endian,[
		AC_TRY_RUN([
		#include <stdio.h>

		unsigned int x = 0x12345678;
		unsigned char z = (unsigned char ) &x;

		int main(void)
		{
		FILE *f = fopen("conftestresult", "w");
		if (!f) return 10;
		fprintf(f, "%02x %02x %02x %02x", z, (z+1), (z+2), (z+3));
		fclose(f);
		exit(0);
		}
		],[
		endian=`cat conftestresult`
		if test "$endian" = "12 34 56 78" ; then
		bird_cv_c_endian=big-endian
		elif test "$endian" = "78 56 34 12" ; then
		bird_cv_c_endian=little-endian
		fi
		],[endian="test program failed"],[endian="not available, we're cross compiling"])
		if test -z "$bird_cv_c_endian" ; then
		AC_MSG_RESULT($endian)
		AC_MSG_ERROR([Cannot determine CPU endianity.])
		fi
		])
		case $bird_cv_c_endian in
		big-endian) AC_DEFINE(CPU_BIG_ENDIAN) ;;
		little-endian) AC_DEFINE(CPU_LITTLE_ENDIAN) ;;
		esac
		])

		AC_DEFUN(BIRD_CHECK_STRUCT_ALIGN,
		AC_DEFUN([BIRD_CHECK_STRUCT_ALIGN],
		[AC_CACHE_CHECK([usual alignment of structures],bird_cv_c_struct_align,[
		AC_TRY_RUN([
		#include <stdio.h>
		@@ -87,10 +23,10 @@ AC_MSG_RESULT([test program failed])
		AC_MSG_ERROR([Cannot determine structure alignment])
		],[bird_cv_c_struct_align=16])
		])
		AC_DEFINE_UNQUOTED(CPU_STRUCT_ALIGN, $bird_cv_c_struct_align)
		AC_DEFINE_UNQUOTED([CPU_STRUCT_ALIGN], [$bird_cv_c_struct_align], [Usual alignment of structures])
		])

		AC_DEFUN(BIRD_CHECK_TIME_T,
		AC_DEFUN([BIRD_CHECK_TIME_T],
		[AC_CACHE_CHECK([characteristics of time_t], bird_cv_type_time_t, [
		AC_TRY_RUN([
		#include <stdio.h>
		@@ -113,27 +49,15 @@ int main(void)
		],[bird_cv_type_time_t="32-bit signed"])
		])
		case "$bird_cv_type_time_t" in
		64-bit) AC_DEFINE(TIME_T_IS_64BIT) ;;
		64-bit) AC_DEFINE([TIME_T_IS_64BIT], [1], [Define to 1 if time_t is 64 bit]) ;;
		esac
		case "$bird_cv_type_time_t" in
		unsigned) ;;
		*) AC_DEFINE(TIME_T_IS_SIGNED) ;;
		*) AC_DEFINE([TIME_T_IS_SIGNED], [1], [Define to 1 if time_t is signed]) ;;
		esac
		])

		AC_DEFUN(BIRD_CHECK_STRUCT_IP_MREQN,
		[AC_CACHE_CHECK([for struct ip_mreqn], bird_cv_struct_ip_mreqn,[
		AC_TRY_COMPILE([#include <netinet/in.h>
		],[struct ip_mreqn x;
		],[bird_cv_struct_ip_mreqn=yes
		],[bird_cv_struct_ip_mreqn=no
		])])
		if test "$bird_cv_struct_ip_mreqn" = yes ; then
		AC_DEFINE(HAVE_STRUCT_IP_MREQN)
		fi
		])

		AC_DEFUN(BIRD_CHECK_PTHREADS,
		AC_DEFUN([BIRD_CHECK_PTHREADS],
		[
		bird_tmp_cflags="$CFLAGS"

		@@ -145,7 +69,7 @@ AC_DEFUN(BIRD_CHECK_PTHREADS,
		CFLAGS="$bird_tmp_cflags"
		])

		AC_DEFUN(BIRD_CHECK_GCC_OPTION,
		AC_DEFUN([BIRD_CHECK_GCC_OPTION],
		[
		bird_tmp_cflags="$CFLAGS"

		@@ -156,7 +80,7 @@ AC_DEFUN(BIRD_CHECK_GCC_OPTION,
		CFLAGS="$bird_tmp_cflags"
		])

		AC_DEFUN(BIRD_ADD_GCC_OPTION,
		AC_DEFUN([BIRD_ADD_GCC_OPTION],
		[
		if test "$$1" = yes ; then
		CFLAGS="$CFLAGS $2"
		@@ -165,7 +89,7 @@ AC_DEFUN(BIRD_ADD_GCC_OPTION,

		# BIRD_CHECK_PROG_FLAVOR_GNU(PROGRAM-PATH, IF-SUCCESS, [IF-FAILURE])
		# copied autoconf internal _AC_PATH_PROG_FLAVOR_GNU
		m4_define([BIRD_CHECK_PROG_FLAVOR_GNU],
		AC_DEFUN([BIRD_CHECK_PROG_FLAVOR_GNU],
		[# Check for GNU $1
		case `"$1" --version 2>&1` in
		GNU)
		@@ -174,4 +98,4 @@ m4_ifval([$3],
		[*)
		$3;;
		])esac
		])#
		])

configure.in→configure.ac

+57 −45

Original line number	Diff line number	Diff line
		@@ -2,8 +2,8 @@ dnl ** This is a configure script template for BIRD
		dnl ** Process it with autoconf to get ./configure
		dnl ** (c) 1999--2000 Martin Mares <mj@ucw.cz>

		AC_REVISION($Id$)
		AC_INIT(conf/confbase.Y)
		AC_INIT
		AC_CONFIG_SRCDIR([conf/confbase.Y])
		AC_CONFIG_AUX_DIR(tools)

		AC_ARG_ENABLE(debug, [ --enable-debug enable internal debugging routines (default: disabled)],,enable_debug=no)
		@@ -47,7 +47,7 @@ fi
		AC_SUBST(CONFIG_FILE)
		AC_SUBST(CONTROL_SOCKET)

		AC_SEARCH_LIBS(clock_gettime, [c rt posix4], ,
		AC_SEARCH_LIBS(clock_gettime, [rt posix4], ,
		AC_MSG_ERROR([[Function clock_gettime not available.]]))

		AC_CANONICAL_HOST
		@@ -63,19 +63,11 @@ if test -z "$GCC" ; then
		AC_MSG_ERROR([This program requires the GNU C Compiler.])
		fi

		# Enable threads by default just in Linux and FreeBSD
		#if test "$enable_pthreads" = try ; then
		# case "$host_os" in
		# (linux* \| freebsd* \| openbsd* \| netbsd* ) enable_pthreads=try ;;
		# (*) enable_pthreads=no ;;
		# esac
		#fi

		if test "$enable_pthreads" != no ; then
		BIRD_CHECK_PTHREADS

		if test "$bird_cv_lib_pthreads" = yes ; then
		AC_DEFINE(USE_PTHREADS)
		AC_DEFINE([USE_PTHREADS], [1], [Define to 1 if pthreads are enabled])
		CFLAGS="$CFLAGS -pthread"
		LDFLAGS="$LDFLAGS -pthread"
		proto_bfd=bfd
		@@ -93,7 +85,6 @@ if test "$enable_libssh" != no ; then
		if test $ac_cv_lib_ssh_ssh_connect = yes ; then
		proto_rpki=rpki
		enable_libssh=yes
		AC_DEFINE(HAVE_LIBSSH)
		else
		if test "$enable_libssh" = yes ; then
		AC_MSG_ERROR([LibSSH not available.])
		@@ -170,7 +161,7 @@ if ! test -f $sysdesc ; then
		AC_MSG_ERROR([The system configuration file is missing.])
		fi
		sysname=`echo $sysdesc \| sed 's/\.h$//'`
		AC_DEFINE_UNQUOTED(SYSCONF_INCLUDE, "$sysdesc")
		AC_DEFINE_UNQUOTED([SYSCONF_INCLUDE], ["$sysdesc"], [Which sysdep header to include])

		AC_MSG_CHECKING([system-dependent directories])
		sysdep_dirs="`sed <$sysdesc '/^Link: /!d;s/^Link: $.*$$/\1/' \| tr '\012' ' '`"
		@@ -194,6 +185,16 @@ if test "$with_protocols" = all ; then
		with_protocols="$all_protocols"
		fi

		AH_TEMPLATE([CONFIG_BABEL], [Babel protocol])
		AH_TEMPLATE([CONFIG_BFD], [BFD protocol])
		AH_TEMPLATE([CONFIG_BGP], [BGP protocol])
		AH_TEMPLATE([CONFIG_OSPF], [OSPF protocol])
		AH_TEMPLATE([CONFIG_PIPE], [Pipe protocol])
		AH_TEMPLATE([CONFIG_RADV], [RAdv protocol])
		AH_TEMPLATE([CONFIG_RIP], [RIP protocol])
		AH_TEMPLATE([CONFIG_RPKI], [RPKI protocol])
		AH_TEMPLATE([CONFIG_STATIC], [Static protocol])

		AC_MSG_CHECKING([protocols])
		protocols=`echo "$with_protocols" \| sed 's/,/ /g'`
		if test "$protocols" = no ; then protocols= ; fi
		@@ -216,29 +217,41 @@ case $sysdesc in
		;;
		esac

		AC_CHECK_HEADER(syslog.h, [AC_DEFINE(HAVE_SYSLOG)])
		AC_CHECK_HEADER(alloca.h, [AC_DEFINE(HAVE_ALLOCA_H)])
		AC_CHECK_HEADER([linux/lwtunnel.h], [AC_DEFINE(HAVE_LWTUNNEL)])
		AC_CHECK_MEMBERS([struct rtvia.rtvia_family], [AC_DEFINE(HAVE_STRUCT_RTVIA)],,[#include <linux/rtnetlink.h>])
		AC_CHECK_HEADERS_ONCE([alloca.h syslog.h])
		AC_CHECK_HEADER([linux/lwtunnel.h], [AC_DEFINE([HAVE_LWTUNNEL], [1], [Define to 1 if you have the <linux/lwtunnel.h> header file.])])
		AC_CHECK_MEMBERS([struct rtvia.rtvia_family], [AC_DEFINE([HAVE_STRUCT_RTVIA], [1], [Define to 1 if you have rtvia structure.])],,[#include <linux/rtnetlink.h>])

		AC_MSG_CHECKING(whether 'struct sockaddr' has sa_len)
		AC_TRY_COMPILE([#include <sys/types.h>
		AC_COMPILE_IFELSE([
		AC_LANG_PROGRAM(
		[[
		#include <sys/types.h>
		#include <sys/socket.h>
		], [static struct sockaddr sa; int i = sizeof(sa.sa_len);],
		[AC_MSG_RESULT(yes)
		AC_DEFINE(HAVE_SIN_LEN,,sin_len)],
		AC_MSG_RESULT(no))
		]],
		[[
		static struct sockaddr sa;
		int i = sizeof(sa.sa_len);
		]]
		)],
		[
		AC_MSG_RESULT(yes)
		AC_DEFINE(HAVE_SIN_LEN,,sin_len)
		],
		[AC_MSG_RESULT(no)]
		)

		AC_C_BIGENDIAN(
		[AC_DEFINE([CPU_BIG_ENDIAN], [1], [Define to 1 if cpu is big endian])],
		[AC_DEFINE([CPU_LITTLE_ENDIAN], [1], [Define to 1 if cpu is little endian])],
		[AC_MSG_ERROR([Cannot determine CPU endianity.])]
		)

		AC_C_BIGENDIAN([AC_DEFINE(CPU_BIG_ENDIAN)], [AC_DEFINE(CPU_LITTLE_ENDIAN)],
		[AC_MSG_ERROR([Cannot determine CPU endianity.])])

		BIRD_CHECK_INTEGERS
		BIRD_CHECK_STRUCT_ALIGN
		BIRD_CHECK_TIME_T
		BIRD_CHECK_STRUCT_IP_MREQN

		if test "$enable_debug" = yes ; then
		AC_DEFINE(DEBUGGING)
		AC_CHECK_HEADER(execinfo.h, [AC_SEARCH_LIBS([backtrace, backtrace_symbols], [c execinfo], [AC_DEFINE(HAVE_EXECINFO_H)])])
		AC_DEFINE([DEBUGGING], [1], [Define to 1 if debugging is enabled])
		AC_CHECK_HEADER(execinfo.h, [AC_SEARCH_LIBS([backtrace, backtrace_symbols], [c execinfo], [AC_DEFINE([HAVE_EXECINFO_H], [1], [Define to 1 if you have the <execinfo.h> header file.])])])
		LDFLAGS="$LDFLAGS -rdynamic"
		CFLAGS="$CFLAGS -O0 -ggdb -g3 -gdwarf-4"
		if test "$enable_memcheck" = yes ; then
		@@ -265,8 +278,8 @@ if test "$enable_client" = yes ; then
		AC_MSG_ERROR([[The client requires ncurses library. Either install the library or use --disable-client to compile without the client.]]))))))
		AC_CHECK_LIB(readline, rl_callback_read_char, CLIENT_LIBS="-lreadline $CLIENT_LIBS $USE_TERMCAP_LIB",
		AC_MSG_ERROR([[The client requires GNU readline library 2.1 or newer. Either install the library or use --disable-client to compile without the client.]]), $USE_TERMCAP_LIB)
		AC_CHECK_LIB(readline, rl_crlf, AC_DEFINE(HAVE_RL_CRLF),,$USE_TERMCAP_LIB)
		AC_CHECK_LIB(readline, rl_ding, AC_DEFINE(HAVE_RL_DING),,$USE_TERMCAP_LIB)
		AC_CHECK_LIB(readline, rl_crlf, AC_DEFINE([HAVE_RL_CRLF], [1], [Define to 1 if you have rl_crlf()]),,$USE_TERMCAP_LIB)
		AC_CHECK_LIB(readline, rl_ding, AC_DEFINE([HAVE_RL_DING], [1], [Define to 1 if you have rl_ding()]),,$USE_TERMCAP_LIB)
		fi
		AC_SUBST(CLIENT)
		AC_SUBST(CLIENT_LIBS)
		@@ -276,16 +289,15 @@ AC_CONFIG_HEADERS([$objdir/sysdep/autoconf.h:sysdep/autoconf.h.in])
		AC_CONFIG_FILES(Makefile:Makefile.in)
		AC_OUTPUT

		cat >&AC_FD_MSG <<EOF

		BIRD was configured with the following options:
		Source directory: $srcdir
		Object directory: $objdir
		Iproute2 directory: $iproutedir
		System configuration: $sysdesc
		Debugging: $enable_debug
		POSIX threads: $enable_pthreads
		Routing protocols: $protocols
		Client: $enable_client
		EOF
		AC_MSG_RESULT()
		AC_MSG_RESULT([BIRD was configured with the following options:])
		AC_MSG_RESULT([ Source directory: $srcdir])
		AC_MSG_RESULT([ Object directory: $objdir])
		AC_MSG_RESULT([ Iproute2 directory: $iproutedir])
		AC_MSG_RESULT([ System configuration: $sysdesc])
		AC_MSG_RESULT([ Debugging: $enable_debug])
		AC_MSG_RESULT([ POSIX threads: $enable_pthreads])
		AC_MSG_RESULT([ Routing protocols: $protocols])
		AC_MSG_RESULT([ Client: $enable_client])

		rm -f $objdir/.*-stamp

sysdep/autoconf.h.in

deleted100644 → 0

+0 −83

Original line number	Diff line number	Diff line
		/*
		* This file contains all system parameters automatically
		* discovered by the configure script.
		*/

		/* System configuration file */
		#define SYSCONF_INCLUDE ?

		/* Include debugging code */
		#undef DEBUGGING

		/* 8-bit integer type */
		#define INTEGER_8 ?

		/* 16-bit integer type */
		#define INTEGER_16 ?

		/* 32-bit integer type */
		#define INTEGER_32 ?

		/* 64-bit integer type */
		#define INTEGER_64 ?

		/* CPU endianity */
		#undef CPU_LITTLE_ENDIAN
		#undef CPU_BIG_ENDIAN

		/* Usual alignment for structures */
		#define CPU_STRUCT_ALIGN 1

		/* Characteristics of time_t */
		#undef TIME_T_IS_64BIT
		#undef TIME_T_IS_SIGNED

		/* We have struct ip_mreqn in <netinet/in.h> */
		#undef HAVE_STRUCT_IP_MREQN

		/* Protocols compiled in */
		#undef CONFIG_STATIC
		#undef CONFIG_RIP
		#undef CONFIG_RADV
		#undef CONFIG_BFD
		#undef CONFIG_BGP
		#undef CONFIG_OSPF
		#undef CONFIG_PIPE
		#undef CONFIG_BABEL
		#undef CONFIG_RPKI

		/* We use multithreading */
		#undef USE_PTHREADS

		/* We have <syslog.h> and syslog() */
		#undef HAVE_SYSLOG

		/* We have <alloca.h> */
		#undef HAVE_ALLOCA_H

		/* Are we using dmalloc? */
		#undef HAVE_LIBDMALLOC

		/* Readline stuff */
		#undef HAVE_RL_CRLF
		#undef HAVE_RL_DING

		/* struct sockaddr_in(6) */
		#undef HAVE_SIN_LEN

		/* We have stdint.h */
		#undef HAVE_STDINT_H

		/* We have execinfo.h */
		#undef HAVE_EXECINFO_H

		/* We have LibSSH */
		#undef HAVE_LIBSSH

		/* We have linux lwtunnel */
		#undef HAVE_LWTUNNEL

		/* We have struct rtvia */
		#undef HAVE_STRUCT_RTVIA

		#define CONFIG_PATH ?

sysdep/config.h

+11 −10

Original line number	Diff line number	Diff line
		@@ -24,16 +24,17 @@
		#include "sysdep/paths.h"

		/* Types */
		typedef signed INTEGER_8 s8;
		typedef unsigned INTEGER_8 u8;
		typedef INTEGER_16 s16;
		typedef unsigned INTEGER_16 u16;
		typedef INTEGER_32 s32;
		typedef unsigned INTEGER_32 u32;
		typedef INTEGER_64 s64;
		typedef unsigned INTEGER_64 u64;
		typedef u8 byte;
		typedef u16 word;
		#include <stdint.h>
		typedef int8_t s8;
		typedef uint8_t u8;
		typedef int16_t s16;
		typedef uint16_t u16;
		typedef int32_t s32;
		typedef uint32_t u32;
		typedef int64_t s64;
		typedef uint64_t u64;
		typedef uint8_t byte;
		typedef uint16_t word;
		typedef unsigned int uint;

		#endif

sysdep/linux/sysio.h

+0 −10

Original line number	Diff line number	Diff line
		@@ -7,16 +7,6 @@
		*/


		#ifndef HAVE_STRUCT_IP_MREQN
		/* Several versions of glibc don't define this structure, so we have to do it ourselves */
		struct ip_mreqn
		{
		struct in_addr imr_multiaddr; /* IP multicast address of group */
		struct in_addr imr_address; /* local IP address of interface */
		int imr_ifindex; /* Interface index */
		};
		#endif

		#ifndef IP_MINTTL
		#define IP_MINTTL 21
		#endif

Admin message