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