50 lines
1.7 KiB
Text
50 lines
1.7 KiB
Text
--- configure.orig 2009-12-31 13:41:44.000000000 -0500
|
|
+++ configure 2012-09-17 12:29:34.000000000 -0400
|
|
@@ -2689,7 +2689,7 @@
|
|
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*) host_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 ;;
|
|
@@ -21662,8 +21662,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 +21725,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 +21735,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;}
|