From 62638bfd15a14420a6bbf83b3907cdb289093acd Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sat, 20 Apr 2013 00:56:04 +0100
Subject: [PATCH] Pike - a few updates to get Pike 7.8 running most of the
 examples

---
 Examples/pike/check.list |  2 ++
 Lib/pike/pike.swg        |  6 +++---
 Lib/pike/pikerun.swg     |  5 +++--
 configure.ac             | 17 ++++++++++-------
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/Examples/pike/check.list b/Examples/pike/check.list
index a8d348bf1..d6c8e2e7b 100644
--- a/Examples/pike/check.list
+++ b/Examples/pike/check.list
@@ -2,4 +2,6 @@
 class
 constants
 enum
+overload
 simple
+template
diff --git a/Lib/pike/pike.swg b/Lib/pike/pike.swg
index 130af1346..399752a7a 100644
--- a/Lib/pike/pike.swg
+++ b/Lib/pike/pike.swg
@@ -11,9 +11,9 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include <global.h>
-#include <module.h>
-#include <interpret.h>
+#include <pike/global.h>
+#include <pike/module.h>
+#include <pike/interpret.h>
 #ifdef __cplusplus
 }
 #endif
diff --git a/Lib/pike/pikerun.swg b/Lib/pike/pikerun.swg
index 70d40fac9..6ec1143cf 100644
--- a/Lib/pike/pikerun.swg
+++ b/Lib/pike/pikerun.swg
@@ -9,11 +9,12 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "object.h"
-#include "program.h"
+#include "pike/object.h"
+#include "pike/program.h"
 #ifdef __cplusplus
 }
 #endif
+#include <assert.h>
 
 /* Stores information about a wrapped object */
 typedef struct swig_object_wrapper {
diff --git a/configure.ac b/configure.ac
index 65a9c9078..83b46f520 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1618,18 +1618,21 @@ AC_ARG_WITH(pikeincl, AS_HELP_STRING([--with-pikeincl=path],
 if test -n "$PIKE"; then
       AC_MSG_CHECKING([for Pike header files])
       if test -z "$PIKEINCLUDE" -a -n "$PIKECONFIG"; then
-              PIKEINCLUDE=`$PIKECONFIG --cflags`
+        PIKEINCLUDE=`$PIKECONFIG --cflags`
       fi
       if test -z "$PIKEINCLUDE" -a -n "$PIKE"; then
-              PIKEPATH=`which $PIKE`
-              PIKEINCLUDE=`$PIKE Tools/check-include-path.pike $PIKEPATH`
-              PIKEINCLUDE="-I$PIKEINCLUDE"
+        PIKEINCLUDE=`$PIKE -x cflags`
+        if test -z "$PIKEINCLUDE"; then
+          PIKEPATH=`which $PIKE`
+          PIKEINCLUDE=`$PIKE Tools/check-include-path.pike $PIKEPATH`
+          PIKEINCLUDE="-I$PIKEINCLUDE"
+        fi
       fi
 
       if test -z "$PIKEINCLUDE"; then
-              AC_MSG_RESULT(not found)
+        AC_MSG_RESULT(not found)
       else
-              AC_MSG_RESULT($PIKEINCLUDE)
+        AC_MSG_RESULT($PIKEINCLUDE)
       fi
 fi
 fi
@@ -2305,7 +2308,7 @@ fi
 AC_SUBST(SKIP_OCAML)
 
 
-SKIP_PIKE="1" # Always skipped!
+SKIP_PIKE=
 if test -z "$PIKE" || test -z "$PIKEINCLUDE" ; then
     SKIP_PIKE="1"
 fi