Commit 90fbd910 authored by Erick's avatar Erick

Fix for machines with PCRE installed but without pcreposix.h file

parent bc193c3f
......@@ -6771,7 +6771,7 @@ else
FFIINC=$($PKGCONFIG libffi --cflags)
FFILIB=$($PKGCONFIG libffi --libs)
else
FFIINC=""
FFIINC="-I/usr/include/ffi"
FFILIB="-lffi"
fi
ffimsg="use the system library"
......
......@@ -2,7 +2,7 @@
###
### Author: Erick Gallesio [eg@unice.fr]
### Creation date: 28-Dec-1999 21:19 (eg)
### Last file update: 18-Oct-2009 23:21 (eg)
### Last file update: 25-Oct-2009 10:13 (eg)
AC_PREREQ(2.64)
AC_INIT([stklos], [0.99dev])
......@@ -348,7 +348,7 @@ else
FFIINC=$($PKGCONFIG libffi --cflags)
FFILIB=$($PKGCONFIG libffi --libs)
else
FFIINC=""
FFIINC="-I/usr/include/ffi"
FFILIB="-lffi"
fi
ffimsg="use the system library"
......
......@@ -37,7 +37,8 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/../depcomp \
$(srcdir)/../install-sh $(srcdir)/../missing \
$(srcdir)/../mkinstalldirs $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS
$(top_srcdir)/configure $(top_srcdir)/tests/Makefile.in \
AUTHORS COPYING ChangeLog INSTALL NEWS
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
......@@ -46,7 +47,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_FILES = tests/Makefile
CONFIG_CLEAN_VPATH_FILES =
LIBRARIES = $(noinst_LIBRARIES)
AR = ar
......@@ -262,6 +263,8 @@ $(srcdir)/config.h.in: $(am__configure_deps)
distclean-hdr:
-rm -f config.h stamp-h1
tests/Makefile: $(top_builddir)/config.status $(top_srcdir)/tests/Makefile.in
cd $(top_builddir) && $(SHELL) ./config.status $@
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
......
......@@ -4145,7 +4145,7 @@ fi
done
ac_config_files="$ac_config_files Makefile"
ac_config_files="$ac_config_files Makefile tests/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
......@@ -4856,6 +4856,7 @@ do
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
......
/*
* p o r t . c -- ports implementation
*
* Copyright 1993-2008 Erick Gallesio - I3S-CNRS/ESSI <eg@unice.fr>
* Copyright 1993-2009 Erick Gallesio - I3S-CNRS/ESSI <eg@unice.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -20,15 +20,13 @@
*
* Author: Erick Gallesio [eg@unice.fr]
* Creation date: 17-Feb-1993 12:27
* Last file update: 27-Aug-2008 13:09 (eg)
* Last file update: 25-Oct-2009 21:41 (eg)
*
*/
#include <ctype.h>
#include "stklos.h"
#include "vm.h"
#include "../pcre/pcreposix.h"
#define INITIAL_LINE_SIZE 256 /* Initial size for readline */
......
......@@ -21,7 +21,7 @@
*
* Author: Erick Gallesio [eg@unice.fr]
* Creation date: 24-Nov-2000 10:35 (eg)
* Last file update: 27-Sep-2009 19:07 (eg)
* Last file update: 25-Oct-2009 22:01 (eg)
*/
#include "stklos.h"
......@@ -42,8 +42,23 @@
# define regerror PCRE_regerror
# define regfree PCRE_regfree
#endif
#include <pcreposix.h>
/* ---------------------------------------------------------------------- */
/* Here again Mac Os problems.
* Here, we used to have a #include <pcreposix.h>
* However, on a fresh 10.6 install, there is a pcre lib which is
* installed, but the "pcreposix.h" file isn't.
*
* So what we do here is potentially FALSE. However, it is unlikely
* that the code include in STklos is not compatible with the one
* used to compile the installed library (this file seems to have
* been always "semantically" compatible). The only point wehr we
* can have difference shoul be the definition of regmatch_t type
*/
#include "../pcre/pcreposix.h"
/* ---------------------------------------------------------------------- */
struct regexp_obj {
stk_header header;
......
......@@ -21,7 +21,7 @@
*
* Author: Erick Gallesio [eg@unice.fr]
* Creation date: 1-Mar-2000 19:51 (eg)
* Last file update: 3-Oct-2009 21:45 (eg)
* Last file update: 25-Oct-2009 09:29 (eg)
*/
// INLINER values
......@@ -2101,7 +2101,8 @@ DEFINE_PRIMITIVE("%dump-code", dump_code, subr2, (SCM f, SCM v))
/* Print the content of the vector as bytes */
for (i = 0; i < size; i++) {
if (!INTP(*tmp)) STk_error("bad value in code vector ~S", v);
if (!INTP(*tmp))
STk_error("bad value (~S) at index %d in code vector ~S", *tmp, i, v);
instr = (STk_instr) INT_VAL(*tmp++);
STk_putc(FIRST_BYTE(instr), f);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment