Mailing List Archive: Solaris patch for --enable-ipv6 option

Hi Sangeeta,

On Fri, 7 May 2004, Sangeeta Misra wrote:

> The configure script of Quagga does not contain Solaris hooks for the
> "--enable-ipv6" option. Attached is the fix for it. Please indicate how to
> have this fix integrated into the codebase.

I'm currently looking at going with something along the below lines.
I know a lot of the rest of the autoconf script greps away in various
places for things, but it is not generally good practice. (breaks
cross-compiles, and other odd build environtments where build target
is not configured same as build host). Instead, I think'd be better
to check whether host is solaris 2.6 -> 2.8 or whether it is 2.9 or
up. (Solaris 8 == solaris2.8 for GNU autoconf). What do you think?

> Sangeeta

Index: configure.ac
===================================================================
RCS file: /var/cvsroot/quagga/configure.ac,v
retrieving revision 1.50
diff -u -r1.50 configure.ac
--- configure.ac 3 May 2004 12:50:39 -0000 1.50
+++ configure.ac 10 May 2004 14:48:12 -0000
@@ -233,14 +233,24 @@

dnl Some systems (Solaris 2.x) require libnsl (Network Services Library)
case "$host" in
- *-sunos5.6* | *-solaris2.6*)
+ [*-sunos5.[6-8]*] | [*-solaris2.[6-8]*])
opsys=sol2-6
- AC_DEFINE(SUNOS_5,,SunOS 5)
+ AC_DEFINE(SUNOS_56, 1, SunOS 5.6 to 5.8)
+ AC_DEFINE(SUNOS_5, 1, SunOS 5)
AC_CHECK_LIB(xnet, main)
CURSES=-lcurses
;;
+ [*-sunos5.[8-9]] | [*-sunos5.1[0-9]] \
+ | [*-solaris2.[8-9]] | [*-solaris2.1[0-9]])
+ opsys=sol9
+ AC_DEFINE(SUNOS_59,,SunOS 5.9 up)
+ AC_DEFINE(SUNOS_5, 1, SunOS 5)
+ AC_CHECK_LIB(socket, main)
+ AC_CHECK_LIB(nsl, main)
+ CURSES=-lcurses
+ ;;
*-sunos5* | *-solaris2*)
- AC_DEFINE(SUNOS_5,,SunOS 5)
+ AC_DEFINE(SUNOS_5,,SunOS 5, Unknown SunOS)
AC_CHECK_LIB(socket, main)
AC_CHECK_LIB(nsl, main)
CURSES=-lcurses
@@ -396,17 +406,20 @@
AC_DEFINE(HAVE_NETLINK,,netlink)
netlink=yes
fi
+elif test x"$opsys" = x"sol2-6";then
+ AC_MSG_RESULT(Solaris)
+ KERNEL_METHOD="kernel_socket.o"
+ RT_METHOD="rt_socket.o"
+elif test x"$opsys" = x"sol9";then
+ AC_MSG_RESULT(Solaris)
+ KERNEL_METHOD="kernel_socket.o"
+ RT_METHOD="rt_socket.o"
+elif test "$opsys" = "irix" ; then
+ AC_MSG_RESULT(irix)
+ KERNEL_METHOD="kernel_socket.o"
+ RT_METHOD="rt_socket.o"
else
- if test "$opsys" = "sol2-6";then
- AC_MSG_RESULT(solaris)
- KERNEL_METHOD="kernel_socket.o"
- RT_METHOD="rt_socket.o"
- elif test "$opsys" = "irix" ; then
- AC_MSG_RESULT(irix)
- KERNEL_METHOD="kernel_socket.o"
- RT_METHOD="rt_socket.o"
- else
- AC_TRY_RUN([.#include <errno.h>
+ AC_TRY_RUN([.#include <errno.h>
#include <sys/types.h>
#include <sys/socket.h>

@@ -427,7 +440,6 @@
[KERNEL_METHOD=kernel_socket.o
RT_METHOD=rt_socket.o
AC_MSG_RESULT(socket)])
- fi
fi
AC_SUBST(RT_METHOD)
AC_SUBST(KERNEL_METHOD)
@@ -464,30 +476,34 @@
dnl -----------------------------
dnl check interface lookup method
dnl -----------------------------
+IOCTL_METHOD=ioctl.o
AC_MSG_CHECKING(interface looking up method)
if test "$netlink" = yes; then
AC_MSG_RESULT(netlink)
IF_METHOD=if_netlink.o
-else
- if test "$opsys" = "sol2-6";then
- AC_MSG_RESULT(solaris)
- IF_METHOD=if_ioctl.o
- elif test "$opsys" = "irix" ; then
- AC_MSG_RESULT(irix)
- IF_METHOD=if_ioctl.o
- elif test "$opsys" = "openbsd";then
- AC_MSG_RESULT(openbsd)
- IF_METHOD=if_ioctl.o
- elif grep NET_RT_IFLIST /usr/include/sys/socket.h >/dev/null 2>&1; then
- AC_MSG_RESULT(sysctl)
+elif test "$opsys" = "sol2-6";then
+ AC_MSG_RESULT(Solaris GIF)
+ IF_METHOD=if_ioctl.o
+ IOCTL_METHOD=ioctl_solaris.o
+elif test "$opsys" = "sol9";then
+ AC_MSG_RESULT(Solaris GLIF)
+ IF_METHOD=if_ioctl_solaris.o
+elif test "$opsys" = "irix" ; then
+ AC_MSG_RESULT(IRIX)
+ IF_METHOD=if_ioctl.o
+elif test "$opsys" = "openbsd";then
+ AC_MSG_RESULT(openbsd)
+ IF_METHOD=if_ioctl.o
+elif grep NET_RT_IFLIST /usr/include/sys/socket.h >/dev/null 2>&1; then
+ AC_MSG_RESULT(sysctl)
IF_METHOD=if_sysctl.o
AC_DEFINE(HAVE_NET_RT_IFLIST,,NET_RT_IFLIST)
- else
+else
AC_MSG_RESULT(ioctl)
IF_METHOD=if_ioctl.o
- fi
fi
AC_SUBST(IF_METHOD)
+AC_SUBST(IOCTL_METHOD)

dnl -----------------------
dnl check proc file system.
@@ -592,6 +608,16 @@
else
AC_MSG_RESULT(NRL)
fi
+dnl ------------------------------------
+dnl Solaris 9, 10 and potentially higher
+dnl ------------------------------------
+ elif test x"$opsys" = x"sol9"; then
+ zebra_cv_ipv6=yes;
+ AC_DEFINE(HAVE_IPV6, 1, IPv6)
+ AC_DEFINE(SOLARIS_IPV6, 1, Solaris IPv6)
+ RIPNGD="ripngd"
+ OSPF6D="ospf6d"
+ AC_MSG_RESULT(Solaris IPv6)
dnl ----------
dnl Linux IPv6
dnl ----------

regards,
--
Paul Jakma paul@clubi.ie paul@jakma.org Key ID: 64A2FF6A
warning: do not ever send email to spam@dishone.st
Fortune:
We come to bury DOS, not to praise it.
(Paul Vojta, vojta@math.berkeley.edu, paraphrasing a quote of Shakespeare)

On Tue, 11 May 2004, Greg Troxel wrote:

> to check whether host is solaris 2.6 -> 2.8 or whether it is 2.9 or
>
> Shouldn't we check target, not host, to keep crossbuilding working?

target is set to host, according to what i read in the docs. I'm not
sure what target is for. host is the target essentially, and not
neccessarily the build host :)

> Does the solaris v6 implementation exist on other than solaris?

Dont think so.

> (Patches are generally requested against CVS, with ChangeLog entries;
> see HACKING in CVS.)

I have these changes here too. Essentially Sowmini's patches as
discussed in October (iirc). Along with some worthwhile cleanups
which she hadnt submitted.

regards,
--
Paul Jakma paul@clubi.ie paul@jakma.org Key ID: 64A2FF6A
warning: do not ever send email to spam@dishone.st
Fortune:
Save energy: Drive a smaller shell.

Mailing List Archive

Mailing List Archive

Attached Files: