config: Update Solaris compiler options and enable CHAPMS and IPV6

As suggested by James Carlson.

Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/configure b/configure
index 56816b8240f0458183501d3785dded9a12af5b6f..6a55e0f08be42a139ced1b61a25170381db5067c 100755 (executable)
--- a/configure
+++ b/configure
@@ -44,7 +44,7 @@ case $system in
        /opt/SUNWspro/bin/cc -flags >/dev/null 2>&1; then
       if [ "$archvariant" = "-64x" ]; then
         ( cd /tmp; echo "int x;" > ppp$$.c
-         /opt/SUNWspro/bin/cc -c -errwarn -xchip=opteron -xarch=amd64 ppp$$.c >/dev/null 2>&1 || (
+         /opt/SUNWspro/bin/cc -c -errwarn -xchip=opteron -m64 ppp$$.c >/dev/null 2>&1 || (
            echo "WorkShop C is unable to make 64 bit modules, and your $karch system needs"
            echo "them.  Consider upgrading cc on this machine."
            rm -f ppp$$.c

diff --git a/pppd/Makefile.sol2 b/pppd/Makefile.sol2
index 1ad4b139d3fb10b3b03f5293776483a526ca21ff..45b6b6269bd2a096a433bf284b7eac67b2d88cc7 100644 (file)
--- a/pppd/Makefile.sol2
+++ b/pppd/Makefile.sol2
@@ -32,12 +32,12 @@ LIBS        += -ldl
 #
 # Solaris 8 and on includes support for IPv6
 #
-#CFLAGS        += -DINET6
-#OBJS  += ipv6cp.o eui64.o
+CFLAGS += -DINET6
+OBJS   += ipv6cp.o eui64.o
 
 # Uncomment to enable MS-CHAP
-#CFLAGS += -DUSE_CRYPT -DCHAPMS -DMSLANMAN -DHAVE_CRYPT_H
-#OBJS += chap_ms.o pppcrypt.o md4.o sha1.o
+CFLAGS += -DUSE_CRYPT -DCHAPMS -DMSLANMAN -DHAVE_CRYPT_H
+OBJS += chap_ms.o pppcrypt.o md4.o sha1.o
 
 # Uncomment for CBCP
 #CFLAGS += -DCBCP_SUPPORT

diff --git a/solaris/Makefile.sol2-64x b/solaris/Makefile.sol2-64x
index 83f59add4af4a96940183a4c9c7500793a2476e5..afddcb949df9a55df7ad7f68b2a3b52e02664623 100644 (file)
--- a/solaris/Makefile.sol2-64x
+++ b/solaris/Makefile.sol2-64x
@@ -7,7 +7,7 @@
 include Makedefs.sol2
 
 # Sun's cc flag for LP64 compilation / linkage
-COPTS          += -errwarn -xtarget=opteron -xarch=amd64 -xmodel=kernel \
+COPTS          += -errwarn -xtarget=opteron -m64 -xmodel=kernel \
                   -Ui386 -U__i386 -D__amd64 -xO2
 
 # subdirectory where 64-bit objects / binaries will be placed