summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2017-07-05 11:32:30 -0700
committerKaz Kylheku <kaz@kylheku.com>2017-07-05 11:32:30 -0700
commit9b7c9ae987f2c3ed75388434a32cbd8bc5fe7712 (patch)
tree9dcbf3ed9255e1d818b979d1d28c9bed2df2394f
parentd73da7e9af775222ba14a7cd1fbac62506907a41 (diff)
downloadtxr-9b7c9ae987f2c3ed75388434a32cbd8bc5fe7712.tar.gz
txr-9b7c9ae987f2c3ed75388434a32cbd8bc5fe7712.tar.bz2
txr-9b7c9ae987f2c3ed75388434a32cbd8bc5fe7712.zip
configure: libffi test fixes.
Fixes from review by Joe Eib. * configure: switch polarity of main return value, so it doesn't appear confusing, even though the test program is never run. Remove stray "set -x" command. Fix wrong use of nonexistent EXTRA_CFLAGS which should be EXTRA_FLAGS.
-rwxr-xr-xconfigure5
1 files changed, 2 insertions, 3 deletions
diff --git a/configure b/configure
index 235cd819..fe986a96 100755
--- a/configure
+++ b/configure
@@ -2855,7 +2855,7 @@ int main(void)
char *s;
args[0] = &ffi_type_pointer;
values[0] = &s;
- return ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1, &ffi_type_sint, args) == FFI_OK;
+ return ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1, &ffi_type_sint, args) != FFI_OK;
}
!
@@ -2869,8 +2869,7 @@ elif conftest EXTRA_LDFLAGS=-lffi ; then
elif [ -n "$have_pkgconfig" ] && pkg-config --exists libffi ; then
libffi_cflags=$(pkg-config --cflags libffi)
libffi_ldflags=$(pkg-config --libs libffi)
- if conftest EXTRA_CFLAGS="$libffi_cflags" EXTRA_LDFLAGS="$libffi_ldflags" ; then
- set -x
+ if conftest EXTRA_FLAGS="$libffi_cflags" EXTRA_LDFLAGS="$libffi_ldflags" ; then
printf "yes\n"
printf "#define HAVE_LIBFFI 1\n" >> config.h
conf_ldflags="${conf_ldflags:+"$conf_ldflags "}$libffi_ldflags"