matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

build: remove --enable-solaris parameter

Browse source 
This switch controlled descending into the solaris/ subdirectory, which
contains package descriptions and init scripts.  If they're not
appropriate, they'd better be removed outright.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Acked-by: Greg Troxel <gdt@ir.bbn.com>
Acked-by: Feng Lu <lu.feng@6wind.com>
Acked-by: Paul Jakma <paul@jakma.org>
This commit is contained in:
David Lamparter 2014-06-28 22:07:41 +02:00 committed by Donald Sharp
parent 865730ab9f
commit a77d2023d7
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
configure.ac
View file

@ -240,8 +240,6 @@ AC_ARG_ENABLE(isisd,
[ --enable-isisd build isisd]) [ --enable-isisd build isisd])
AC_ARG_ENABLE(pimd, AC_ARG_ENABLE(pimd,
[ --disable-pimd do not build pimd]) [ --disable-pimd do not build pimd])
AC_ARG_ENABLE(solaris,
[ --enable-solaris build solaris])
AC_ARG_ENABLE(bgp-announce, AC_ARG_ENABLE(bgp-announce,
[ --disable-bgp-announce, turn off BGP route announcement]) [ --disable-bgp-announce, turn off BGP route announcement])
AC_ARG_ENABLE(snmp, AC_ARG_ENABLE(snmp,
@ -624,6 +622,7 @@ case "$host" in
AC_DEFINE(SUNOS_5, 1, SunOS 5) AC_DEFINE(SUNOS_5, 1, SunOS 5)
AC_CHECK_LIB(xnet, main) AC_CHECK_LIB(xnet, main)
CURSES=-lcurses CURSES=-lcurses
SOLARIS="solaris"
;; ;;
[*-sunos5.[8-9]] \ [*-sunos5.[8-9]] \
| [*-sunos5.1[0-9]] \ | [*-sunos5.1[0-9]] \
@ -642,12 +641,14 @@ case "$host" in
AC_DEFINE([HAVE_STACK_TRACE],1,[Stack symbols decode functionality]) AC_DEFINE([HAVE_STACK_TRACE],1,[Stack symbols decode functionality])
]) ])
CURSES=-lcurses CURSES=-lcurses
SOLARIS="solaris"
;; ;;
*-sunos5* | *-solaris2*) *-sunos5* | *-solaris2*)
AC_DEFINE(SUNOS_5,,SunOS 5, Unknown SunOS) AC_DEFINE(SUNOS_5,,SunOS 5, Unknown SunOS)
AC_CHECK_LIB(socket, main) AC_CHECK_LIB(socket, main)
AC_CHECK_LIB(nsl, main) AC_CHECK_LIB(nsl, main)
CURSES=-lcurses CURSES=-lcurses
SOLARIS="solaris"
;; ;;
*-linux*) *-linux*)
opsys=gnu-linux opsys=gnu-linux
@ -1226,13 +1227,6 @@ case "${enable_pimd}" in
esac esac
AM_CONDITIONAL(PIMD, test "x$PIMD" = "xpimd") AM_CONDITIONAL(PIMD, test "x$PIMD" = "xpimd")
# XXX Perhaps auto-enable on Solaris, but that's messy for cross builds.
case "${enable_solaris}" in
"yes") SOLARIS="solaris";;
"no" ) SOLARIS="";;
* ) ;;
esac
if test "${enable_bgp_announce}" = "no";then if test "${enable_bgp_announce}" = "no";then
AC_DEFINE(DISABLE_BGP_ANNOUNCE,1,Disable BGP installation to zebra) AC_DEFINE(DISABLE_BGP_ANNOUNCE,1,Disable BGP installation to zebra)
else else