Pike - a few updates to get Pike 7.8 running most of the examples

This commit is contained in:
William S Fulton 2013-04-20 00:56:04 +01:00
commit 62638bfd15
4 changed files with 18 additions and 12 deletions

View file

@ -2,4 +2,6 @@
class
constants
enum
overload
simple
template

View file

@ -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

View file

@ -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 {

View file

@ -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