--- configure.ac.old	2005-04-14 16:57:01.000000000 +0200
+++ configure.ac	2006-11-05 14:57:30.000000000 +0100
@@ -58,18 +58,24 @@
 ar_WITH_LIB_LIBFFI([have_libffi=yes], [have_libffi=no])
 LIBFFI_CFLAGS_INSTALLED="$LIBFFI_CFLAGS"
 LIBFFI_LIBS_INSTALLED="$LIBFFI_LIBS"
+if test -d $srcdir/libffi; then
+    AC_CONFIG_SUBDIRS(libffi)
+fi
 if test "$have_libffi" = no; then
   if ! test -d $srcdir/libffi; then
     AC_MSG_ERROR([G-Wrap needs libffi installed])
   else
-    AC_CONFIG_SUBDIRS(libffi)
+    GW_LIBFFI_DIR=libffi
     LIBFFI_CFLAGS='-I$(top_builddir)/libffi/include'
     LIBFFI_LIBS='$(top_builddir)/libffi/libffi.la'
     LIBFFI_CFLAGS_INSTALLED=""
     LIBFFI_LIBS_INSTALLED="-lffi"
   fi
+else
+  GW_LIBFFI_DIR=
 fi
 AM_CONDITIONAL(HAVE_LIBFFI, test "$have_libffi" = yes)
+AC_SUBST(GW_LIBFFI_DIR)
 AC_SUBST(LIBFFI_CFLAGS)
 AC_SUBST(LIBFFI_LIBS)
 AC_SUBST(LIBFFI_CFLAGS_INSTALLED)