# Bazaar revision bundle v0.8
#
# message:
#   2006-12-15  Andy Wingo  <address@hidden>
#   
#   	* Makefile.am (DIST_SUBDIRS): libffi needs to be in a
#   	@substitutedvariable@, or otherwise automake will require that it
#   	exist when doing an autogen. Allows build from bzr without libffi.
#   	
#   	* guile/examples/Makefile.am (lib_LTLIBRARIES): Add the
#   	uninstalled guile path to the CFLAGS.
#   
# committer: Andy Wingo <address@hidden>
# date: Fri 2006-12-15 13:27:24.693000078 +0100

=== modified file ChangeLog
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,12 @@
+2006-12-15  Andy Wingo  <address@hidden>
+
+	* Makefile.am (DIST_SUBDIRS): libffi needs to be in a
+	@substitutedvariable@, or otherwise automake will require that it
+	exist when doing an autogen. Allows build from bzr without libffi.
+	
+	* guile/examples/Makefile.am (lib_LTLIBRARIES): Add the
+	uninstalled guile path to the CFLAGS.
+
 2006-11-25  Andreas Rottmann  <address@hidden>
 
 	* guile/test/guile-test-env.in: Renamed to

=== modified file Makefile.am
--- Makefile.am
+++ Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/common.mk
 
 SUBDIRS = @GW_LIBFFI_DIR@ lib g-wrap test @GW_LANGUAGES@ doc
-DIST_SUBDIRS = libffi lib g-wrap test guile scheme48 doc
+DIST_SUBDIRS = @GW_LIBFFI_DIR@ lib g-wrap test guile scheme48 doc
 
 dist-hook:
 	if test ! -d libffi; then echo "libffi/ directory needed for make dist">&2; exit 1; fi

=== modified file guile/examples/Makefile.am
--- guile/examples/Makefile.am
+++ guile/examples/Makefile.am
@@ -5,6 +5,7 @@
 
 lib_LTLIBRARIES += libgw-guile-miscutils.la
 libgw_guile_miscutils_la_SOURCES = miscutils-guile.c miscutils-guile.h gw-miscutils.c
+libgw_guile_miscutils_la_CFLAGS = -I$(top_builddir)/guile
 libgw_guile_miscutils_la_LDFLAGS = -module
 libgw_guile_miscutils_la_LIBADD = libmiscutils.la \
 				  $(top_builddir)/guile/g-wrap/libgwrap-guile-runtime.la \

# revision id: address@hidden
# sha1: 855478bf6d6bcfbb2fb4527c71940a74851ca212
# inventory sha1: c0c2aeec41e76fee729aa37f9fe9fd01f1280573
# parent ids:
#   address@hidden
# base id: address@hidden
# properties:
#   branch-nick: mainline