build: remove --enable-solaris parameter
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>
diff --git a/configure.ac b/configure.ac
index 4465a08..1583fb6 100755
--- a/configure.ac
+++ b/configure.ac
@@ -222,8 +222,6 @@
[ --enable-isisd build isisd])
AC_ARG_ENABLE(pimd,
[ --enable-pimd build pimd])
-AC_ARG_ENABLE(solaris,
-[ --enable-solaris build solaris])
AC_ARG_ENABLE(bgp-announce,
[ --disable-bgp-announce, turn off BGP route announcement])
AC_ARG_ENABLE(snmp,
@@ -576,6 +574,7 @@
AC_DEFINE(SUNOS_5, 1, SunOS 5)
AC_CHECK_LIB(xnet, main)
CURSES=-lcurses
+ SOLARIS="solaris"
;;
[*-sunos5.[8-9]] \
| [*-sunos5.1[0-9]] \
@@ -594,12 +593,14 @@
AC_DEFINE([HAVE_STACK_TRACE],1,[Stack symbols decode functionality])
])
CURSES=-lcurses
+ SOLARIS="solaris"
;;
*-sunos5* | *-solaris2*)
AC_DEFINE(SUNOS_5,,SunOS 5, Unknown SunOS)
AC_CHECK_LIB(socket, main)
AC_CHECK_LIB(nsl, main)
CURSES=-lcurses
+ SOLARIS="solaris"
;;
*-linux*)
opsys=gnu-linux
@@ -1183,13 +1184,6 @@
esac
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
AC_DEFINE(DISABLE_BGP_ANNOUNCE,1,Disable BGP installation to zebra)
else