Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Small change to make BIRD's IPv6 packaging easier

Browse source
This commit is contained in:
Ondrej Filip 2009-06-02 00:28:08 +02:00
parent 9be1086d29
commit dc16584ac2
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configure.in
View file

@ -42,11 +42,13 @@ AC_SUBST(srcdir_rel_mf)
if test "$enable_ipv6" = yes ; then if test "$enable_ipv6" = yes ; then
ip=ipv6 ip=ipv6
SUFFIX6=6
if test "$with_protocols" = all ; then if test "$with_protocols" = all ; then
with_protocols=bgp,pipe,rip,static with_protocols=bgp,pipe,rip,static
fi fi
else else
ip=ipv4 ip=ipv4
SUFFIX6=""
if test "$with_protocols" = all ; then if test "$with_protocols" = all ; then
with_protocols=bgp,ospf,pipe,rip,static with_protocols=bgp,ospf,pipe,rip,static
fi fi
@ -208,6 +210,7 @@ if test "$enable_client" = yes ; then
fi fi
AC_SUBST(CLIENT) AC_SUBST(CLIENT)
AC_SUBST(CLIENT_LIBS) AC_SUBST(CLIENT_LIBS)
AC_SUBST(SUFFIX6)
mkdir -p $objdir/sysdep mkdir -p $objdir/sysdep
AC_CONFIG_HEADERS([$objdir/sysdep/autoconf.h:sysdep/autoconf.h.in]) AC_CONFIG_HEADERS([$objdir/sysdep/autoconf.h:sysdep/autoconf.h.in])

8
sysdep/config.h
View file

@ -38,11 +38,11 @@ typedef u16 word;
/* Path to configuration file */ /* Path to configuration file */
#ifdef IPV6 #ifdef IPV6
# ifdef DEBUGGING # ifdef DEBUGGING
# define PATH_CONFIG "bird-6.conf" # define PATH_CONFIG "bird6.conf"
# define PATH_CONTROL_SOCKET "bird-6.ctl" # define PATH_CONTROL_SOCKET "bird6.ctl"
# else # else
# define PATH_CONFIG PATH_CONFIG_DIR "/bird-6.conf" # define PATH_CONFIG PATH_CONFIG_DIR "/bird6.conf"
# define PATH_CONTROL_SOCKET PATH_CONTROL_SOCKET_DIR "/bird-6.ctl" # define PATH_CONTROL_SOCKET PATH_CONTROL_SOCKET_DIR "/bird6.ctl"
# endif # endif
#else #else
# ifdef DEBUGGING # ifdef DEBUGGING

8
tools/Makefile.in
View file

@ -44,12 +44,12 @@ tags:
install: all install: all
$(INSTALL) -d $(sbindir) $(sysconfdir) $(localstatedir) $(INSTALL) -d $(sbindir) $(sysconfdir) $(localstatedir)
$(INSTALL_PROGRAM) -s $(exedir)/bird $(sbindir)/ $(INSTALL_PROGRAM) -s $(exedir)/bird $(sbindir)/bird@SUFFIX6@
if test -n "@CLIENT@" ; then \ if test -n "@CLIENT@" ; then \
$(INSTALL_PROGRAM) -s $(exedir)/birdc $(sbindir)/ ; \ $(INSTALL_PROGRAM) -s $(exedir)/birdc $(sbindir)/birdc@SUFFIX6@ ; \
fi fi
if ! test -f $(sysconfdir)/bird.conf ; then \ if ! test -f $(sysconfdir)/bird.@SUFFIX6@conf ; then \
$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(sysconfdir)/bird.conf ; \ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(sysconfdir)/bird@SUFFIX6@.conf ; \
else \ else \
echo "Not overwriting old bird.conf" ; \ echo "Not overwriting old bird.conf" ; \
fi fi