Nexthop: Fixed recursive route mpls label merging

[thirdparty/bird.git] / configure.in

diff --git a/configure.in b/configure.in
index 1c2c2fe1dae3e17186a164a144056a079bc2afbb..af9c452d28470152b6d30c3a592dcdcd39a35680 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -10,6 +10,7 @@ AC_ARG_ENABLE(debug,  [  --enable-debug          enable internal debugging routin
 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])
@@ -23,24 +24,16 @@ 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
-       mkdir -p obj
-       srcdir_rel=..
-       makefiles="Makefile:tools/Makefile-top.in obj/Makefile:tools/Makefile.in obj/Rules:tools/Rules.in"
-       exedir=..
 else
        # Building in separate directory
        objdir=.
-       srcdir_rel=$srcdir
-       makefiles="Makefile:tools/Makefile.in Rules:tools/Rules.in"
-       exedir=.
 fi
-case $srcdir_rel in
-       /*)     srcdir_rel_mf=$srcdir_rel ;;
-       *)      srcdir_rel_mf="\$(root-rel)$srcdir_rel" ;;
-esac
+
+exedir=.
+
 AC_SUBST(objdir)
 AC_SUBST(exedir)
-AC_SUBST(srcdir_rel_mf)
+AC_SUBST(srcdir)
 AC_SUBST(runtimedir)
 
 
@@ -65,6 +58,7 @@ if test "$ac_test_CFLAGS" != set ; then
 fi
 
 AC_PROG_CC
+AC_PROG_CC_C99
 if test -z "$GCC" ; then
        AC_MSG_ERROR([This program requires the GNU C Compiler.])
 fi
@@ -94,13 +88,30 @@ if test "$enable_pthreads" != no ; then
        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 -Wstrict-prototypes -Wno-parentheses"
+       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
@@ -162,7 +173,7 @@ 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' ' '` lib"
+sysdep_dirs="`sed <$sysdesc '/^Link: /!d;s/^Link: \(.*\)$/\1/' | tr '\012' ' '`"
 AC_MSG_RESULT($sysdep_dirs)
 AC_SUBST(sysdep_dirs)
 
@@ -175,8 +186,7 @@ fi
 
 AC_SUBST(iproutedir)
 
-# all_protocols="$proto_bfd bgp ospf pipe radv rip static"
-all_protocols="$proto_bfd ospf pipe radv rip static"
+all_protocols="$proto_bfd babel bgp ospf pipe radv rip $proto_rpki static"
 
 all_protocols=`echo $all_protocols | sed 's/ /,/g'`
 
@@ -226,6 +236,9 @@ 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
@@ -234,10 +247,13 @@ if test "$enable_debug" = yes ; then
        fi
 fi
 
-CLIENT=
+DAEMON_LIBS=
+AC_SUBST(DAEMON_LIBS)
+
+CLIENT=birdcl
 CLIENT_LIBS=
 if test "$enable_client" = yes ; then
-       CLIENT=birdc
+       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,
@@ -255,17 +271,9 @@ AC_SUBST(CLIENT_LIBS)
 
 mkdir -p $objdir/sysdep
 AC_CONFIG_HEADERS([$objdir/sysdep/autoconf.h:sysdep/autoconf.h.in])
-AC_CONFIG_COMMANDS([merge],[[export CPP="$CPP"
-$srcdir/tools/mergedirs $srcdir $srcdir_rel $objdir $sysdep_dirs]],
-       [[srcdir=$srcdir]
-       [srcdir_rel=$srcdir_rel]
-       [objdir=$objdir]
-       [sysdep_dirs="$sysdep_dirs"]])
-AC_CONFIG_FILES($makefiles)
+AC_CONFIG_FILES(Makefile:Makefile.in)
 AC_OUTPUT
 
-rm -f $objdir/sysdep/paths.h
-
 cat >&AC_FD_MSG <<EOF
 
 BIRD was configured with the following options: