From b7659bddc7e49a0d7c460e19983e7e493541b4e2 Mon Sep 17 00:00:00 2001
From: James Carlson <carlsonj@workingcode.com>
Date: Sun, 26 Jun 2005 19:34:41 +0000
Subject: [PATCH] Fixed configure breakage in $archvariant support for Solaris
 introduced by fix in RCS ID 1.33 -- failed to configure for WorkShop C
 compiler correctly because test was changed from -f (file exists) to
 "$archvariant" (variable is non-null).

Fixed ccp.c compilation warnings due to missing argument type in RCS
ID 1.48 fix.
---
 configure  | 4 ++--
 pppd/ccp.c | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 8d2fc58..8be841c 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: configure,v 1.35 2004/11/06 11:36:54 paulus Exp $
+# $Id: configure,v 1.36 2005/06/26 19:34:41 carlsonj Exp $
 
 # Where to install stuff by default
 DESTDIR=/usr/local
@@ -177,7 +177,7 @@ if [ -d "$ksrc" ]; then
 	       pppd/plugins/radius pppd/plugins/pppoatm; do
 	mkmkf $dir/Makefile.$makext $dir/Makefile
     done
-    if [ "$archvariant" ]; then
+    if [ -f $ksrc/Makefile.$makext$archvariant ]; then
 	mkmkf $ksrc/Makefile.$makext$archvariant $ksrc/Makefile
     fi
 else
diff --git a/pppd/ccp.c b/pppd/ccp.c
index 1f8fd73..5814f35 100644
--- a/pppd/ccp.c
+++ b/pppd/ccp.c
@@ -28,7 +28,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define RCSID	"$Id: ccp.c,v 1.49 2005/03/22 09:53:53 paulus Exp $"
+#define RCSID	"$Id: ccp.c,v 1.50 2005/06/26 19:34:41 carlsonj Exp $"
 
 #include <stdlib.h>
 #include <string.h>
@@ -898,6 +898,7 @@ ccp_nakci(f, p, len, treat_as_reject)
     fsm *f;
     u_char *p;
     int len;
+    int treat_as_reject;
 {
     ccp_options *go = &ccp_gotoptions[f->unit];
     ccp_options no;		/* options we've seen already */
-- 
2.39.2