emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

* updated configure.ac/Makefile.am for guile-snarfing

This commit is contained in:
Dirk-Jan C. Binnema 2011-07-12 09:10:06 +03:00
parent 6e15e3a8e1
commit d91b4ffdf8
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure.ac
View File

@ -209,14 +209,26 @@ AM_CONDITIONAL(HAVE_GIO, [test "x$have_gio" = "xyes"])
AM_CONDITIONAL(BUILD_WIDGETS, [test "x$have_webkit" = "xyes" -a "x$have_gio" = "xyes"])
# check for guile
# check for guile & guile-snarf
AC_PATH_PROG(GUILE, [guile-config], [], [$PATH])
AS_IF([test "x$GUILE" != "x"],
AS_IF([test "x$GUILE" != "x"],
[GUILE_CFLAGS=`$GUILE compile`; GUILE_LIBS=`$GUILE link`])
AM_CONDITIONAL(HAVE_GUILE, [test "$xGUILE" != "x"])
AC_SUBST(GUILE_LIBS)
AC_SUBST(GUILE_CFLAGS)
AC_PATH_PROG(GUILE_SNARF, [guile-snarf], [], [$PATH])
AS_IF([test "x$GUILE_SNARF" != "x"],[
AC_DEFINE_UNQUOTED([GUILE_SNARF], ["$GUILE_SNARF"],[Path to guile-snarf])],[
AC_MSG_WARN([cannot find guile-snarf])])
AM_CONDITIONAL(HAVE_GUILE,[test "$xGUILE" != "x" -a "x$GUILE_SNARF != "x])
# check for xdg-open
AS_IF([test "x$buildgui"="xyes"],[
AC_PATH_PROG(XDGOPEN, [xdg-open], [], [$PATH])

16
libmuguile/Makefile.am
View File

@ -26,6 +26,11 @@ INCLUDES=-I${top_srcdir}/src ${GUILE_CFLAGS} ${GLIB_CFLAGS}
AM_CFLAGS=-Wall -Wextra -Wno-unused-parameter -Wdeclaration-after-statement
AM_CXXFLAGS=-Wall -Wextra -Wno-unused-parameter
XFILES= \
mu-msg-guile.x
BUILT_SOURCES=$(XFILES)
noinst_LTLIBRARIES= \
libmuguile.la
@ -36,3 +41,14 @@ libmuguile_la_LIBADD= \
${top_builddir}/src/libmu.la \
${GUILE_LIBS}
snarfcppopts= $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)
SUFFIXES = .x
.c.x:
$(GUILE_SNARF) -o $@ $< $(snarfcppopts)
## Add -MG to make the .x magic work with auto-dep code.
MKDEP = $(CC) -M -MG $(snarfcppopts)
DISTCLEANFILES=$(XFILES)