diff options
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | INSTALL | 12 | ||||
| -rw-r--r-- | aclocal.m4 | 206 | ||||
| -rw-r--r-- | configure.ac | 396 | ||||
| -rw-r--r-- | configure.in | 291 | ||||
| -rw-r--r-- | lib/birdlib.h | 3 | ||||
| -rw-r--r-- | sysdep/autoconf.h.in | 83 | ||||
| -rw-r--r-- | sysdep/config.h | 22 | ||||
| -rw-r--r-- | sysdep/linux/sysio.h | 10 | ||||
| -rw-r--r-- | sysdep/unix/io.c | 2 | ||||
| -rw-r--r-- | sysdep/unix/log.c | 8 | ||||
| -rw-r--r-- | sysdep/unix/timer.h | 16 |
12 files changed, 490 insertions, 564 deletions
@@ -5,8 +5,9 @@ /bird /birdc /birdcl +/bird.conf +/bird.log /config.log /config.status /configure -/bird.conf -/bird.log +/sysdep/autoconf.h.in @@ -9,13 +9,23 @@ Default location for configuration file is /usr/local/etc/bird.conf and for control socket is /usr/local/var/run/bird.ctl . You can change that by --sysconfdir and --localstatedir configure options. +To compile current development BIRD source code from Git repository, you +also need Git (to download the source code) and Autoconf (to generate +the configure script and associated files using 'autoreconf' tool): + +$ git clone git://git.nic.cz/bird.git +$ cd bird +$ autoreconf + +Then continue as in usual installation above. + Requirements ============ For compiling BIRD you need these programs and libraries: - - GNU C Compiler + - GNU C Compiler (or LLVM Clang) - GNU Make - GNU Bison - GNU M4 @@ -1,162 +1,57 @@ 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_CACHE_CHECK([usual alignment of structures],bird_cv_c_struct_align,[ -AC_TRY_RUN([ -#include <stdio.h> - -struct { char x; long int y; } ary[2]; - -int main(void) -{ - FILE *f = fopen("conftestresult", "w"); - if (!f) return 10; - fprintf(f, "%d", sizeof(ary)/2); - fclose(f); - exit(0); -} -],[ -bird_cv_c_struct_align=`cat conftestresult` -],[ -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_DEFUN(BIRD_CHECK_TIME_T, -[AC_CACHE_CHECK([characteristics of time_t], bird_cv_type_time_t, [ -AC_TRY_RUN([ -#include <stdio.h> -#include <sys/time.h> -#include <limits.h> - -int main(void) -{ - FILE *f = fopen("conftestresult", "w"); - if (!f) return 10; - fprintf(f, "%d-bit ", sizeof(time_t)*CHAR_BIT); - if ((time_t) -1 > 0) fprintf(f, "un"); - fprintf(f, "signed"); - fclose(f); - exit(0); -} -],[bird_cv_type_time_t=`cat conftestresult` -],[ AC_MSG_RESULT([test program failed]) - AC_MSG_ERROR([Cannot determine time_t size and signedness.]) -],[bird_cv_type_time_t="32-bit signed"]) -]) -case "$bird_cv_type_time_t" in - *64-bit*) AC_DEFINE(TIME_T_IS_64BIT) ;; - esac -case "$bird_cv_type_time_t" in - *unsigned*) ;; - *) AC_DEFINE(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" - CFLAGS="$CFLAGS -pthread" - AC_CACHE_CHECK([whether POSIX threads are available], bird_cv_lib_pthreads, - [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], [[pthread_t pt; pthread_create(&pt, NULL, NULL, NULL); pthread_spinlock_t lock; pthread_spin_lock(&lock); ]])], - [bird_cv_lib_pthreads=yes], [bird_cv_lib_pthreads=no])]) + + AC_CACHE_CHECK( + [whether POSIX threads are available], + [bird_cv_lib_pthreads], + [ + AC_LINK_IFELSE( + [ + AC_LANG_PROGRAM( + [ #include <pthread.h> ], + [ + pthread_t pt; + pthread_create(&pt, NULL, NULL, NULL); + pthread_spinlock_t lock; + pthread_spin_lock(&lock); + ] + ) + ], + [bird_cv_lib_pthreads=yes], + [bird_cv_lib_pthreads=no] + ) + ] + ) CFLAGS="$bird_tmp_cflags" ]) -AC_DEFUN(BIRD_CHECK_GCC_OPTION, +AC_DEFUN([BIRD_CHECK_GCC_OPTION], [ bird_tmp_cflags="$CFLAGS" - CFLAGS="$3 $2" - AC_CACHE_CHECK([whether CC supports $2], $1, - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [$1=yes], [$1=no])]) + + AC_CACHE_CHECK( + [whether CC supports $2], + [$1], + [ + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM()], + [$1=yes], + [$1=no] + ) + ] + ) CFLAGS="$bird_tmp_cflags" ]) -AC_DEFUN(BIRD_ADD_GCC_OPTION, +AC_DEFUN([BIRD_ADD_GCC_OPTION], [ if test "$$1" = yes ; then CFLAGS="$CFLAGS $2" @@ -164,14 +59,19 @@ 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], -[# Check for GNU $1 -case `"$1" --version 2>&1` in -*GNU*) - $2;; -m4_ifval([$3], -[*) - $3;; -])esac -])# +# copied from autoconf internal _AC_PATH_PROG_FLAVOR_GNU +AC_DEFUN([BIRD_CHECK_PROG_FLAVOR_GNU], +[ + # Check for GNU $1 + case `"$1" --version 2>&1` in + *GNU*) + $2 + ;; + m4_ifval([$3], + [*) + $3 + ;; + ] + ) + esac +]) diff --git a/configure.ac b/configure.ac new file mode 100644 index 00000000..afadac2e --- /dev/null +++ b/configure.ac @@ -0,0 +1,396 @@ +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_INIT +AC_CONFIG_SRCDIR([conf/confbase.Y]) +AC_CONFIG_AUX_DIR([tools]) + +AC_ARG_ENABLE([client], + [AS_HELP_STRING([--enable-client], [enable building of BIRD client @<:@yes@:>@])], + [], + [enable_client=yes] +) + +AC_ARG_ENABLE([debug], + [AS_HELP_STRING([--enable-debug], [enable internal debugging routines @<:@no@:>@])], + [], + [enable_debug=no] +) + +AC_ARG_ENABLE([memcheck], + [AS_HELP_STRING([--enable-memcheck], [check memory allocations when debugging @<:@yes@:>@])], + [], + [enable_memcheck=yes] +) + +AC_ARG_ENABLE([pthreads], + [AS_HELP_STRING([--enable-pthreads], [enable POSIX threads support @<:@try@:>@])], + [], + [enable_pthreads=try] +) + +AC_ARG_ENABLE([libssh], + [AS_HELP_STRING([--enable-libssh], [enable LibSSH support together with RPKI @<:@try@:>@])], + [], + [enable_libssh=try] +) + +AC_ARG_WITH([protocols], + [AS_HELP_STRING([--with-protocols=LIST], [include specified routing protocols @<:@all@:>@])], + [], + [with_protocols="all"] +) + +AC_ARG_WITH([sysconfig], + [AS_HELP_STRING([--with-sysconfig=FILE], [use specified BIRD system configuration file])], + [] +) + +AC_ARG_WITH([runtimedir], + [AS_HELP_STRING([--with-runtimedir=PATH], [path for runtime files @<:@LOCALSTATEDIR/run@:>@])], + [runtimedir="$with_runtimedir"], + [runtimedir="\$(localstatedir)/run"] +) + +AC_ARG_WITH([iproutedir], + [AS_HELP_STRING([--with-iproutedir=PATH], [path to iproute2 config files @<:@/etc/iproute2@:>@])], + [given_iproutedir="yes"] +) + +AC_ARG_VAR([FLEX], [location of the Flex program]) +AC_ARG_VAR([BISON], [location of the Bison program]) +AC_ARG_VAR([M4], [location of the M4 program]) + + +if test "$srcdir" = . ; then + # Building in current directory => create obj directory holding all objects + objdir=obj +else + # Building in separate directory + objdir=. +fi + +exedir=. + +AC_SUBST([objdir]) +AC_SUBST([exedir]) +AC_SUBST([srcdir]) +AC_SUBST([runtimedir]) + + +if test "$enable_debug" = yes ; then + CONFIG_FILE="bird.conf" + CONTROL_SOCKET="bird.ctl" +else + CONFIG_FILE="\$(sysconfdir)/bird.conf" + CONTROL_SOCKET="$runtimedir/bird.ctl" +fi +AC_SUBST([CONFIG_FILE]) +AC_SUBST([CONTROL_SOCKET]) + +AC_SEARCH_LIBS([clock_gettime], [rt posix4], + [], + [AC_MSG_ERROR([Function clock_gettime not available.])] +) + +AC_CANONICAL_HOST + +# Store this value because ac_test_CFLAGS is overwritten by AC_PROG_CC +if test "$ac_test_CFLAGS" != set ; then + bird_cflags_default=yes +fi + +AC_PROG_CC +AC_PROG_CC_C99 +if test -z "$GCC" ; then + AC_MSG_ERROR([This program requires the GNU C Compiler.]) +fi + +if test "$enable_pthreads" != no ; then + BIRD_CHECK_PTHREADS + + if test "$bird_cv_lib_pthreads" = yes ; then + AC_DEFINE([USE_PTHREADS], [1], [Define to 1 if pthreads are enabled]) + CFLAGS="$CFLAGS -pthread" + LDFLAGS="$LDFLAGS -pthread" + proto_bfd=bfd + elif test "$enable_pthreads" = yes ; then + AC_MSG_ERROR([POSIX threads not available.]) + fi + + if test "$enable_pthreads" = try ; then + enable_pthreads="$bird_cv_lib_pthreads" + fi +fi + +if test "$bird_cflags_default" = yes ; then + BIRD_CHECK_GCC_OPTION([bird_cv_c_option_wno_pointer_sign], [-Wno-pointer-sign], [-Wall]) + BIRD_CHECK_GCC_OPTION([bird_cv_c_option_wno_missing_init], [-Wno-missing-field-initializers], [-Wall -Wextra]) + BIRD_CHECK_GCC_OPTION([bird_cv_c_option_fno_strict_aliasing], [-fno-strict-aliasing]) + BIRD_CHECK_GCC_OPTION([bird_cv_c_option_fno_strict_overflow], [-fno-strict-overflow]) + + CFLAGS="$CFLAGS -Wall -Wextra -Wstrict-prototypes -Wno-parentheses" + BIRD_ADD_GCC_OPTION([bird_cv_c_option_wno_pointer_sign], [-Wno-pointer-sign]) + BIRD_ADD_GCC_OPTION([bird_cv_c_option_wno_missing_init], [-Wno-missing-field-initializers]) + BIRD_ADD_GCC_OPTION([bird_cv_c_option_fno_strict_aliasing], [-fno-strict-aliasing]) + BIRD_ADD_GCC_OPTION([bird_cv_c_option_fno_strict_overflow], [-fno-strict-overflow]) +fi +AC_MSG_CHECKING([CFLAGS]) +AC_MSG_RESULT([$CFLAGS]) + + +AC_PROG_CPP +AC_PROG_INSTALL +AC_PROG_RANLIB +AC_CHECK_PROG([FLEX], [flex], [flex]) +AC_CHECK_PROG([BISON], [bison], [bison]) +AC_CHECK_PROGS([M4], [gm4 m4]) + +test -z "$FLEX" && AC_MSG_ERROR([Flex is missing.]) +test -z "$BISON" && AC_MSG_ERROR([Bison is missing.]) +test -z "$M4" && AC_MSG_ERROR([M4 is missing.]) + +BIRD_CHECK_PROG_FLAVOR_GNU([$M4], + [], + [AC_MSG_ERROR([Provided M4 is not GNU M4.])] +) + +if test -n "$with_sysconfig" -a "$with_sysconfig" != no ; then + if test -f $with_sysconfig ; then + sysdesc=$with_sysconfig + else + sysdesc=$srcdir/sysdep/cf/$with_sysconfig + if ! test -f $sysdesc ; then + sysdesc=$sysdesc.h + fi + fi +elif test -f sysconfig.h ; then + sysdesc=sysconfig +else + case "$host_os" in + linux*) + sysdesc=linux + default_iproutedir="/etc/iproute2" + ;; + freebsd*) + sysdesc=bsd + ;; + kfreebsd*) + sysdesc=bsd + ;; + netbsd*) + sysdesc=bsd + CPPFLAGS="$CPPFLAGS -I/usr/pkg/include" + LDFLAGS="$LDFLAGS -L/usr/pkg/lib -R/usr/pkg/lib" + ;; + openbsd*) + sysdesc=bsd + ;; + dragonfly*) + sysdesc=bsd + ;; + *) + AC_MSG_ERROR([Cannot determine correct system configuration. Please use --with-sysconfig to set it manually.]) + ;; + esac + sysdesc=$srcdir/sysdep/cf/$sysdesc.h +fi +AC_MSG_CHECKING([which OS configuration should we use]) +AC_MSG_RESULT([$sysdesc]) +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"], [Which sysdep header to include]) + +AC_MSG_CHECKING([system-dependent directories]) +sysdep_dirs="`sed <$sysdesc '/^Link: /!d;s/^Link: \(.*\)$/\1/' | tr '\012' ' '`" +AC_MSG_RESULT([$sysdep_dirs]) +AC_SUBST([sysdep_dirs]) + +if test "$with_iproutedir" = no ; then with_iproutedir= ; fi + +if test -n "$given_iproutedir" +then iproutedir=$with_iproutedir +else iproutedir=$default_iproutedir +fi + +AC_SUBST([iproutedir]) + +DAEMON_LIBS= +AC_SUBST(DAEMON_LIBS) + +if test "$enable_libssh" != no ; then + AC_CHECK_HEADER([libssh/libssh.h], [ ], [fail=yes], [ ]) + AC_CHECK_LIB([ssh], [ssh_connect], [ ], [fail=yes]) + + if test "$fail" != yes ; then + AC_DEFINE([HAVE_LIBSSH], [1], [Define to 1 if you have the `ssh' library (-lssh).]) + DAEMON_LIBS="-lssh $DAEMON_LIBS" + proto_rpki=rpki + enable_libssh=yes + else + if test "$enable_libssh" = yes ; then + AC_MSG_ERROR([LibSSH not available.]) + else + enable_libssh=no + fi + fi +fi + +all_protocols="$proto_bfd babel bgp ospf pipe radv rip $proto_rpki static" + +all_protocols=`echo $all_protocols | sed 's/ /,/g'` + +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 +for a in $protocols ; do + if ! test -f $srcdir/proto/$a/Makefile ; then + AC_MSG_RESULT([failed]) + AC_MSG_ERROR([Requested protocol $a not found]) + fi + AC_DEFINE_UNQUOTED([CONFIG_`echo $a | tr 'a-z' 'A-Z'`]) +done +AC_MSG_RESULT([ok]) +AC_SUBST([protocols]) + +case $sysdesc in + */linux*) + AC_CHECK_HEADER([linux/rtnetlink.h], + [], + [AC_MSG_ERROR([Appropriate version of Linux kernel headers not found.])], + [] dnl Force new AC_CHECK_HEADER semantics + ) + ;; +esac + +AC_CHECK_HEADERS_ONCE([alloca.h syslog.h]) +AC_CHECK_MEMBERS([struct sockaddr.sa_len], [], [], [#include <sys/socket.h>]) + +AC_CHECK_HEADERS([linux/lwtunnel.h], + [AC_DEFINE([HAVE_LWTUNNEL], [1], [Define to 1 if you have the <linux/lwtunnel.h> header file.])], + [], + [] dnl Force new AC_CHECK_HEADER semantics +) + +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_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.])] +) + +if test "$enable_debug" = yes ; then + AC_DEFINE([DEBUGGING], [1], [Define to 1 if debugging is enabled]) + LDFLAGS="$LDFLAGS -rdynamic" + CFLAGS="$CFLAGS -O0 -ggdb -g3 -gdwarf-4" + + AC_CHECK_HEADER([execinfo.h], + [ + AC_DEFINE([HAVE_EXECINFO_H], [1], [Define to 1 if you have the <execinfo.h> header file.]) + AC_SEARCH_LIBS([backtrace], [execinfo], + [] + [AC_MSG_ERROR([Function backtrace not available.])] + ) + ] + ) + + if test "$enable_memcheck" = yes ; then + AC_CHECK_LIB([dmalloc], [dmalloc_debug]) + if test $ac_cv_lib_dmalloc_dmalloc_debug != yes ; then + AC_CHECK_LIB([efence], [malloc]) + fi + fi +fi + +CLIENT=birdcl +CLIENT_LIBS= +if test "$enable_client" = yes ; then + CLIENT="$CLIENT birdc" + BASE_LIBS="$LIBS" + LIBS="" + + AC_CHECK_HEADERS([curses.h], + [], + [AC_MSG_ERROR([The client requires ncurses library. Either install the library or use --disable-client to compile without the client.])], + [] dnl Force new AC_CHECK_HEADER semantics + ) + + AC_SEARCH_LIBS([tgetent], [tinfo tinfow ncurses curses termcap], + [TINFO_LIBS="$LIBS"; LIBS=""], + [AC_MSG_ERROR([The client requires ncurses library. Either install the library or use --disable-client to compile without the client.])], + ) + + AC_CHECK_HEADERS([readline/readline.h readline/history.h], + [], + [AC_MSG_ERROR([The client requires GNU Readline library. Either install the library or use --disable-client to compile without the client.])], + [] dnl Force new AC_CHECK_HEADER semantics + ) + + AC_SEARCH_LIBS([add_history], [history], + [HISTORY_LIBS="$LIBS"; LIBS=""], + [AC_MSG_ERROR([The client requires GNU Readline library. Either install the library or use --disable-client to compile without the client.])], + ) + + AC_SEARCH_LIBS([rl_callback_read_char], [readline], + [READLINE_LIBS="$LIBS"; LIBS=""], + [AC_MSG_ERROR([The client requires GNU Readline library. Either install the library or use --disable-client to compile without the client.])], + [$TINFO_LIBS] + ) + + AC_CHECK_LIB([readline], [rl_crlf], + [AC_DEFINE([HAVE_RL_CRLF], [1], [Define to 1 if you have rl_crlf()])], + [], + [$TINFO_LIBS] + ) + + AC_CHECK_LIB([readline], [rl_ding], + [AC_DEFINE([HAVE_RL_DING], [1], [Define to 1 if you have rl_ding()])], + [], + [$TINFO_LIBS] + ) + + LIBS="$BASE_LIBS" + CLIENT_LIBS="$READLINE_LIBS $HISTORY_LIBS $TINFO_LIBS" +fi +AC_SUBST([CLIENT]) +AC_SUBST([CLIENT_LIBS]) + +mkdir -p $objdir/sysdep +AC_CONFIG_HEADERS([$objdir/sysdep/autoconf.h:sysdep/autoconf.h.in]) +AC_CONFIG_FILES([Makefile:Makefile.in]) +AC_OUTPUT + +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 diff --git a/configure.in b/configure.in deleted file mode 100644 index a661734a..00000000 --- a/configure.in +++ /dev/null @@ -1,291 +0,0 @@ -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_CONFIG_AUX_DIR(tools) - -AC_ARG_ENABLE(debug, [ --enable-debug enable internal debugging routines (default: disabled)],,enable_debug=no) -AC_ARG_ENABLE(memcheck, [ --enable-memcheck check memory allocations when debugging (default: enabled)],,enable_memcheck=yes) -AC_ARG_ENABLE(client, [ --enable-client enable building of BIRD client (default: enabled)],,enable_client=yes) -AC_ARG_ENABLE(pthreads, [ --enable-pthreads enable POSIX threads support (default: detect)],,enable_pthreads=try) -AC_ARG_ENABLE(libssh, [ --enable-libssh enable LibSSH support together with RPKI protocol (default: detect)],,enable_libssh=try) -AC_ARG_WITH(sysconfig, [ --with-sysconfig=FILE use specified BIRD system configuration file]) -AC_ARG_WITH(protocols, [ --with-protocols=LIST include specified routing protocols (default: all)],,[with_protocols="all"]) -AC_ARG_WITH(sysinclude, [ --with-sysinclude=PATH search for system includes on specified place]) -AC_ARG_WITH(runtimedir, [ --with-runtimedir=PATH path for runtime files (default: $(localstatedir)/run)],[runtimedir="$with_runtimedir"],[runtimedir="\$(localstatedir)/run"]) -AC_ARG_WITH(iproutedir, [ --with-iproutedir=PATH path to iproute2 config files (default: /etc/iproute2)],[given_iproutedir="yes"]) -AC_ARG_VAR([FLEX], [location of the Flex program]) -AC_ARG_VAR([BISON], [location of the Bison program]) -AC_ARG_VAR([M4], [location of the M4 program]) - - -if test "$srcdir" = . ; then - # Building in current directory => create obj directory holding all objects - objdir=obj -else - # Building in separate directory - objdir=. -fi - -exedir=. - -AC_SUBST(objdir) -AC_SUBST(exedir) -AC_SUBST(srcdir) -AC_SUBST(runtimedir) - - -if test "$enable_debug" = yes ; then - CONFIG_FILE="bird.conf" - CONTROL_SOCKET="bird.ctl" -else - CONFIG_FILE="\$(sysconfdir)/bird.conf" - CONTROL_SOCKET="$runtimedir/bird.ctl" -fi -AC_SUBST(CONFIG_FILE) -AC_SUBST(CONTROL_SOCKET) - -AC_SEARCH_LIBS(clock_gettime, [c rt posix4], , - AC_MSG_ERROR([[Function clock_gettime not available.]])) - -AC_CANONICAL_HOST - -# Store this value because ac_test_CFLAGS is overwritten by AC_PROG_CC -if test "$ac_test_CFLAGS" != set ; then - bird_cflags_default=yes -fi - -AC_PROG_CC -AC_PROG_CC_C99 -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) - CFLAGS="$CFLAGS -pthread" - LDFLAGS="$LDFLAGS -pthread" - proto_bfd=bfd - elif test "$enable_pthreads" = yes ; then - AC_MSG_ERROR([POSIX threads not available.]) - fi - - if test "$enable_pthreads" = try ; then - enable_pthreads="$bird_cv_lib_pthreads" - fi -fi - -if test "$enable_libssh" != no ; then - AC_CHECK_LIB(ssh, ssh_connect) - 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.]) - else - enable_libssh=no - fi - fi -fi - -if test "$bird_cflags_default" = yes ; then - BIRD_CHECK_GCC_OPTION(bird_cv_c_option_wno_pointer_sign, -Wno-pointer-sign, -Wall) - BIRD_CHECK_GCC_OPTION(bird_cv_c_option_wno_missing_init, -Wno-missing-field-initializers, -Wall -Wextra) - BIRD_CHECK_GCC_OPTION(bird_cv_c_option_fno_strict_aliasing, -fno-strict-aliasing) - BIRD_CHECK_GCC_OPTION(bird_cv_c_option_fno_strict_overflow, -fno-strict-overflow) - - CFLAGS="$CFLAGS -Wall -Wextra -Wstrict-prototypes -Wno-parentheses" - BIRD_ADD_GCC_OPTION(bird_cv_c_option_wno_pointer_sign, -Wno-pointer-sign) - BIRD_ADD_GCC_OPTION(bird_cv_c_option_wno_missing_init, -Wno-missing-field-initializers) - BIRD_ADD_GCC_OPTION(bird_cv_c_option_fno_strict_aliasing, -fno-strict-aliasing) - BIRD_ADD_GCC_OPTION(bird_cv_c_option_fno_strict_overflow, -fno-strict-overflow) -fi -AC_MSG_CHECKING([CFLAGS]) -AC_MSG_RESULT($CFLAGS) - - -AC_PROG_CPP -AC_PROG_INSTALL -AC_PROG_RANLIB -AC_CHECK_PROG(FLEX, flex, flex) -AC_CHECK_PROG(BISON, bison, bison) -AC_CHECK_PROGS(M4, gm4 m4) - -test -z "$FLEX" && AC_MSG_ERROR([Flex is missing.]) -test -z "$BISON" && AC_MSG_ERROR([Bison is missing.]) -test -z "$M4" && AC_MSG_ERROR([M4 is missing.]) -BIRD_CHECK_PROG_FLAVOR_GNU([$M4], , [AC_MSG_ERROR([Provided M4 is not GNU M4.])]) - -if test -n "$with_sysconfig" -a "$with_sysconfig" != no ; then - if test -f $with_sysconfig ; then - sysdesc=$with_sysconfig - else - sysdesc=$srcdir/sysdep/cf/$with_sysconfig - if ! test -f $sysdesc ; then - sysdesc=$sysdesc.h - fi - fi -elif test -f sysconfig.h ; then - sysdesc=sysconfig -else - case "$host_os" in - linux*) sysdesc=linux - default_iproutedir="/etc/iproute2" - ;; - freebsd*) sysdesc=bsd - ;; - kfreebsd*) sysdesc=bsd - ;; - netbsd*) sysdesc=bsd - CPPFLAGS="$CPPFLAGS -I/usr/pkg/include" - LDFLAGS="$LDFLAGS -L/usr/pkg/lib -R/usr/pkg/lib" - ;; - openbsd*) sysdesc=bsd - ;; - dragonfly*) sysdesc=bsd - ;; - *) AC_MSG_ERROR([Cannot determine correct system configuration. Please use --with-sysconfig to set it manually.]) - ;; - esac - sysdesc=$srcdir/sysdep/cf/$sysdesc.h -fi -AC_MSG_CHECKING([which OS configuration should we use]) -AC_MSG_RESULT($sysdesc) -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_MSG_CHECKING([system-dependent directories]) -sysdep_dirs="`sed <$sysdesc '/^Link: /!d;s/^Link: \(.*\)$/\1/' | tr '\012' ' '`" -AC_MSG_RESULT($sysdep_dirs) -AC_SUBST(sysdep_dirs) - -if test "$with_iproutedir" = no ; then with_iproutedir= ; fi - -if test -n "$given_iproutedir" -then iproutedir=$with_iproutedir -else iproutedir=$default_iproutedir -fi - -AC_SUBST(iproutedir) - -all_protocols="$proto_bfd babel bgp ospf pipe radv rip $proto_rpki static" - -all_protocols=`echo $all_protocols | sed 's/ /,/g'` - -if test "$with_protocols" = all ; then - with_protocols="$all_protocols" -fi - -AC_MSG_CHECKING([protocols]) -protocols=`echo "$with_protocols" | sed 's/,/ /g'` -if test "$protocols" = no ; then protocols= ; fi -for a in $protocols ; do - if ! test -f $srcdir/proto/$a/Makefile ; then - AC_MSG_RESULT(failed) - AC_MSG_ERROR([Requested protocol $a not found.]) - fi - AC_DEFINE_UNQUOTED(CONFIG_`echo $a | tr 'a-z' 'A-Z'`) - done -AC_MSG_RESULT(ok) -AC_SUBST(protocols) - -case $sysdesc in - */linux*) - AC_CHECK_HEADER(linux/rtnetlink.h,,[AC_MSG_ERROR([Appropriate version of Linux kernel headers not found.])],[ -#include <asm/types.h> -#include <sys/socket.h> -]) - ;; -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_MSG_CHECKING(whether 'struct sockaddr' has sa_len) -AC_TRY_COMPILE([#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)) - -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)])]) - LDFLAGS="$LDFLAGS -rdynamic" - CFLAGS="$CFLAGS -O0 -ggdb -g3 -gdwarf-4" - if test "$enable_memcheck" = yes ; then - AC_CHECK_LIB(dmalloc, dmalloc_debug) - if test $ac_cv_lib_dmalloc_dmalloc_debug != yes ; then - AC_CHECK_LIB(efence, malloc) - fi - fi -fi - -DAEMON_LIBS= -AC_SUBST(DAEMON_LIBS) - -CLIENT=birdcl -CLIENT_LIBS= -if test "$enable_client" = yes ; then - CLIENT="$CLIENT birdc" - AC_CHECK_LIB(history, add_history, CLIENT_LIBS="-lhistory") - AC_CHECK_LIB(ncurses, tgetent, USE_TERMCAP_LIB=-lncurses, - AC_CHECK_LIB(curses, tgetent, USE_TERMCAP_LIB=-lcurses, - AC_CHECK_LIB(tinfow, tgetent, USE_TERMCAP_LIB=-ltinfow, - AC_CHECK_LIB(tinfo, tgetent, USE_TERMCAP_LIB=-ltinfo, - AC_CHECK_LIB(termcap, tgetent, USE_TERMCAP_LIB=-ltermcap, - 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) -fi -AC_SUBST(CLIENT) -AC_SUBST(CLIENT_LIBS) - -mkdir -p $objdir/sysdep -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 -rm -f $objdir/.*-stamp diff --git a/lib/birdlib.h b/lib/birdlib.h index c82082c1..317b5202 100644 --- a/lib/birdlib.h +++ b/lib/birdlib.h @@ -14,9 +14,12 @@ /* Ugly structure offset handling macros */ +struct align_probe { char x; long int y; }; + #define OFFSETOF(s, i) ((size_t) &((s *)0)->i) #define SKIP_BACK(s, i, p) ((s *)((char *)p - OFFSETOF(s, i))) #define BIRD_ALIGN(s, a) (((s)+a-1)&~(a-1)) +#define CPU_STRUCT_ALIGN (sizeof(struct align_probe)) /* Utility macros */ diff --git a/sysdep/autoconf.h.in b/sysdep/autoconf.h.in deleted file mode 100644 index fbaba2ce..00000000 --- a/sysdep/autoconf.h.in +++ /dev/null @@ -1,83 +0,0 @@ -/* - * 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 ? diff --git a/sysdep/config.h b/sysdep/config.h index 2ec31500..fb710d86 100644 --- a/sysdep/config.h +++ b/sysdep/config.h @@ -24,16 +24,18 @@ #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 diff --git a/sysdep/linux/sysio.h b/sysdep/linux/sysio.h index 58644417..b1cc25dc 100644 --- a/sysdep/linux/sysio.h +++ b/sysdep/linux/sysio.h @@ -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 diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c index 6722fc69..d1246ea5 100644 --- a/sysdep/unix/io.c +++ b/sysdep/unix/io.c @@ -516,7 +516,7 @@ static inline void sockaddr_fill4(struct sockaddr_in *sa, ip_addr a, uint port) { memset(sa, 0, sizeof(struct sockaddr_in)); -#ifdef HAVE_SIN_LEN +#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN sa->sin_len = sizeof(struct sockaddr_in); #endif sa->sin_family = AF_INET; diff --git a/sysdep/unix/log.c b/sysdep/unix/log.c index 42c933ef..06d3b09e 100644 --- a/sysdep/unix/log.c +++ b/sysdep/unix/log.c @@ -56,7 +56,7 @@ static int main_thread_self(void) { return 1; } #endif -#ifdef HAVE_SYSLOG +#ifdef HAVE_SYSLOG_H #include <sys/syslog.h> static int syslog_priorities[] = { @@ -127,7 +127,7 @@ log_commit(int class, buffer *buf) fputc('\n', l->fh); fflush(l->fh); } -#ifdef HAVE_SYSLOG +#ifdef HAVE_SYSLOG_H else syslog(syslog_priorities[class], "%s", buf->start); #endif @@ -262,7 +262,7 @@ default_log_list(int debug, int init, char **syslog_name) init_list(&init_log_list); *syslog_name = NULL; -#ifdef HAVE_SYSLOG +#ifdef HAVE_SYSLOG_H if (!debug) { static struct log_config lc_syslog = { .mask = ~0 }; @@ -287,7 +287,7 @@ log_switch(int debug, list *l, char *new_syslog_name) current_log_list = l; -#ifdef HAVE_SYSLOG +#ifdef HAVE_SYSLOG_H if (current_syslog_name && new_syslog_name && !strcmp(current_syslog_name, new_syslog_name)) return; diff --git a/sysdep/unix/timer.h b/sysdep/unix/timer.h index 99d43932..ae5a27e8 100644 --- a/sysdep/unix/timer.h +++ b/sysdep/unix/timer.h @@ -77,14 +77,12 @@ bird_clock_t tm_parse_datetime(char *); /* Convert date to bird_clock_t */ void tm_format_datetime(char *x, struct timeformat *fmt_spec, bird_clock_t t); -#ifdef TIME_T_IS_64BIT -#define TIME_INFINITY 0x7fffffffffffffff -#else -#ifdef TIME_T_IS_SIGNED -#define TIME_INFINITY 0x7fffffff -#else -#define TIME_INFINITY 0xffffffff -#endif -#endif +#define TIME_T_IS_64BIT (sizeof(time_t) == 8) +#define TIME_T_IS_SIGNED ((time_t) -1 < 0) + +#define TIME_INFINITY \ + ((time_t) (TIME_T_IS_SIGNED ? \ + (TIME_T_IS_64BIT ? 0x7fffffffffffffff : 0x7fffffff): \ + (TIME_T_IS_64BIT ? 0xffffffffffffffff : 0xffffffff))) #endif |