Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 163647 | Differences between
and this patch

Collapse All | Expand All

(-)configure.ac.old (-1 / +7 lines)
Lines 58-75 Link Here
58
ar_WITH_LIB_LIBFFI([have_libffi=yes], [have_libffi=no])
58
ar_WITH_LIB_LIBFFI([have_libffi=yes], [have_libffi=no])
59
LIBFFI_CFLAGS_INSTALLED="$LIBFFI_CFLAGS"
59
LIBFFI_CFLAGS_INSTALLED="$LIBFFI_CFLAGS"
60
LIBFFI_LIBS_INSTALLED="$LIBFFI_LIBS"
60
LIBFFI_LIBS_INSTALLED="$LIBFFI_LIBS"
61
if test -d $srcdir/libffi; then
62
    AC_CONFIG_SUBDIRS(libffi)
63
fi
61
if test "$have_libffi" = no; then
64
if test "$have_libffi" = no; then
62
  if ! test -d $srcdir/libffi; then
65
  if ! test -d $srcdir/libffi; then
63
    AC_MSG_ERROR([G-Wrap needs libffi installed])
66
    AC_MSG_ERROR([G-Wrap needs libffi installed])
64
  else
67
  else
65
    AC_CONFIG_SUBDIRS(libffi)
68
    GW_LIBFFI_DIR=libffi
66
    LIBFFI_CFLAGS='-I$(top_builddir)/libffi/include'
69
    LIBFFI_CFLAGS='-I$(top_builddir)/libffi/include'
67
    LIBFFI_LIBS='$(top_builddir)/libffi/libffi.la'
70
    LIBFFI_LIBS='$(top_builddir)/libffi/libffi.la'
68
    LIBFFI_CFLAGS_INSTALLED=""
71
    LIBFFI_CFLAGS_INSTALLED=""
69
    LIBFFI_LIBS_INSTALLED="-lffi"
72
    LIBFFI_LIBS_INSTALLED="-lffi"
70
  fi
73
  fi
74
else
75
  GW_LIBFFI_DIR=
71
fi
76
fi
72
AM_CONDITIONAL(HAVE_LIBFFI, test "$have_libffi" = yes)
77
AM_CONDITIONAL(HAVE_LIBFFI, test "$have_libffi" = yes)
78
AC_SUBST(GW_LIBFFI_DIR)
73
AC_SUBST(LIBFFI_CFLAGS)
79
AC_SUBST(LIBFFI_CFLAGS)
74
AC_SUBST(LIBFFI_LIBS)
80
AC_SUBST(LIBFFI_LIBS)
75
AC_SUBST(LIBFFI_CFLAGS_INSTALLED)
81
AC_SUBST(LIBFFI_CFLAGS_INSTALLED)

Return to bug 163647