Hi, The attached patch fixes the build with out-of-tree libffi, and with autoconf 2.59.
This bundle is from my bzr g-wrap mirror. The mainline mirror is also up-to-date up to g-wrap--dev--0--patch-24. Regards, Wingo. -- http://wingolog.org/
# Bazaar revision bundle v0.8 # # message: # build fixes: allow autoconf 2.59, out-of-tree libffi # committer: Andy Wingo <[EMAIL PROTECTED]> # date: Fri 2006-09-01 18:01:22.619879961 +0200 === modified file Makefile.am --- Makefile.am +++ Makefile.am @@ -1,10 +1,6 @@ include $(top_srcdir)/common.mk -SUBDIRS = -if !HAVE_LIBFFI -SUBDIRS += libffi -endif -SUBDIRS += lib g-wrap test @GW_LANGUAGES@ examples doc +SUBDIRS = @GW_LIBFFI_DIR@ lib g-wrap test @GW_LANGUAGES@ examples doc nobase_guilemodule_DATA = g-wrap.scm === modified file autogen.sh --- autogen.sh +++ autogen.sh @@ -14,8 +14,8 @@ echo -n "+ check for build tools" if test ! -z "$NOCHECK"; then echo ": skipped version checks"; else echo; fi -version_check "autoconf" "$AUTOCONF autoconf autoconf-2.54 autoconf-2.53 autoconf-2.52" \ - "ftp://ftp.gnu.org/pub/gnu/autoconf/"; 2 52 || DIE=1 +version_check "autoconf" "$AUTOCONF autoconf autoconf-2.59" \ + "ftp://ftp.gnu.org/pub/gnu/autoconf/"; 2 59 || DIE=1 version_check "automake" "$AUTOMAKE automake automake-1.7 automake17 automake-1.6" \ "ftp://ftp.gnu.org/pub/gnu/automake/"; 1 5 || DIE=1 version_check "libtoolize" "libtoolize libtoolize14" \ === modified file configure.ac --- configure.ac +++ configure.ac @@ -1,6 +1,5 @@ dnl -*- Autoconf -*- -AC_PREREQ(2.60) AC_INIT(g-wrap.scm) dnl Program version @@ -63,14 +62,18 @@ if ! test -d $srcdir/libffi; then AC_MSG_ERROR([G-Wrap needs libffi installed]) else + GW_LIBFFI_DIR=libffi AC_CONFIG_SUBDIRS(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) # revision id: [EMAIL PROTECTED] # sha1: 768b8e8f9786ebc4ca25d0662237144a78c002a0 # inventory sha1: b067f5870f21821a9b2c2f4ea2be266d6f1e5f9b # parent ids: # [EMAIL PROTECTED] # base id: [EMAIL PROTECTED] # properties: # branch-nick: wingo
_______________________________________________ g-wrap-dev mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/g-wrap-dev
