1 diff -urN rp-pppoe-3.5.org/src/configure.in rp-pppoe-3.5/src/configure.in
2 --- rp-pppoe-3.5.org/src/configure.in Mon Aug 12 21:09:47 2002
3 +++ rp-pppoe-3.5/src/configure.in Mon Aug 12 21:42:39 2002
8 -dnl Check for an echo which supports -n -- another hack for Solaris
9 -AC_PATH_PROG(ECHO, echo, "", /usr/ucb/bin:$PATH)
11 dnl Check for sockaddr_ll
12 AC_MSG_CHECKING(for struct sockaddr_ll)
13 AC_TRY_COMPILE([#include <asm/types.h>
14 #include <linux/if_packet.h>
15 #include <linux/if_ether.h>
16 ], [struct sockaddr_ll sa;],
17 -ac_cv_struct_sockaddr_ll=yes, ac_cv_struct_sockaddr_ll=no)
18 -$ECHO $ac_cv_struct_sockaddr_ll
19 +[ac_cv_struct_sockaddr_ll=yes
20 + AC_MSG_RESULT(yes)],
21 +[ac_cv_struct_sockaddr_ll=no
24 if test "$ac_cv_struct_sockaddr_ll" = yes ; then
25 AC_DEFINE(HAVE_STRUCT_SOCKADDR_LL)
28 AC_MSG_CHECKING(for N_HDLC line discipline)
29 AC_TRY_COMPILE([#include <linux/termios.h>],
31 - ac_cv_n_hdlc=yes, ac_cv_n_hdlc=no)
34 + AC_MSG_RESULT(yes)],
37 if test "$ac_cv_n_hdlc" = yes ; then
38 AC_DEFINE(HAVE_N_HDLC)
42 if (socket(AF_PPPOX, SOCK_DGRAM, PX_PROTO_OE) >= 0) return 0; else return 1;
44 -], ac_cv_linux_kernel_pppoe=yes, ac_cv_linux_kernel_pppoe=no)
45 +], [ac_cv_linux_kernel_pppoe=yes
46 + AC_MSG_RESULT(yes)],
47 + [ac_cv_linux_kernel_pppoe=no
50 ac_cv_linux_kernel_pppoe=no
54 -$ECHO $ac_cv_linux_kernel_pppoe
55 if test "$ac_cv_linux_kernel_pppoe" != yes ; then
56 if test "$LINUX_KERNELMODE_PLUGIN" = rp-pppoe.so; then
57 echo "*** Your kernel does not appear to have built-in PPPoE support,"
60 dnl If we couldn't find pppd, die
61 if test "$PPPD" = "NOTFOUND"; then
63 - $ECHO "*** Oops! I couldn't find pppd, the PPP daemon anywhere."
64 - $ECHO "*** You must install pppd, version 2.3.10 or later."
65 - $ECHO "*** I will keep going, but it may not work."
67 + AC_MSG_WARN([*** Oops! I couldn't find pppd, the PPP daemon anywhere.])
68 + AC_MSG_WARN([*** You must install pppd, version 2.3.10 or later.])
69 + AC_MSG_WARN([*** I will keep going, but it may not work.])
72 dnl Figure out pppd version. 2.3.7 to 2.3.9 -- issue warning. Less than
75 case "$PPPD_VERSION" in
76 1.*|2.0.*|2.1.*|2.2.*|2.3.0|2.3.1|2.3.2|2.3.3|2.3.4|2.3.5|2.3.6)
78 - $ECHO "*** Oops! Your version of pppd is $PPPD_VERSION, which is too old."
79 - $ECHO "*** You need at least 2.3.7 (2.3.10 or newer recommended.)"
80 - $ECHO "*** I will keep going, but it may not work."
82 + AC_MSG_WARN([*** Oops! Your version of pppd is $PPPD_VERSION, which is too old.])
83 + AC_MSG_WARN([*** You need at least 2.3.7 (2.3.10 or newer recommended.])
84 + AC_MSG_WARN([*** I will keep going, but it may not work.])
89 - $ECHO "*** Warning. Your version of pppd is $PPPD_VERSION. You will"
90 - $ECHO "*** not be able to use connect-on-demand. Upgrade to pppd"
91 - $ECHO "*** 2.3.10 or newer if you need connect-on-demand."
93 + AC_MSG_WARN([*** Warning. Your version of pppd is $PPPD_VERSION. You will])
94 + AC_MSG_WARN([*** not be able to use connect-on-demand. Upgrade to pppd])
95 + AC_MSG_WARN([*** 2.3.10 or newer if you need connect-on-demand.])
98 2*|3*|4*|5*|6*|7*|8*|9*)
103 - $ECHO "*** Oops. I cannot figure out what version of pppd you have."
104 - $ECHO "*** All I got back was '$PPPD_VERSION'"
105 - $ECHO "*** I will keep going, but it may not work."
107 + AC_MSG_WARN([*** Oops. I cannot figure out what version of pppd you have.])
108 + AC_MSG_WARN([*** All I got back was '$PPPD_VERSION'])
109 + AC_MSG_WARN([*** I will keep going, but it may not work.])
113 @@ -234,10 +231,10 @@
114 }], PACK=normal, PACK=rev)
116 if test "$PACK" = "rev" ; then
118 + AC_MSG_RESULT(reversed)
119 AC_DEFINE(PACK_BITFIELDS_REVERSED)
122 + AC_MSG_RESULT(normal)
125 # Sigh... got to fix this up for tcl
128 AC_OUTPUT(Makefile libevent/Makefile ../scripts/adsl-connect ../scripts/adsl-start ../scripts/adsl-stop ../scripts/adsl-init ../scripts/adsl-init-suse ../scripts/adsl-init-turbolinux ../scripts/adsl-setup ../gui/Makefile ../gui/tkpppoe $EXTRACONFIGS)
131 -$ECHO "On this platform, the following targets will be built:"
134 -$ECHO "Type 'make' to compile the software."
135 +AC_MSG_WARN([On this platform, the following targets will be built:])
136 +AC_MSG_WARN([$TARGETS])
137 +AC_MSG_WARN([Type 'make' to compile the software.])
139 diff -urN rp-pppoe-3.5.org/src/configure.in rp-pppoe-3.5/src/configure.in
140 --- rp-pppoe-3.5.org/src/configure.in Tue Aug 13 17:28:29 2002
141 +++ rp-pppoe-3.5/src/configure.in Tue Aug 13 17:35:35 2002
142 @@ -174,12 +174,13 @@
143 AC_MSG_WARN([*** Oops! I couldn't find pppd, the PPP daemon anywhere.])
144 AC_MSG_WARN([*** You must install pppd, version 2.3.10 or later.])
145 AC_MSG_WARN([*** I will keep going, but it may not work.])
149 dnl Figure out pppd version. 2.3.7 to 2.3.9 -- issue warning. Less than
152 -PPPD_VERSION=`$PPPD --version 2>&1 | awk '{print $NF}'`
153 +PPPD_VERSION=`$PPPD --version 2>&1 | awk ' /version/ {print $NF}'`
155 case "$PPPD_VERSION" in
156 1.*|2.0.*|2.1.*|2.2.*|2.3.0|2.3.1|2.3.2|2.3.3|2.3.4|2.3.5|2.3.6)