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.

diff --git a/configure b/configure
index 8d2fc58de249c37c222f1737dda52325f6216a2b..8be841c0347cd008bab253d8778089fb77c75deb 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #!/bin/sh
 #!/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
 
 # 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
               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
        mkmkf $ksrc/Makefile.$makext$archvariant $ksrc/Makefile
     fi
 else

diff --git a/pppd/ccp.c b/pppd/ccp.c
index 1f8fd73868210351499e88b5ae6c992dd1ada61a..5814f358eb44c5a4791f06b8170c69d45e7c4e9d 100644 (file)
--- 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.
  */
 
  * 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>
 
 #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;
     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 */
 {
     ccp_options *go = &ccp_gotoptions[f->unit];
     ccp_options no;            /* options we've seen already */