configure: use `pkg-config' for libffi
This commit is contained in:
parent
efed709f69
commit
f6d185abab
32
src/configure
vendored
32
src/configure
vendored
|
@ -5120,8 +5120,34 @@ if test "${enable_libffi}" = "yes" ; then
|
||||||
if test "${enable_foreign}" = "yes" ; then
|
if test "${enable_foreign}" = "yes" ; then
|
||||||
{ echo "$as_me:$LINENO: checking for libffi" >&5
|
{ echo "$as_me:$LINENO: checking for libffi" >&5
|
||||||
echo $ECHO_N "checking for libffi... $ECHO_C" >&6; }
|
echo $ECHO_N "checking for libffi... $ECHO_C" >&6; }
|
||||||
|
|
||||||
|
# Try to get flags form pkg-config:
|
||||||
|
libffi_config_prog="pkg-config libffi"
|
||||||
|
libffi_config_preflags=`$libffi_config_prog --cflags-only-I 2> /dev/null`
|
||||||
|
if test "$?" = 0 ; then
|
||||||
|
libffi_config_cflags=`$libffi_config_prog --cflags-only-other 2> /dev/null`
|
||||||
|
if test "$?" = 0 ; then
|
||||||
|
libffi_config_ldflags=`$libffi_config_prog --libs 2> /dev/null`
|
||||||
|
if test "$?" != 0 ; then
|
||||||
|
libffi_config_preflags=""
|
||||||
|
libffi_config_cflags=""
|
||||||
|
libffi_config_ldflags="-lffi"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
libffi_config_preflags=""
|
||||||
|
libffi_config_cflags=""
|
||||||
|
libffi_config_ldflags="-lffi"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
libffi_config_preflags=""
|
||||||
|
libffi_config_cflags=""
|
||||||
|
libffi_config_ldflags="-lffi"
|
||||||
|
fi
|
||||||
|
|
||||||
|
OLD_CFLAGS="${CFLAGS}"
|
||||||
OLD_LDFLAGS="${LDFLAGS}"
|
OLD_LDFLAGS="${LDFLAGS}"
|
||||||
LDFLAGS="${LDFLAGS} -lffi"
|
CFLAGS="${CFLAGS} ${libffi_config_preflags} ${libffi_config_cflags}"
|
||||||
|
LDFLAGS="${LDFLAGS} ${libffi_config_ldflags}"
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
/* confdefs.h. */
|
/* confdefs.h. */
|
||||||
_ACEOF
|
_ACEOF
|
||||||
|
@ -5169,9 +5195,13 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||||||
{ echo "$as_me:$LINENO: result: $have_libffi" >&5
|
{ echo "$as_me:$LINENO: result: $have_libffi" >&5
|
||||||
echo "${ECHO_T}$have_libffi" >&6; }
|
echo "${ECHO_T}$have_libffi" >&6; }
|
||||||
if test "${have_libffi}" = "no" ; then
|
if test "${have_libffi}" = "no" ; then
|
||||||
|
CFLAGS="${OLD_CFLAGS}"
|
||||||
LDFLAGS="${OLD_LDFLAGS}"
|
LDFLAGS="${OLD_LDFLAGS}"
|
||||||
echo "Building own libffi"
|
echo "Building own libffi"
|
||||||
else
|
else
|
||||||
|
CFLAGS="${OLD_CFLAGS}"
|
||||||
|
PREFLAGS="${PREFLAGS} ${libffi_config_preflags}"
|
||||||
|
CFLAGS="${COMPFLAGS} ${libffi_config_cflags}"
|
||||||
echo "Using installed libffi"
|
echo "Using installed libffi"
|
||||||
OWN_LIBFFI="OFF"
|
OWN_LIBFFI="OFF"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -855,8 +855,34 @@ AC_MSG_RESULT($mbsrtowcs)
|
||||||
if test "${enable_libffi}" = "yes" ; then
|
if test "${enable_libffi}" = "yes" ; then
|
||||||
if test "${enable_foreign}" = "yes" ; then
|
if test "${enable_foreign}" = "yes" ; then
|
||||||
AC_MSG_CHECKING([for libffi])
|
AC_MSG_CHECKING([for libffi])
|
||||||
|
|
||||||
|
# Try to get flags form pkg-config:
|
||||||
|
libffi_config_prog="pkg-config libffi"
|
||||||
|
libffi_config_preflags=`$libffi_config_prog --cflags-only-I 2> /dev/null`
|
||||||
|
if test "$?" = 0 ; then
|
||||||
|
libffi_config_cflags=`$libffi_config_prog --cflags-only-other 2> /dev/null`
|
||||||
|
if test "$?" = 0 ; then
|
||||||
|
libffi_config_ldflags=`$libffi_config_prog --libs 2> /dev/null`
|
||||||
|
if test "$?" != 0 ; then
|
||||||
|
libffi_config_preflags=""
|
||||||
|
libffi_config_cflags=""
|
||||||
|
libffi_config_ldflags="-lffi"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
libffi_config_preflags=""
|
||||||
|
libffi_config_cflags=""
|
||||||
|
libffi_config_ldflags="-lffi"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
libffi_config_preflags=""
|
||||||
|
libffi_config_cflags=""
|
||||||
|
libffi_config_ldflags="-lffi"
|
||||||
|
fi
|
||||||
|
|
||||||
|
OLD_CFLAGS="${CFLAGS}"
|
||||||
OLD_LDFLAGS="${LDFLAGS}"
|
OLD_LDFLAGS="${LDFLAGS}"
|
||||||
LDFLAGS="${LDFLAGS} -lffi"
|
CFLAGS="${CFLAGS} ${libffi_config_preflags} ${libffi_config_cflags}"
|
||||||
|
LDFLAGS="${LDFLAGS} ${libffi_config_ldflags}"
|
||||||
AC_TRY_LINK([#include <ffi.h>],
|
AC_TRY_LINK([#include <ffi.h>],
|
||||||
[ffi_cif cif; ]
|
[ffi_cif cif; ]
|
||||||
[ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 0, &ffi_type_void, NULL);],
|
[ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 0, &ffi_type_void, NULL);],
|
||||||
|
@ -864,9 +890,13 @@ if test "${enable_libffi}" = "yes" ; then
|
||||||
have_libffi=no)
|
have_libffi=no)
|
||||||
AC_MSG_RESULT($have_libffi)
|
AC_MSG_RESULT($have_libffi)
|
||||||
if test "${have_libffi}" = "no" ; then
|
if test "${have_libffi}" = "no" ; then
|
||||||
|
CFLAGS="${OLD_CFLAGS}"
|
||||||
LDFLAGS="${OLD_LDFLAGS}"
|
LDFLAGS="${OLD_LDFLAGS}"
|
||||||
echo "Building own libffi"
|
echo "Building own libffi"
|
||||||
else
|
else
|
||||||
|
CFLAGS="${OLD_CFLAGS}"
|
||||||
|
PREFLAGS="${PREFLAGS} ${libffi_config_preflags}"
|
||||||
|
CFLAGS="${COMPFLAGS} ${libffi_config_cflags}"
|
||||||
echo "Using installed libffi"
|
echo "Using installed libffi"
|
||||||
OWN_LIBFFI="OFF"
|
OWN_LIBFFI="OFF"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue
Block a user