diff options
| author | Simon Feltman <sfeltman@src.gnome.org> | 2014-03-17 14:55:52 -0700 |
|---|---|---|
| committer | Simon Feltman <sfeltman@src.gnome.org> | 2014-03-17 14:55:52 -0700 |
| commit | b3b1f38af1ac1bda9d6a3ba50e9b6fa37ae48d96 (patch) | |
| tree | df4b55b4671a25c5feb4dfda997bfdf6a796986d | |
| parent | 1a2438497ffc445fe3f9da06b15085f29317c4ee (diff) | |
| download | pygobject-b3b1f38af1ac1bda9d6a3ba50e9b6fa37ae48d96.tar.gz | |
configure.ac: Remove option to build without libffi
We've always had a hard dependency on libffi headers.
Commit 5798f94b6a727b93 added a direct module dependency on libffi
instead of indirect via GI. Remove the option to build without libffi.
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index 1b2c95de..e4536a40 100644 --- a/configure.ac +++ b/configure.ac @@ -174,23 +174,9 @@ AC_SUBST([PYTHON_BASENAME]) AS_AC_EXPAND(DATADIR, $datadir) dnl libffi -AC_MSG_CHECKING(for ffi) -AC_ARG_WITH(ffi, - AS_HELP_STRING([--without-ffi],[Disable libffi support]), - with_libffi=$withval, - with_libffi=auto) -if test x"$with_libffi" = xno ; then - have_libffi=false -else - PKG_CHECK_MODULES(FFI, libffi >= 3.0, have_libffi=yes, have_libffi=no) -fi -if test x"$with_libffi" = xyes && test x"$have_libffi" = xno ; then - AC_MSG_ERROR([ffi requested, but not found]) -fi -if test x"$have_libffi" = xyes; then - LIBFFI_PC=libffi -fi -AM_CONDITIONAL(HAVE_LIBFFI, test "$have_libffi" = "yes") +PKG_CHECK_MODULES(FFI, libffi >= 3.0) +LIBFFI_PC=libffi + AC_SUBST(FFI_CFLAGS) AC_SUBST(FFI_LIBS) AC_SUBST(LIBFFI_PC) @@ -287,7 +273,6 @@ AC_MSG_RESULT([ pygobject $VERSION Using python interpreter: $PYTHON - libffi support: $have_libffi cairo support: $enable_cairo thread support: $enable_thread code coverage support: $enable_code_coverage |