blob: 45e93f07d3ce9fda299ee91c93f71941321806dd (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
|
--- configure.orig 2009-12-31 13:41:44.000000000 -0500
+++ configure 2012-09-17 12:29:34.000000000 -0400
@@ -2683,28 +2683,27 @@
i[3456]86-*-darwin*) host_cpu=i386 host_os=darwin ;;
arm*-*-darwin*) host_cpu=arm host_os=darwin libdl_needed=no ;;
i386-*-openbsd*) host_os=bsd libdl_needed=no ;;
-i386-*-freebsd*) host_os=bsd libdl_needed=no ;;
+i386-*-freebsd*) os=bsd libdl_needed=no ;;
i386-*-solaris*) host_cpu=x86 host_os=solaris ;;
x86_64-*-linux*) host_os=linux ;;
hppa*-*-linux*) host_cpu=parisc host_os=linux ;;
mipsel-*-linux*) host_cpu=mips host_os=linux ;;
x86_64-*-openbsd*) host_os=bsd libdl_needed=no ;;
-x86_64-*-freebsd*) host_os=bsd libdl_needed=no ;;
+amd64-*-freebsd*) os=bsd host_cpu=x86_64 libdl_needed=no ;;
arm*-*-linux*) host_cpu=arm host_os=linux ;;
arm*-*-openbsd*) host_cpu=arm host_os=bsd libdl_needed=no ;;
-arm*-*-freebsd*) host_cpu=arm host_os=bsd libdl_needed=no ;;
+arm*-*-freebsd*) host_cpu=arm os=bsd libdl_needed=no ;;
powerpc*-*-linux*) host_cpu=powerpc host_os=linux ;;
powerpc*-*-openbsd*) host_cpu=powerpc host_os=bsd libdl_needed=no ;;
-powerpc*-*-freebsd*) host_cpu=powerpc host_os=bsd libdl_needed=no ;;
+powerpc*-*-freebsd*) host_cpu=powerpc os=bsd libdl_needed=no ;;
powerpc-*-darwin*) host_os=darwin ;;
-sparc*-*-freebsd*) host_cpu=sparc host_os=bsd libdl_needed=no ;;
+sparc*-*-freebsd*) host_cpu=sparc os=bsd libdl_needed=no ;;
*) { { $as_echo "$as_me:$LINENO: error: $host not supported" >&5
$as_echo "$as_me: error: $host not supported" >&2;}
{ (exit 1); exit 1; }; } ;;
esac
arch=$host_cpu
-os=$host_os
@@ -21662,8 +21661,15 @@
if test "${ac_cv_lib_ffi_ffi_call+set}" = set; then
$as_echo_n "(cached) " >&6
else
+ ac_check_lib_save_CFLAGS=$CFLAGS
+ ac_check_lib_save_LDFLAGS=$LDFLAGS
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lffi $LIBS"
+ LIBFFI_CFLAGS="$($PKG_CONFIG libffi --cflags)"
+ LIBFFI_LDFLAGS="$($PKG_CONFIG libffi --libs-only-L)"
+ LIBFFI_LIBS="$($PKG_CONFIG libffi --libs-only-l)"
+CFLAGS="$LIBFFI_CFLAGS $CFLAGS"
+LDFLAGS="$LIBFFI_LDFLAGS $LDFLAGS"
+LIBS="$LIBFFI_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -21718,6 +21724,8 @@
rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
+CFLAGS=$ac_check_lib_save_CFLAGS
+LDFLAGS=$ac_check_lib_save_LDFLAGS
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ffi_ffi_call" >&5
@@ -21726,9 +21734,9 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBFFI 1
_ACEOF
-
- LIBS="-lffi $LIBS"
-
+ CFLAGS="$LIBFFI_CFLAGS $CFLAGS"
+ LDFLAGS="$LIBFFI_LDFLAGS $LDFLAGS"
+ LIBS="$LIBFFI_LIBS $LIBS"
else
{ { $as_echo "$as_me:$LINENO: error: libffi is missing" >&5
$as_echo "$as_me: error: libffi is missing" >&2;}
|
