Commit 9731807c authored by Erick's avatar Erick

Added option --with-provided-ffi to configure script

parent ca7c2adb
......@@ -2,14 +2,21 @@
#
# Author: Erick Gallesio [eg@unice.fr]
# Creation date: 11-Apr-2000 10:30 (eg)
# Last file update: 26-Sep-2009 09:04 (eg)
# Last file update: 26-Sep-2009 16:55 (eg)
EXTRA_DIST =
SUBDIRS = @PCRE@ @GC@ @GMP@ @LIBFFI@ src utils lib \
examples pkgman tests doc
# INSTDIRS contains the dirs which need to be installed
INSTDIRS = @GC@ src utils lib examples pkgman tests doc
SUBDIRS = @PCRE@ @GMP@ @FFI@ $(INSTDIRS)
VERSION_TAG = @PACKAGE@-@VERSION@
VERSION_BETA = $(VERSION_TAG)-beta
install:
@for i in $(INSTDIRS) ;do \
echo "***** Installing directory $$i"; \
(cd $$i && $(MAKE) $(AM_MAKEFLAGS) install); \
done
test:
(cd tests; $(MAKE) test)
......
......@@ -19,7 +19,7 @@
#
# Author: Erick Gallesio [eg@unice.fr]
# Creation date: 11-Apr-2000 10:30 (eg)
# Last file update: 26-Sep-2009 09:04 (eg)
# Last file update: 26-Sep-2009 16:55 (eg)
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
......@@ -136,6 +136,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXECDIR = @EXECDIR@
EXEEXT = @EXEEXT@
FFI = @FFI@
GC = @GC@
GCINC = @GCINC@
GCLIB = @GCLIB@
......@@ -144,7 +145,6 @@ GMPINC = @GMPINC@
GMPLIB = @GMPLIB@
GREP = @GREP@
HAVE_DLOPEN = @HAVE_DLOPEN@
HAVE_FFI = @HAVE_FFI@
HAVE_GNOME = @HAVE_GNOME@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......@@ -156,7 +156,6 @@ LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBFFI = @LIBFFI@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LN_S = @LN_S@
......@@ -239,9 +238,9 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST =
SUBDIRS = @PCRE@ @GC@ @GMP@ @LIBFFI@ src utils lib \
examples pkgman tests doc
# INSTDIRS contains the dirs which need to be installed
INSTDIRS = @GC@ src utils lib examples pkgman tests doc
SUBDIRS = @PCRE@ @GMP@ @FFI@ $(INSTDIRS)
VERSION_TAG = @PACKAGE@-@VERSION@
VERSION_BETA = $(VERSION_TAG)-beta
all: all-recursive
......@@ -598,7 +597,6 @@ check: check-recursive
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
uninstall: uninstall-recursive
......@@ -711,6 +709,12 @@ uninstall-am:
pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
install:
@for i in $(INSTDIRS) ;do \
echo "***** Installing directory $$i"; \
(cd $$i && $(MAKE) $(AM_MAKEFLAGS) install); \
done
test:
(cd tests; $(MAKE) test)
......
......@@ -593,7 +593,6 @@ ac_func_list=
ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBFFI
CALLCC_STK
LURCDIR
THREADS
......@@ -618,6 +617,7 @@ BUILD_OS
EXECDIR
SCMDIR
PREFIX
FFI
GMPINC
GMPLIB
GMP
......@@ -625,7 +625,6 @@ GCINC
GCLIB
GC
OS_FLAVOUR
HAVE_FFI
HAVE_DLOPEN
STKCFLAGS
NO_THREAD_FALSE
......@@ -736,7 +735,7 @@ enable_threads
with_gmp_light
with_provided_gc
with_provided_regexp
enable_ffi
with_provided_ffi
'
ac_precious_vars='build_alias
host_alias
......@@ -1368,7 +1367,6 @@ Optional Features:
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
--enable-threads=TYPE choose threading package (none,pthread,lurc)
--disable-ffi disable FFI support
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
......@@ -1376,6 +1374,7 @@ Optional Packages:
--with-gmp-light use our GMP version even the system provides one
--with-provided-gc use our GC version even the system provides one
--with-provided-regexp use our PCRE regexp version
--with-provided-ffi use the provided FFI library
Some influential environment variables:
CXX C++ compiler command
......@@ -6683,36 +6682,86 @@ fi
# *) PCRETARGET="libpcre.la libpcreposix.la";;
# esac
#
# FFI support
#
# Check whether --enable-ffi was given.
if test "${enable_ffi+set}" = set; then :
enableval=$enable_ffi; USER_FFI="no"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ffi_prep_cif in -lffi" >&5
$as_echo_n "checking for ffi_prep_cif in -lffi... " >&6; }
if test "${ac_cv_lib_ffi_ffi_prep_cif+set}" = set; then :
$as_echo_n "(cached) " >&6
else
USER_FFI="yes"
ac_check_lib_save_LIBS=$LIBS
LIBS="-lffi $LIBS $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char ffi_prep_cif ();
int
main ()
{
return ffi_prep_cif ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_ffi_ffi_prep_cif=yes
else
ac_cv_lib_ffi_ffi_prep_cif=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ffi_ffi_prep_cif" >&5
$as_echo "$ac_cv_lib_ffi_ffi_prep_cif" >&6; }
if test "x$ac_cv_lib_ffi_ffi_prep_cif" = x""yes; then :
HAVE_FFI="yes"
else
HAVE_FFI="no"
fi
if test "$USER_FFI" = "yes" ;then
echo "Configuring libffi"
(cd ffi; CC=${CC} CFLAGS=${CFLAGS} ./configure \
--disable-structs --disable-raw-api --disable-shared \
--prefix=$prefix)
LIBS="$LIBS ../ffi/.libs/libffi.a"
CFLAGS="$CFLAGS -I../ffi/include"
LIBFFI="ffi"
HAVE_FFI="#define HAVE_FFI 1"
FFI="yes"
# Test if the user want to force with our FFI lib
withval=
# Check whether --with-provided-ffi was given.
if test "${with_provided_ffi+set}" = set; then :
withval=$with_provided_ffi; HAVE_FFI="no"
else
echo "Disabling FFI support"
LIBFFI=""
HAVE_FFI=""
FFI="no"
HAVE_FFI="yes"
fi
case $HAVE_FFI in
no)
echo "*****"
echo "***** Configuring libffi"
echo "*****"
(cd ffi; CC=${CC} CFLAGS=${CFLAGS} ./configure \
--disable-structs --disable-raw-api --disable-shared \
--prefix=$prefix)
CFLAGS="$CFLAGS -I../ffi/include"
LIBS="$LIBS ../ffi/.libs/libffi.a"
FFI="ffi"
ffilib="use provided library";;
yes)
echo "*****"
echo "***** Using system libffi library"
echo "*****"
CFLAGS="$CFLAGS `pkg-config libffi --cflags`"
LIBS="$LIBS `pkg-config libffi --libs`"
FFI=""
ffilib="use the system library";;
esac
### ======================================================================
### Various stuff done by hand
### ======================================================================
......@@ -6814,6 +6863,26 @@ if test "$THREADS" = "lurc" ;then
LURCDIR=Lurc.d
fi
###
### See in what direction the stack grows (code stolen from Sawfish)
###
if test "$cross_compiling" = yes; then :
echo "Stack direction is not detected when cross compiling for now"
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
void inner (char *foo) { char bar; exit (!(foo >= &bar)); }
void main () { char foo; inner (&foo); }
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
STACK_DIRECTION="DOWN"
else
STACK_DIRECTION="UP"
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
### Output files
......@@ -6859,7 +6928,6 @@ fi
ac_config_files="$ac_config_files Makefile src/Makefile src/extraconf.h doc/Makefile lib/Makefile utils/Makefile lib/boot-callcc.stk utils/stklos-config utils/stklos-script examples/Makefile lib/Match.d/Makefile lib/SILex.d/Makefile lib/Lalr.d/Makefile lib/Lurc.d/Makefile lib/ScmPkg.d/Makefile tests/Makefile doc/stklos.1 doc/stklos-config.1 doc/stklos-compile.1 doc/stklos-genlex.1 doc/stklos-install.1 doc/stklos-pkg.1 doc/skb/stklos-version.stk pkgman/Makefile"
cat >confcache <<\_ACEOF
......@@ -8345,7 +8413,7 @@ echo " GC library: " $gclib
#1.0 echo " LDAP support: " $USE_LDAP
#1.0 echo " GTK+ support: " $USE_GTK
#1.0 echo " GNOME support: " $USE_GNOME
echo " FFI support: " $FFI
echo " FFI library: " $ffilib
echo " Thread support: " $THREADS
echo " "
if test "$THREADS" = "lurc"
......
......@@ -2,7 +2,7 @@
###
### Author: Erick Gallesio [eg@unice.fr]
### Creation date: 28-Dec-1999 21:19 (eg)
### Last file update: 26-Sep-2009 09:23 (eg)
### Last file update: 26-Sep-2009 13:46 (eg)
AC_PREREQ(2.64)
AC_INIT([stklos], [0.99dev])
......@@ -280,31 +280,38 @@ fi
# *) PCRETARGET="libpcre.la libpcreposix.la";;
# esac
#
# FFI support
#
AC_ARG_ENABLE(ffi,
[ --disable-ffi disable FFI support],
USER_FFI="no",
USER_FFI="yes")
if test "$USER_FFI" = "yes" ;then
echo "Configuring libffi"
(cd ffi; CC=${CC} CFLAGS=${CFLAGS} ./configure \
AC_CHECK_LIB(ffi, ffi_prep_cif, HAVE_FFI="yes", HAVE_FFI="no", $LIBS)
# Test if the user want to force with our FFI lib
withval=
AC_ARG_WITH(provided-ffi,
[ --with-provided-ffi use the provided FFI library],
HAVE_FFI="no", HAVE_FFI="yes")
case $HAVE_FFI in
no)
echo "*****"
echo "***** Configuring libffi"
echo "*****"
(cd ffi; CC=${CC} CFLAGS=${CFLAGS} ./configure \
--disable-structs --disable-raw-api --disable-shared \
--prefix=$prefix)
LIBS="$LIBS ../ffi/.libs/libffi.a"
CFLAGS="$CFLAGS -I../ffi/include"
LIBFFI="ffi"
HAVE_FFI="#define HAVE_FFI 1"
FFI="yes"
else
echo "Disabling FFI support"
LIBFFI=""
HAVE_FFI=""
FFI="no"
fi
CFLAGS="$CFLAGS -I../ffi/include"
LIBS="$LIBS ../ffi/.libs/libffi.a"
FFI="ffi"
ffilib="use provided library";;
yes)
echo "*****"
echo "***** Using system libffi library"
echo "*****"
CFLAGS="$CFLAGS `pkg-config libffi --cflags`"
LIBS="$LIBS `pkg-config libffi --libs`"
FFI=""
ffilib="use the system library";;
esac
### ======================================================================
......@@ -408,13 +415,20 @@ if test "$THREADS" = "lurc" ;then
LURCDIR=Lurc.d
fi
###
### See in what direction the stack grows (code stolen from Sawfish)
###
AC_TRY_RUN([ void inner (char *foo) { char bar; exit (!(foo >= &bar)); }
void main () { char foo; inner (&foo); } ],
[STACK_DIRECTION="DOWN"],
[STACK_DIRECTION="UP"],
echo "Stack direction is not detected when cross compiling for now")
### Output files
AC_SUBST(STKCFLAGS)
AC_SUBST(VERSION)
AC_SUBST(HAVE_DLOPEN)
AC_SUBST(HAVE_FFI)
AC_SUBST(OS_FLAVOUR)
AC_SUBST(GC)
AC_SUBST(GCLIB)
......@@ -422,6 +436,7 @@ AC_SUBST(GCINC)
AC_SUBST(GMP)
AC_SUBST(GMPLIB)
AC_SUBST(GMPINC)
AC_SUBST(FFI)
AC_SUBST(PREFIX)
AC_SUBST(SCMDIR)
AC_SUBST(EXECDIR)
......@@ -452,7 +467,6 @@ AC_SUBST(DEF_PCRE)
AC_SUBST(THREADS)
AC_SUBST(LURCDIR)
AC_SUBST(CALLCC_STK)
AC_SUBST(LIBFFI)
AC_CONFIG_FILES([Makefile src/Makefile src/extraconf.h doc/Makefile
lib/Makefile utils/Makefile lib/boot-callcc.stk
......@@ -483,7 +497,7 @@ echo " GC library: " $gclib
#1.0 echo " LDAP support: " $USE_LDAP
#1.0 echo " GTK+ support: " $USE_GTK
#1.0 echo " GNOME support: " $USE_GNOME
echo " FFI support: " $FFI
echo " FFI library: " $ffilib
echo " Thread support: " $THREADS
echo " "
if test "$THREADS" = "lurc"
......
......@@ -113,6 +113,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXECDIR = @EXECDIR@
EXEEXT = @EXEEXT@
FFI = @FFI@
GC = @GC@
GCINC = @GCINC@
GCLIB = @GCLIB@
......@@ -121,7 +122,6 @@ GMPINC = @GMPINC@
GMPLIB = @GMPLIB@
GREP = @GREP@
HAVE_DLOPEN = @HAVE_DLOPEN@
HAVE_FFI = @HAVE_FFI@
HAVE_GNOME = @HAVE_GNOME@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......@@ -133,7 +133,6 @@ LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBFFI = @LIBFFI@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LN_S = @LN_S@
......
......@@ -101,6 +101,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXECDIR = @EXECDIR@
EXEEXT = @EXEEXT@
FFI = @FFI@
GC = @GC@
GCINC = @GCINC@
GCLIB = @GCLIB@
......@@ -109,7 +110,6 @@ GMPINC = @GMPINC@
GMPLIB = @GMPLIB@
GREP = @GREP@
HAVE_DLOPEN = @HAVE_DLOPEN@
HAVE_FFI = @HAVE_FFI@
HAVE_GNOME = @HAVE_GNOME@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......@@ -121,7 +121,6 @@ LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBFFI = @LIBFFI@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LN_S = @LN_S@
......
......@@ -105,6 +105,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXECDIR = @EXECDIR@
EXEEXT = @EXEEXT@
FFI = @FFI@
GC = @GC@
GCINC = @GCINC@
GCLIB = @GCLIB@
......@@ -113,7 +114,6 @@ GMPINC = @GMPINC@
GMPLIB = @GMPLIB@
GREP = @GREP@
HAVE_DLOPEN = @HAVE_DLOPEN@
HAVE_FFI = @HAVE_FFI@
HAVE_GNOME = @HAVE_GNOME@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......@@ -125,7 +125,6 @@ LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBFFI = @LIBFFI@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LN_S = @LN_S@
......
......@@ -122,6 +122,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXECDIR = @EXECDIR@
EXEEXT = @EXEEXT@
FFI = @FFI@
GC = @GC@
GCINC = @GCINC@
GCLIB = @GCLIB@
......@@ -130,7 +131,6 @@ GMPINC = @GMPINC@
GMPLIB = @GMPLIB@
GREP = @GREP@
HAVE_DLOPEN = @HAVE_DLOPEN@
HAVE_FFI = @HAVE_FFI@
HAVE_GNOME = @HAVE_GNOME@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......@@ -142,7 +142,6 @@ LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBFFI = @LIBFFI@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LN_S = @LN_S@
......
......@@ -145,6 +145,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXECDIR = @EXECDIR@
EXEEXT = @EXEEXT@
FFI = @FFI@
GC = @GC@
GCINC = @GCINC@
GCLIB = @GCLIB@
......@@ -153,7 +154,6 @@ GMPINC = @GMPINC@
GMPLIB = @GMPLIB@
GREP = @GREP@
HAVE_DLOPEN = @HAVE_DLOPEN@
HAVE_FFI = @HAVE_FFI@
HAVE_GNOME = @HAVE_GNOME@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......@@ -165,7 +165,6 @@ LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBFFI = @LIBFFI@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LN_S = @LN_S@
......
......@@ -104,6 +104,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXECDIR = @EXECDIR@
EXEEXT = @EXEEXT@
FFI = @FFI@
GC = @GC@
GCINC = @GCINC@
GCLIB = @GCLIB@
......@@ -112,7 +113,6 @@ GMPINC = @GMPINC@
GMPLIB = @GMPLIB@
GREP = @GREP@
HAVE_DLOPEN = @HAVE_DLOPEN@
HAVE_FFI = @HAVE_FFI@
HAVE_GNOME = @HAVE_GNOME@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......@@ -124,7 +124,6 @@ LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBFFI = @LIBFFI@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LN_S = @LN_S@
......
......@@ -104,6 +104,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXECDIR = @EXECDIR@
EXEEXT = @EXEEXT@
FFI = @FFI@
GC = @GC@
GCINC = @GCINC@
GCLIB = @GCLIB@
......@@ -112,7 +113,6 @@ GMPINC = @GMPINC@
GMPLIB = @GMPLIB@
GREP = @GREP@
HAVE_DLOPEN = @HAVE_DLOPEN@
HAVE_FFI = @HAVE_FFI@
HAVE_GNOME = @HAVE_GNOME@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......@@ -124,7 +124,6 @@ LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBFFI = @LIBFFI@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LN_S = @LN_S@
......
......@@ -105,6 +105,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXECDIR = @EXECDIR@
EXEEXT = @EXEEXT@
FFI = @FFI@
GC = @GC@
GCINC = @GCINC@
GCLIB = @GCLIB@
......@@ -113,7 +114,6 @@ GMPINC = @GMPINC@
GMPLIB = @GMPLIB@
GREP = @GREP@
HAVE_DLOPEN = @HAVE_DLOPEN@
HAVE_FFI = @HAVE_FFI@
HAVE_GNOME = @HAVE_GNOME@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......@@ -125,7 +125,6 @@ LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBFFI = @LIBFFI@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LN_S = @LN_S@
......
......@@ -105,6 +105,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXECDIR = @EXECDIR@
EXEEXT = @EXEEXT@
FFI = @FFI@
GC = @GC@
GCINC = @GCINC@
GCLIB = @GCLIB@
......@@ -113,7 +114,6 @@ GMPINC = @GMPINC@
GMPLIB = @GMPLIB@
GREP = @GREP@
HAVE_DLOPEN = @HAVE_DLOPEN@
HAVE_FFI = @HAVE_FFI@
HAVE_GNOME = @HAVE_GNOME@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......@@ -125,7 +125,6 @@ LDFLAGS = @LDFLAGS@
LEX = lang-bigloo.l lang-chicken.l lang-mzscheme.l
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBFFI = @LIBFFI@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LN_S = @LN_S@
......
......@@ -157,6 +157,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXECDIR = @EXECDIR@
EXEEXT = @EXEEXT@
FFI = @FFI@
GC = @GC@
GCINC = @GCINC@
GCLIB = @GCLIB@
......@@ -165,7 +166,6 @@ GMPINC = @GMPINC@
GMPLIB = @GMPLIB@
GREP = @GREP@
HAVE_DLOPEN = @HAVE_DLOPEN@
HAVE_FFI = @HAVE_FFI@
HAVE_GNOME = @HAVE_GNOME@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......@@ -177,7 +177,6 @@ LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBFFI = @LIBFFI@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LN_S = @LN_S@
......
This diff is collapsed.
/* -*- C -*-
* extra.h -- Extra pre-processor definitions
*
* Copyright 2000-2007 Erick Gallesio - I3S-CNRS/ESSI <eg@unice.fr>
* Copyright 2000-2009 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-Jun-2007 17:58 (eg)
* Last file update: 26-Sep-2009 12:58 (eg)
*/
#define PREFIXDIR "@PREFIX@"
......@@ -36,6 +36,9 @@
/* Various stuff */
@HAVE_DLOPEN@
@HAVE_FFI@
@DEF_PCRE@
#define @OS_FLAVOUR@ 1
/* For now, work only where libffi works. Must be configurable */
#define HAVE_FFI 1
......@@ -80,6 +80,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXECDIR = @EXECDIR@
EXEEXT = @EXEEXT@
FFI = @FFI@
GC = @GC@
GCINC = @GCINC@
GCLIB = @GCLIB@
......@@ -88,7 +89,6 @@ GMPINC = @GMPINC@
GMPLIB = @GMPLIB@
GREP = @GREP@
HAVE_DLOPEN = @HAVE_DLOPEN@
HAVE_FFI = @HAVE_FFI@
HAVE_GNOME = @HAVE_GNOME@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......@@ -100,7 +100,6 @@ LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBFFI = @LIBFFI@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LN_S = @LN_S@
......
......@@ -105,6 +105,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXECDIR = @EXECDIR@
EXEEXT = @EXEEXT@
FFI = @FFI@
GC = @GC@
GCINC = @GCINC@
GCLIB = @GCLIB@
......@@ -113,7 +114,6 @@ GMPINC = @GMPINC@
GMPLIB = @GMPLIB@
GREP = @GREP@
HAVE_DLOPEN = @HAVE_DLOPEN@
HAVE_FFI = @HAVE_FFI@
HAVE_GNOME = @HAVE_GNOME@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......@@ -125,7 +125,6 @@ LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBFFI = @LIBFFI@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LN_S = @LN_S@
......
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