diff options
Diffstat (limited to 'configure.ac')
| -rwxr-xr-x | configure.ac | 62 |
1 files changed, 4 insertions, 58 deletions
diff --git a/configure.ac b/configure.ac index 341f185a..ad58c3a8 100755 --- a/configure.ac +++ b/configure.ac @@ -98,15 +98,8 @@ AC_ARG_ENABLE(ospf-te, [ --enable-ospf-te enable Traffic Engineering Extension to OSPF]) AC_ARG_ENABLE(multipath, [ --enable-multipath=ARG enable multipath function, ARG must be digit]) -AC_ARG_ENABLE(zebra_user, -[ --enable-user=ARG user to run zebra suite as (default zebra)]) -AC_ARG_ENABLE(zebra_group, -[ --enable-group=ARG group to run zebra suite as (default zebra)]) -AC_ARG_ENABLE(vty_group, -[ --enable-vty-group=ARG set vty sockets to have specified group as owner]) - AC_ARG_ENABLE(rtadv, -[ --enable-rtadv disable IPV6 router advertisment feature]) +[ --enable-rtadv enable IPV6 router advertisment feature]) if test "${enable_broken_aliases}" = "yes"; then if test "${enable_netlink}" = "yes" @@ -138,37 +131,11 @@ fi AC_MSG_CHECKING(Should Zebra's RTADV be used) if test "${enable_rtadv}" = "yes"; then AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_RTADV,,Use zebra routing advertisement) + AC_DEFINE(HAVE_RTADV,,Enable Zebra IPv6 Routing Advertisements) else AC_MSG_RESULT(no) fi -if test "${enable_user}" = "yes" ; then - enable_user="zebra" -elif test "${enable_user}" = "no"; then - enable_user="root" -fi -AC_DEFINE_UNQUOTED(ZEBRA_USER, "${enable_user}", Zebra User) - -if test "${enable_group}" = "yes" ; then - enable_group="zebra" -elif test "${enable_group}" = "no"; then - enable_group="root" -fi -AC_DEFINE_UNQUOTED(ZEBRA_GROUP, "${enable_group}", Zebra Group) - -if test x"${enable_vty_group}" = x"yes" ; then - AC_MSG_ERROR([--enable-vty-group requires a group as argument]) -fi -if test "${enable_vty_group}" = ""; then - AC_MSG_ERROR([--enable-vty-group requires a group as argument]) -fi -if test x"${enable_vty_group}" != x"no"; then - if test "${enable_vty_group}" != ""; then - AC_DEFINE_UNQUOTED(VTY_GROUP, "${enable_vty_group}", VTY Sockets Group) - fi -fi - changequote(, )dnl MULTIPATH_NUM=1 @@ -897,28 +864,6 @@ AC_TRY_COMPILE([#include <sys/resource.h> AC_DEFINE(HAVE_RUSAGE,,rusage)], AC_MSG_RESULT(no)) -dnl ------------------- -dnl capabilities checks -dnl ------------------- -AC_MSG_CHECKING(whether prctl PR_SET_KEEPCAPS is available) -AC_TRY_COMPILE([#include <sys/prctl.h>],[prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0);], - [AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_PR_SET_KEEPCAPS,,prctl) - zebra_ac_keepcaps="yes"], - AC_MSG_RESULT(no) -) -if test x"${zebra_ac_keepcaps}" = x"yes"; then - AC_CHECK_HEADERS(sys/capability.h) -fi -if test x"${ac_cv_header_sys_capability_h}" = x"yes"; then - AC_CHECK_LIB(cap, cap_init, - [AC_DEFINE(HAVE_LCAPS,1,Capabilities) - LIBCAP="-lcap" - ] - ) -fi -AC_SUBST(LIBCAP) - dnl --------------------------- dnl check for glibc 'backtrace' dnl --------------------------- @@ -971,7 +916,7 @@ else AC_MSG_RESULT(${zebra_statedir}) fi if test $zebra_statedir = "/dev/null"; then - echo "STATE DIRECTORY NOT FOUND!" + AC_MSG_ERROR('STATE DIRECTORY NOT FOUND! FIX OR SPECIFY --localstatedir!') fi AC_DEFINE_UNQUOTED(PATH_ZEBRA_PID, "$zebra_statedir/zebra.pid",zebra PID) @@ -1021,6 +966,7 @@ host operationg system : ${host_os} source code location : ${srcdir} compiler : ${CC} compiler flags : ${CFLAGS} +linker flags : ${LDFLAGS} ${LIBS} state file directory : ${zebra_statedir} linker flags : ${LDFLAGS} ${LIBS} " |