forked from Mirror/frr
Make vtysh work on NetBSD, and minor cleanups:
if --enable-vtysh, look for perl, and substitute into vtysh/extract.pl, rather than assuming perl is in /usr/bin Look for tputs in libtermcap and libcurses, in addition to previously-searched locations. Follow GNU readlines search order. Clean up --enable-vtysh definition in configure.ac. Add vtysh/vtysh_cmds.c to CLEANFILES. This is important if extract.pl fails, so that 'make clean && make' will regenerate vtysh_cmds.c rhather than using the old zero-length file.
This commit is contained in:
gdt
parent
cf31388906
commit
fc9d074576
|
|
@ -1,3 +1,9 @@
|
||||||
|
2004-06-30 Greg Troxel <gdt@poblano.ir.bbn.com>
|
||||||
|
|
||||||
|
* configure.ac: Look for perl, and substitute into vtysh/extract.pl.
|
||||||
|
Search for termcap functions more expansively (fixes vtysh compile
|
||||||
|
on NetBSD). Clean up --enable-vtysh definition.
|
||||||
|
|
||||||
2004-06-30 Greg Troxel <gdt@poblano.ir.bbn.com>
|
2004-06-30 Greg Troxel <gdt@poblano.ir.bbn.com>
|
||||||
|
|
||||||
* update-autotools: Use -rf on autom4te.cache.
|
* update-autotools: Use -rf on autom4te.cache.
|
||||||
|
|
|
||||||
20
configure.ac
20
configure.ac
|
|
@ -5,7 +5,7 @@
|
||||||
## Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro <kunihiro@zebra.org>
|
## Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro <kunihiro@zebra.org>
|
||||||
## Portions Copyright (c) 2003 Paul Jakma <paul@dishone.st>
|
## Portions Copyright (c) 2003 Paul Jakma <paul@dishone.st>
|
||||||
##
|
##
|
||||||
## $Id: configure.ac,v 1.53 2004/06/20 21:00:27 hasso Exp $
|
## $Id: configure.ac,v 1.54 2004/06/30 14:25:12 gdt Exp $
|
||||||
AC_PREREQ(2.53)
|
AC_PREREQ(2.53)
|
||||||
|
|
||||||
AC_INIT(quagga, 0.96.5, [http://bugzilla.quagga.net])
|
AC_INIT(quagga, 0.96.5, [http://bugzilla.quagga.net])
|
||||||
|
|
@ -68,7 +68,7 @@ dnl ----------------------
|
||||||
dnl Packages configuration
|
dnl Packages configuration
|
||||||
dnl ----------------------
|
dnl ----------------------
|
||||||
AC_ARG_ENABLE(vtysh,
|
AC_ARG_ENABLE(vtysh,
|
||||||
[ --enable-vtysh, Make integrated vty shell for Quagga])
|
[ --enable-vtysh include integrated vty shell for Quagga])
|
||||||
AC_ARG_ENABLE(ipv6,
|
AC_ARG_ENABLE(ipv6,
|
||||||
[ --disable-ipv6 turn off IPv6 related features and daemons])
|
[ --disable-ipv6 turn off IPv6 related features and daemons])
|
||||||
AC_ARG_ENABLE(zebra,
|
AC_ARG_ENABLE(zebra,
|
||||||
|
|
@ -286,10 +286,18 @@ dnl ---------------------
|
||||||
case "${enable_vtysh}" in
|
case "${enable_vtysh}" in
|
||||||
"yes") VTYSH="vtysh";
|
"yes") VTYSH="vtysh";
|
||||||
AC_DEFINE(VTYSH,,VTY shell)
|
AC_DEFINE(VTYSH,,VTY shell)
|
||||||
AC_CHECK_LIB(tinfo, tputs, , AC_CHECK_LIB(ncurses, tputs))
|
AC_PATH_PROG(PERL, perl)
|
||||||
|
dnl Vtysh uses libreadline, which looks for termcap functions at
|
||||||
|
dnl configure time. We follow readline's search order.
|
||||||
|
dnl The required procedures are in libtermcap on NetBSD, in
|
||||||
|
dnl [TODO] on Linux, and in [TODO] on Solaris.
|
||||||
|
AC_CHECK_LIB(termcap, tputs, ,
|
||||||
|
AC_CHECK_LIB(tinfo, tputs, ,
|
||||||
|
AC_CHECK_LIB(curses, tputs, ,
|
||||||
|
AC_CHECK_LIB(ncurses, tputs))))
|
||||||
AC_CHECK_LIB(readline, main)
|
AC_CHECK_LIB(readline, main)
|
||||||
if test $ac_cv_lib_readline_main = no; then
|
if test $ac_cv_lib_readline_main = no; then
|
||||||
AC_MSG_ERROR([vtysh needs libreadline but was not found on your system.])
|
AC_MSG_ERROR([vtysh needs libreadline but was not found and usable on your system.])
|
||||||
fi
|
fi
|
||||||
AC_CHECK_HEADER(readline/history.h)
|
AC_CHECK_HEADER(readline/history.h)
|
||||||
if test $ac_cv_header_readline_history_h = no;then
|
if test $ac_cv_header_readline_history_h = no;then
|
||||||
|
|
@ -1106,8 +1114,10 @@ AC_OUTPUT(Makefile lib/Makefile zebra/Makefile ripd/Makefile
|
||||||
ripngd/Makefile bgpd/Makefile ospfd/Makefile
|
ripngd/Makefile bgpd/Makefile ospfd/Makefile
|
||||||
ospf6d/Makefile isisd/Makefile vtysh/Makefile doc/Makefile
|
ospf6d/Makefile isisd/Makefile vtysh/Makefile doc/Makefile
|
||||||
ospfclient/Makefile
|
ospfclient/Makefile
|
||||||
|
vtysh/extract.pl
|
||||||
redhat/Makefile redhat/quagga.spec
|
redhat/Makefile redhat/quagga.spec
|
||||||
lib/version.h)
|
lib/version.h,
|
||||||
|
[chmod +x vtysh/extract.pl])
|
||||||
|
|
||||||
echo "
|
echo "
|
||||||
zebra configuration
|
zebra configuration
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,9 @@
|
||||||
|
2004-06-30 Greg Troxel <gdt@poblano.ir.bbn.com>
|
||||||
|
|
||||||
|
* extract.pl.in: Rename from extract.pl, with @PERL@.
|
||||||
|
|
||||||
|
* Makefile.am: Add vtysh_cmds.c to CLEANFILES.
|
||||||
|
|
||||||
2004-06-20 Hasso Tepper <hasso@estpak.ee>
|
2004-06-20 Hasso Tepper <hasso@estpak.ee>
|
||||||
|
|
||||||
* extract.pl: Zebra daemon has access lists as well.
|
* extract.pl: Zebra daemon has access lists as well.
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ bin_PROGRAMS = vtysh
|
||||||
|
|
||||||
vtysh_SOURCES = vtysh_main.c vtysh.c vtysh_user.c vtysh_config.c
|
vtysh_SOURCES = vtysh_main.c vtysh.c vtysh_user.c vtysh_config.c
|
||||||
nodist_vtysh_SOURCES = vtysh_cmd.c
|
nodist_vtysh_SOURCES = vtysh_cmd.c
|
||||||
|
CLEANFILES = vtysh_cmd.c
|
||||||
noinst_HEADERS = vtysh.h vtysh_user.h
|
noinst_HEADERS = vtysh.h vtysh_user.h
|
||||||
vtysh_LDADD = ../lib/libzebra.a @LIBCAP@
|
vtysh_LDADD = ../lib/libzebra.a @LIBCAP@
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#! /usr/bin/perl
|
#! @PERL@
|
||||||
##
|
##
|
||||||
## Virtual terminal interface shell command extractor.
|
## Virtual terminal interface shell command extractor.
|
||||||
## Copyright (C) 2000 Kunihiro Ishiguro
|
## Copyright (C) 2000 Kunihiro Ishiguro
|
||||||
Loading…
Reference in a new issue