Permalink
Browse files

* guilify mu; first steps, and a new toy called 'muile'

  • Loading branch information...
1 parent 5ad2319 commit 0b7693d077936cffda6c283111e3a780c0078fde @djcb committed Jul 4, 2011
Showing with 589 additions and 8 deletions.
  1. +8 −1 Makefile.am
  2. +15 −0 configure.ac
  3. +38 −0 libmuguile/Makefile.am
  4. +419 −0 libmuguile/mu-msg-guile.c
  5. +37 −0 libmuguile/mu-msg-guile.h
  6. +2 −6 src/mu-msg.h
  7. +0 −1 src/mu-str.c
  8. +4 −0 toys/Makefile.am
  9. +35 −0 toys/muile/Makefile.am
  10. +31 −0 toys/muile/muile.cc
View
@@ -23,7 +23,14 @@ else
widgets=
endif
-SUBDIRS=m4 man src $(widgets) contrib toys
+if HAVE_GUILE
+guile=libmuguile
+else
+guile=
+endif
+
+SUBDIRS=m4 man src $(widgets) $(guile) contrib toys
+
ACLOCAL_AMFLAGS=-I m4
View
@@ -204,6 +204,15 @@ AM_CONDITIONAL(HAVE_GIO, [test "x$have_gio" = "xyes"])
# should we build the widgets/ dir?
AM_CONDITIONAL(BUILD_WIDGETS, [test "x$have_webkit" = "xyes" -a "x$have_gio" = "xyes"])
+
+# check for guile
+AC_PATH_PROG(GUILE, [guile-config], [], [$PATH])
+ 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)
+
# check for xdg-open
AS_IF([test "x$buildgui"="xyes"],[
AC_PATH_PROG(XDGOPEN, [xdg-open], [], [$PATH])
@@ -228,9 +237,11 @@ Makefile
src/Makefile
src/tests/Makefile
widgets/Makefile
+libmuguile/Makefile
toys/Makefile
toys/mug/Makefile
toys/mug2/Makefile
+toys/muile/Makefile
man/Makefile
m4/Makefile
contrib/Makefile
@@ -264,6 +275,10 @@ if test "x$have_webkit" = "xyes"; then
echo "Webkit version : $webkit_version"
fi
+if test "x$GUILE" != "x"; then
+echo "Guile version : `$GUILE --version 2>&1`"
+fi
+
echo
echo "Build unit tests (glib >= 2.22) : $have_gtest"
echo "Build 'mug' toy-ui (requires GTK+) : $buildgui"
View
@@ -0,0 +1,38 @@
+## Copyright (C) 2011 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## t he Free Software Foundation; either version 3 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software Foundation,
+## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+include $(top_srcdir)/gtest.mk
+
+# enforce compiling this dir first before decending into tests/
+SUBDIRS= .
+INCLUDES=-I${top_srcdir}/src ${GUILE_CFLAGS} ${GLIB_CFLAGS}
+
+# don't use -Werror, as it might break on other compilers
+# use -Wno-unused-parameters, because some callbacks may not
+# really need all the params they get
+AM_CFLAGS=-Wall -Wextra -Wno-unused-parameter -Wdeclaration-after-statement
+AM_CXXFLAGS=-Wall -Wextra -Wno-unused-parameter
+
+noinst_LTLIBRARIES= \
+ libmuguile.la
+
+libmuguile_la_SOURCES= \
+ mu-msg-guile.c
+
+libmuguile_la_LIBADD= \
+ ${top_builddir}/src/libmu.la \
+ ${GUILE_LIBS}
+
Oops, something went wrong.

0 comments on commit 0b7693d

Please sign in to comment.