conservatory
/
ikarus
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Made libffi autodetectable as per bug 288748. Thanks to Andreas 

Rottmann for supplying the patch.
This commit is contained in:
Abdulaziz Ghuloum 2009-06-26 12:12:25 +03:00
parent f5f61f60d3
commit 9692eb097f
4 changed files with 99 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.h.in
View File

@ -21,9 +21,6 @@
/* Define to 1 if you have the <fcntl.h> header file. */ /* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H #undef HAVE_FCNTL_H
/* Define to 1 if you have the <ffi.h> header file. */
#undef HAVE_FFI_H
/* Define to 1 if you have the `fork' function. */ /* Define to 1 if you have the `fork' function. */
#undef HAVE_FORK #undef HAVE_FORK
@ -42,9 +39,6 @@
/* Define to 1 if you have the <inttypes.h> header file. */ /* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H #undef HAVE_INTTYPES_H
/* Define to 1 if you have the `ffi' library (-lffi). */
#undef HAVE_LIBFFI
/* Define to 1 if you have the `gmp' library (-lgmp). */ /* Define to 1 if you have the `gmp' library (-lgmp). */
#undef HAVE_LIBGMP #undef HAVE_LIBGMP

152
configure vendored
View File

@ -1388,7 +1388,7 @@ Optional Features:
--disable-dependency-tracking speeds up one-time build --disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors --enable-dependency-tracking do not reject slow dependency extractors
--disable-largefile omit support for large files --disable-largefile omit support for large files
--enable-libffi enable support for libffi. --enable-libffi enable support for libffi (default is check)
Some influential environment variables: Some influential environment variables:
CC C compiler command CC C compiler command
@ -7016,30 +7016,28 @@ ac_cv_lib_gmp=ac_cv_lib_gmp_main
# Check whether --enable-libffi was given. # Check whether --enable-libffi was given.
if test "${enable_libffi+set}" = set; then if test "${enable_libffi+set}" = set; then
enableval=$enable_libffi; enableval=$enable_libffi; true
else
enable_libffi=check
fi fi
if test "$enable_libffi" = "yes"; then # Check for libffi (optional)
libffi_val=0
for ac_header in ffi.h if test "$enable_libffi" != no; then
do if test "${ac_cv_header_ffi_h+set}" = set; then
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` { $as_echo "$as_me:$LINENO: checking for ffi.h" >&5
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "checking for ffi.h... " >&6; }
{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 if test "${ac_cv_header_ffi_h+set}" = set; then
$as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
fi fi
ac_res=`eval 'as_val=${'$as_ac_Header'} { $as_echo "$as_me:$LINENO: result: $ac_cv_header_ffi_h" >&5
$as_echo "$as_val"'` $as_echo "$ac_cv_header_ffi_h" >&6; }
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
else else
# Is the header compilable? # Is the header compilable?
{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 { $as_echo "$as_me:$LINENO: checking ffi.h usability" >&5
$as_echo_n "checking $ac_header usability... " >&6; } $as_echo_n "checking ffi.h usability... " >&6; }
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
@ -7047,7 +7045,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
$ac_includes_default $ac_includes_default
#include <$ac_header> #include <ffi.h>
_ACEOF _ACEOF
rm -f conftest.$ac_objext rm -f conftest.$ac_objext
if { (ac_try="$ac_compile" if { (ac_try="$ac_compile"
@ -7080,15 +7078,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
$as_echo "$ac_header_compiler" >&6; } $as_echo "$ac_header_compiler" >&6; }
# Is the header present? # Is the header present?
{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 { $as_echo "$as_me:$LINENO: checking ffi.h presence" >&5
$as_echo_n "checking $ac_header presence... " >&6; } $as_echo_n "checking ffi.h presence... " >&6; }
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
cat confdefs.h >>conftest.$ac_ext cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
#include <$ac_header> #include <ffi.h>
_ACEOF _ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext" if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in case "(($ac_try" in
@ -7122,25 +7120,25 @@ $as_echo "$ac_header_preproc" >&6; }
# So? What about this header? # So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: ) yes:no: )
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 { $as_echo "$as_me:$LINENO: WARNING: ffi.h: accepted by the compiler, rejected by the preprocessor!" >&5
$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} $as_echo "$as_me: WARNING: ffi.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 { $as_echo "$as_me:$LINENO: WARNING: ffi.h: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} $as_echo "$as_me: WARNING: ffi.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes ac_header_preproc=yes
;; ;;
no:yes:* ) no:yes:* )
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 { $as_echo "$as_me:$LINENO: WARNING: ffi.h: present but cannot be compiled" >&5
$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} $as_echo "$as_me: WARNING: ffi.h: present but cannot be compiled" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 { $as_echo "$as_me:$LINENO: WARNING: ffi.h: check for missing prerequisite headers?" >&5
$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} $as_echo "$as_me: WARNING: ffi.h: check for missing prerequisite headers?" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 { $as_echo "$as_me:$LINENO: WARNING: ffi.h: see the Autoconf documentation" >&5
$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: ffi.h: see the Autoconf documentation" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 { $as_echo "$as_me:$LINENO: WARNING: ffi.h: section \"Present But Cannot Be Compiled\"" >&5
$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} $as_echo "$as_me: WARNING: ffi.h: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 { $as_echo "$as_me:$LINENO: WARNING: ffi.h: proceeding with the preprocessor's result" >&5
$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} $as_echo "$as_me: WARNING: ffi.h: proceeding with the preprocessor's result" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 { $as_echo "$as_me:$LINENO: WARNING: ffi.h: in the future, the compiler will take precedence" >&5
$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} $as_echo "$as_me: WARNING: ffi.h: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX ( cat <<\_ASBOX
## -------------------------------------- ## ## -------------------------------------- ##
## Report this to aghuloum@cs.indiana.edu ## ## Report this to aghuloum@cs.indiana.edu ##
@ -7149,43 +7147,25 @@ _ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2 ) | sed "s/^/$as_me: WARNING: /" >&2
;; ;;
esac esac
{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 { $as_echo "$as_me:$LINENO: checking for ffi.h" >&5
$as_echo_n "checking for $ac_header... " >&6; } $as_echo_n "checking for ffi.h... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then if test "${ac_cv_header_ffi_h+set}" = set; then
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
eval "$as_ac_Header=\$ac_header_preproc" ac_cv_header_ffi_h=$ac_header_preproc
fi fi
ac_res=`eval 'as_val=${'$as_ac_Header'} { $as_echo "$as_me:$LINENO: result: $ac_cv_header_ffi_h" >&5
$as_echo "$as_val"'` $as_echo "$ac_cv_header_ffi_h" >&6; }
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
fi fi
as_val=`eval 'as_val=${'$as_ac_Header'} if test "x$ac_cv_header_ffi_h" = x""yes; then
$as_echo "$as_val"'` have_ffi_h=yes
if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
else else
{ { $as_echo "$as_me:$LINENO: error: ffi.h cannot be found. have_ffi_h=no
Please specify the location of the header file using
./configure CFLAGS=-I<path/to/ffi.h> <other-options ...>
" >&5
$as_echo "$as_me: error: ffi.h cannot be found.
Please specify the location of the header file using
./configure CFLAGS=-I<path/to/ffi.h> <other-options ...>
" >&2;}
{ (exit 1); exit 1; }; }
fi fi
done
{ $as_echo "$as_me:$LINENO: checking for ffi_call in -lffi" >&5
{ $as_echo "$as_me:$LINENO: checking for ffi_call in -lffi" >&5
$as_echo_n "checking for ffi_call in -lffi... " >&6; } $as_echo_n "checking for ffi_call in -lffi... " >&6; }
if test "${ac_cv_lib_ffi_ffi_call+set}" = set; then if test "${ac_cv_lib_ffi_ffi_call+set}" = set; then
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
@ -7251,14 +7231,28 @@ fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ffi_ffi_call" >&5 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ffi_ffi_call" >&5
$as_echo "$ac_cv_lib_ffi_ffi_call" >&6; } $as_echo "$ac_cv_lib_ffi_ffi_call" >&6; }
if test "x$ac_cv_lib_ffi_ffi_call" = x""yes; then if test "x$ac_cv_lib_ffi_ffi_call" = x""yes; then
cat >>confdefs.h <<_ACEOF have_libffi=yes
#define HAVE_LIBFFI 1
_ACEOF
LIBS="-lffi $LIBS"
else else
{ { $as_echo "$as_me:$LINENO: error: libffi cannot be found. have_libffi=no
fi
if test "$have_libffi" = yes && test "$have_ffi_h" = yes; then
libffi_val=1
LIBS="$LIBS -lffi"
elif test "$enable_libffi" = yes; then
if test "$have_ffi_h" = no; then
{ { $as_echo "$as_me:$LINENO: error: ffi.h cannot be found.
Please specify the location of the header file using
./configure CFLAGS=-I<path/to/ffi.h> <other-options ...>
" >&5
$as_echo "$as_me: error: ffi.h cannot be found.
Please specify the location of the header file using
./configure CFLAGS=-I<path/to/ffi.h> <other-options ...>
" >&2;}
{ (exit 1); exit 1; }; }
fi
if test "$have_libffi" = no; then
{ { $as_echo "$as_me:$LINENO: error: libffi cannot be found.
Please specify the location of the library file using Please specify the location of the library file using
./configure LDFLAGS=-L<path/to/libffi.ld|dylib|so|etc.> <other-options ...> ./configure LDFLAGS=-L<path/to/libffi.ld|dylib|so|etc.> <other-options ...>
" >&5 " >&5
@ -7267,17 +7261,19 @@ Please specify the location of the library file using
./configure LDFLAGS=-L<path/to/libffi.ld|dylib|so|etc.> <other-options ...> ./configure LDFLAGS=-L<path/to/libffi.ld|dylib|so|etc.> <other-options ...>
" >&2;} " >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
else
{ $as_echo "$as_me:$LINENO: WARNING: libffi not found -- FFI disabled" >&5
$as_echo "$as_me: WARNING: libffi not found -- FFI disabled" >&2;}
fi
fi # "$enable_ffi" != no
cat >>confdefs.h <<_ACEOF
cat >>confdefs.h <<\_ACEOF #define ENABLE_LIBFFI $libffi_val
#define ENABLE_LIBFFI 1
_ACEOF _ACEOF
fi
{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtimespec" >&5 { $as_echo "$as_me:$LINENO: checking for struct stat.st_mtimespec" >&5
$as_echo_n "checking for struct stat.st_mtimespec... " >&6; } $as_echo_n "checking for struct stat.st_mtimespec... " >&6; }
if test "${ac_cv_member_struct_stat_st_mtimespec+set}" = set; then if test "${ac_cv_member_struct_stat_st_mtimespec+set}" = set; then

36
configure.ac
View File

@ -70,25 +70,37 @@ ERROR: libgmp.so) if libgmp is installed in a non-standard location.
ERROR: libgmp can be obtained from <http://gmplib.org>. ])]) ERROR: libgmp can be obtained from <http://gmplib.org>. ])])
AC_ARG_ENABLE(libffi, AC_ARG_ENABLE(libffi,
[ --enable-libffi enable support for libffi.]) AS_HELP_STRING([--enable-libffi], [enable support for libffi (default is check)]),
[true], [enable_libffi=check])
if test "$enable_libffi" = "yes"; then # Check for libffi (optional)
AC_CHECK_HEADERS([ffi.h],, libffi_val=0
AC_MSG_ERROR([ffi.h cannot be found. if test "$enable_libffi" != no; then
AC_CHECK_HEADER([ffi.h], [have_ffi_h=yes], [have_ffi_h=no])
AC_CHECK_LIB(ffi,ffi_call, [have_libffi=yes], [have_libffi=no])
if test "$have_libffi" = yes && test "$have_ffi_h" = yes; then
libffi_val=1
LIBS="$LIBS -lffi"
elif test "$enable_libffi" = yes; then
if test "$have_ffi_h" = no; then
AC_MSG_ERROR([ffi.h cannot be found.
Please specify the location of the header file using Please specify the location of the header file using
./configure CFLAGS=-I<path/to/ffi.h> <other-options ...> ./configure CFLAGS=-I<path/to/ffi.h> <other-options ...>
])) ])
fi
AC_CHECK_LIB(ffi,ffi_call,, if test "$have_libffi" = no; then
AC_MSG_ERROR([libffi cannot be found. AC_MSG_ERROR([libffi cannot be found.
Please specify the location of the library file using Please specify the location of the library file using
./configure LDFLAGS=-L<path/to/libffi.ld|dylib|so|etc.> <other-options ...> ./configure LDFLAGS=-L<path/to/libffi.ld|dylib|so|etc.> <other-options ...>
])) ])
fi
else
AC_MSG_WARN([libffi not found -- FFI disabled])
fi
fi # "$enable_ffi" != no
AC_DEFINE(ENABLE_LIBFFI, 1, [adds support for libffi]) AC_DEFINE_UNQUOTED(ENABLE_LIBFFI, [$libffi_val], [adds support for libffi])
fi
AC_CHECK_MEMBER([struct stat.st_mtimespec], AC_CHECK_MEMBER([struct stat.st_mtimespec],
AC_DEFINE(HAVE_STAT_ST_MTIMESPEC, 1, AC_DEFINE(HAVE_STAT_ST_MTIMESPEC, 1,

2
scheme/last-revision
View File

@ -1 +1 @@
1812 1813