Commit 7724a746 authored by Erick's avatar Erick

Fixed compilation problem on Ubuntu with regexp

parent 2d1bdefd
# Makefile.in generated by automake 1.11.1 from Makefile.am.
# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
......@@ -178,6 +178,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PCRE = @PCRE@
PCREINC = @PCREINC@
PCRELIB = @PCRELIB@
PCREPKG = @PCREPKG@
PKGCONFIG = @PKGCONFIG@
POW_LIB = @POW_LIB@
PREFIX = @PREFIX@
......@@ -291,7 +292,7 @@ doc/skb/stklos-version.stk: $(top_builddir)/config.status $(top_srcdir)/doc/skb/
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@fail= failcom='exit 1'; \
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
......@@ -316,7 +317,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@fail= failcom='exit 1'; \
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
......@@ -480,8 +481,7 @@ distdir: $(DISTFILES)
fi; \
done
-test -n "$(am__skip_mode_fix)" \
|| find "$(distdir)" -type d ! -perm -755 \
-exec chmod u+rwx,go+rx {} \; -o \
|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
......@@ -525,17 +525,17 @@ dist dist-all: distdir
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
......
# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
# generated automatically by aclocal 1.11 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
......@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
[m4_warning([this file was generated for autoconf 2.65.
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
[m4_warning([this file was generated for autoconf 2.64.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
......@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.11.1], [],
m4_if([$1], [1.11], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
......@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.11.1])dnl
[AM_AUTOMAKE_VERSION([1.11])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
......
This diff is collapsed.
......@@ -2,7 +2,7 @@
###
### Author: Erick Gallesio [eg@unice.fr]
### Creation date: 28-Dec-1999 21:19 (eg)
### Last file update: 3-Jan-2010 08:15 (eg)
### Last file update: 4-Apr-2010 12:20 (eg)
AC_PREREQ(2.64)
AC_INIT([stklos], [1.00])
......@@ -281,6 +281,7 @@ echo "*****"
# Try to determine if libpcre is installed
if ${PKGCONFIG} --exists libpcre ;then
HAVE_PCRE="yes"
PCREPKG="present"
else
AC_CHECK_LIB(pcre, pcre_fullinfo, HAVE_PCRE="yes", HAVE_PCRE="no", $LIBS)
fi
......@@ -411,6 +412,7 @@ AC_SUBST(GCINC)
AC_SUBST(PCRE)
AC_SUBST(PCRELIB)
AC_SUBST(PCREINC)
AC_SUBST(PCREPKG)
# FFI
AC_SUBST(FFI)
AC_SUBST(FFILIB)
......
# Makefile.in generated by automake 1.11.1 from Makefile.am.
# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
......@@ -155,6 +155,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PCRE = @PCRE@
PCREINC = @PCREINC@
PCRELIB = @PCRELIB@
PCREPKG = @PCREPKG@
PKGCONFIG = @PKGCONFIG@
POW_LIB = @POW_LIB@
PREFIX = @PREFIX@
......
# Makefile.in generated by automake 1.11.1 from Makefile.am.
# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
......@@ -143,6 +143,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PCRE = @PCRE@
PCREINC = @PCREINC@
PCRELIB = @PCRELIB@
PCREPKG = @PCREPKG@
PKGCONFIG = @PKGCONFIG@
POW_LIB = @POW_LIB@
PREFIX = @PREFIX@
......
# Makefile.in generated by automake 1.11.1 from Makefile.am.
# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
......@@ -147,6 +147,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PCRE = @PCRE@
PCREINC = @PCREINC@
PCRELIB = @PCRELIB@
PCREPKG = @PCREPKG@
PKGCONFIG = @PKGCONFIG@
POW_LIB = @POW_LIB@
PREFIX = @PREFIX@
......
# Makefile.in generated by automake 1.11.1 from Makefile.am.
# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
......@@ -186,6 +186,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PCRE = @PCRE@
PCREINC = @PCREINC@
PCRELIB = @PCRELIB@
PCREPKG = @PCREPKG@
PKGCONFIG = @PKGCONFIG@
POW_LIB = @POW_LIB@
PREFIX = @PREFIX@
......@@ -429,7 +430,7 @@ uninstall-schemeDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@fail= failcom='exit 1'; \
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
......@@ -454,7 +455,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@fail= failcom='exit 1'; \
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
......
# Makefile.in generated by automake 1.11.1 from Makefile.am.
# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
......@@ -146,6 +146,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PCRE = @PCRE@
PCREINC = @PCREINC@
PCRELIB = @PCRELIB@
PCREPKG = @PCREPKG@
PKGCONFIG = @PKGCONFIG@
POW_LIB = @POW_LIB@
PREFIX = @PREFIX@
......
# Makefile.in generated by automake 1.11.1 from Makefile.am.
# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
......@@ -146,6 +146,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PCRE = @PCRE@
PCREINC = @PCREINC@
PCRELIB = @PCRELIB@
PCREPKG = @PCREPKG@
PKGCONFIG = @PKGCONFIG@
POW_LIB = @POW_LIB@
PREFIX = @PREFIX@
......
# Makefile.in generated by automake 1.11.1 from Makefile.am.
# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
......@@ -147,6 +147,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PCRE = @PCRE@
PCREINC = @PCREINC@
PCRELIB = @PCRELIB@
PCREPKG = @PCREPKG@
PKGCONFIG = @PKGCONFIG@
POW_LIB = @POW_LIB@
PREFIX = @PREFIX@
......
# Makefile.in generated by automake 1.11.1 from Makefile.am.
# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
......@@ -147,6 +147,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PCRE = @PCRE@
PCREINC = @PCREINC@
PCRELIB = @PCRELIB@
PCREPKG = @PCREPKG@
PKGCONFIG = @PKGCONFIG@
POW_LIB = @POW_LIB@
PREFIX = @PREFIX@
......
# Makefile.in generated by automake 1.11.1 from Makefile.am.
# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
......@@ -197,6 +197,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PCRE = @PCRE@
PCREINC = @PCREINC@
PCRELIB = @PCRELIB@
PCREPKG = @PCREPKG@
PKGCONFIG = @PKGCONFIG@
POW_LIB = @POW_LIB@
PREFIX = @PREFIX@
......
/* -*- C -*-
* extra.h -- Extra pre-processor definitions
*
* Copyright 2000-2009 Erick Gallesio - I3S-CNRS/ESSI <eg@unice.fr>
* Copyright 2000-2010 Erick Gallesio - I3S-CNRS/ESSI <eg@unice.fr>
*
*
* This program is free software; you can redistribute it and/or modify
......@@ -21,7 +21,7 @@
*
* Author: Erick Gallesio [eg@unice.fr]
* Creation date: 19-May-2000 18:44 (eg)
* Last file update: 28-Oct-2009 18:49 (eg)
* Last file update: 4-Apr-2010 12:21 (eg)
*/
#define PREFIXDIR "@PREFIX@"
......@@ -35,6 +35,7 @@
#define @OS_NAME_VERSION@ 1
#define STACK_GROWS_@STACK_DIRECTION@
#define LIB_SUMMARY "@LIB_SUMMARY@"
#define PCRE_PKG_CONFIG "@PCREPKG"
/* Various stuff */
#define @OS_FLAVOUR@ 1
/*
* regexp.c -- STklos Regexps
*
* Copyright © 2000-2009 Erick Gallesio - I3S-CNRS/ESSI <eg@unice.fr>
* Copyright © 2000-2010 Erick Gallesio - I3S-CNRS/ESSI <eg@unice.fr>
*
*
* This program is free software; you can redistribute it and/or modify
......@@ -21,7 +21,7 @@
*
* Author: Erick Gallesio [eg@unice.fr]
* Creation date: 24-Nov-2000 10:35 (eg)
* Last file update: 25-Oct-2009 22:01 (eg)
* Last file update: 4-Apr-2010 12:22 (eg)
*/
#include "stklos.h"
......@@ -44,7 +44,9 @@
#endif
/* ---------------------------------------------------------------------- */
#ifdef PCRE_PKG_CONFIG
# include <pcreposix.h>
#else
/* 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
......@@ -56,7 +58,8 @@
* been always "semantically" compatible). The only point wehr we
* can have difference shoul be the definition of regmatch_t type
*/
#include "../pcre/pcreposix.h"
# include "../pcre/pcreposix.h"
#endif
/* ---------------------------------------------------------------------- */
......
# Makefile.in generated by automake 1.11.1 from Makefile.am.
# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
......@@ -122,6 +122,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PCRE = @PCRE@
PCREINC = @PCREINC@
PCRELIB = @PCRELIB@
PCREPKG = @PCREPKG@
PKGCONFIG = @PKGCONFIG@
POW_LIB = @POW_LIB@
PREFIX = @PREFIX@
......
# Makefile.in generated by automake 1.11.1 from Makefile.am.
# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
......@@ -147,6 +147,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PCRE = @PCRE@
PCREINC = @PCREINC@
PCRELIB = @PCRELIB@
PCREPKG = @PCREPKG@
PKGCONFIG = @PKGCONFIG@
POW_LIB = @POW_LIB@
PREFIX = @PREFIX@
......
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