configure.ac | 2 +-
vivified/core/Makefile.am | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
diff-tree b319db3cbe2ce11e2d2edcf27ad44d28fa22de47 (from
08aafab0c67c5db6f1784a6da2c421b58d4474d6)
Author: Benjamin Otte <otte at gnome.org>
Date: Fri Aug 24 14:14:19 2007 +0200
include vivi_marshal.list
diff --git a/vivified/core/Makefile.am b/vivified/core/Makefile.am
index 13411ef..39dd7e1 100644
--- a/vivified/core/Makefile.am
+++ b/vivified/core/Makefile.am
@@ -40,6 +40,9 @@ BUILT_SOURCES = \
CLEANFILES = \
$(BUILT_SOURCES)
+EXTRA_DIST = \
+ vivi_marshal.list
+
vivi_function_list.h: $(libvivified_core_la_SOURCES)
(cd $(srcdir) \
&& grep -he "^VIVI_FUNCTION"
$(libvivified_core_la_SOURCES) \
diff-tree 08aafab0c67c5db6f1784a6da2c421b58d4474d6 (from
acf345dc1b3feb3dd3fd3a5fe8b723b4a2a0ad6a)
Author: Benjamin Otte <otte at gnome.org>
Date: Fri Aug 24 14:14:10 2007 +0200
don't call AM_PROG_AS conditionally
diff --git a/configure.ac b/configure.ac
index f01272d..5210c30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,6 +52,7 @@ dnl (This must come after AM_INIT_AUTOMA
AC_PROG_CC
AM_PROG_CC_STDC
AM_PROG_CC_C_O
+AM_PROG_AS
AC_HEADER_STDC([])
@@ -270,7 +271,6 @@ AC_ARG_ENABLE(vivified,
enable_vivi=$enableval,
enable_vivi="no")
if test "$enable_vivi" = "yes"; then
- AM_PROG_AS
MING_REQUIRED=0.4.0.beta5
VIVI_GTK_REQUIRED=2.11.6
PKG_CHECK_MODULES(VIVI, libming >= $MING_REQUIRED gmodule-export-2.0
gtk+-2.0 >= $VIVI_GTK_REQUIRED, HAVE_VIVI=yes, HAVE_VIVI=no)
