From fd6af75970ec60598c0bc3e1adcfcd2cb8b1da52 Mon Sep 17 00:00:00 2001
From: Jose Antonio Ortega Ruiz <jao@gnu.org>
Date: Mon, 6 Jan 2014 05:32:05 +0100
Subject: Fixes for building with --without-guile

---
 configure.ac         | 10 +++++-----
 mixgtk/Makefile.am   |  5 ++++-
 mixutils/Makefile.am |  7 ++++---
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5b8d40c..a78ef23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009,
-#               2010, 2013 Free Software Foundation, Inc.
+#               2010, 2013, 2014 Free Software Foundation, Inc.
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -9,7 +9,7 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-AC_INIT([GNU MDK],1.2.7,[bug-mdk@gnu.org],mdk)
+AC_INIT([GNU MDK],1.2.8,[bug-mdk@gnu.org],mdk)
 AC_CONFIG_SRCDIR([mixlib/mix.h])
 AM_INIT_AUTOMAKE
 
@@ -80,6 +80,9 @@ dnl of rl_completion_matches
 AC_CHECK_FUNCS(rl_completion_matches,,)
 fi
 
+dnl Check for glib
+PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.0)
+
 dnl Check for guile
 AC_ARG_WITH(guile,
 [  --without-guile         build MDK without Guile support],
@@ -101,9 +104,6 @@ fi
 
 AM_CONDITIONAL(MAKE_GUILE, test x$wguile = xtrue)
 
-dnl Check for glib
-PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.0)
-
 LIBS="$LIBS $GLIB_LIBS"
 AM_CFLAGS="$AM_CFLAGS $GLIB_CFLAGS -DG_DISABLE_DEPRECATED"
 
diff --git a/mixgtk/Makefile.am b/mixgtk/Makefile.am
index 4cb6620..c651df1 100644
--- a/mixgtk/Makefile.am
+++ b/mixgtk/Makefile.am
@@ -14,8 +14,10 @@ EXTRA_DIST = mixgtk.glade
 
 if MAKE_GUILE
 GUILED = -DMAKE_GUILE
+GUILEL = $(top_builddir)/mixguile/libmixguile.a
 else
 GUILED =
+GUILEL =
 endif
 
 if DARWIN_SYSTEM
@@ -36,8 +38,9 @@ AM_CFLAGS += -I$(includedir) -I$(top_srcdir) \
 	     -DDEFAULT_EDITOR_CMD=\"$(EDITOR_CMD)\"\
 	     -DDEFAULT_ASM_CMD="\"$(bindir)/mixasm %s"\"\
              $(GUILED) $(EXTRA_EXECD)
+
 LDADD = $(top_builddir)/mixlib/libmix.a $(top_builddir)/lib/libreplace.a\
-        $(top_builddir)/mixguile/libmixguile.a $(INTLLIBS)
+        $(GUILEL) $(INTLLIBS)
 
 AM_LDFLAGS = -Wl,--export-dynamic
 bin_PROGRAMS = gmixvm
diff --git a/mixutils/Makefile.am b/mixutils/Makefile.am
index 384d89d..9c87445 100644
--- a/mixutils/Makefile.am
+++ b/mixutils/Makefile.am
@@ -11,15 +11,16 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 
+LDADD = $(top_builddir)/mixlib/libmix.a $(top_builddir)/lib/libreplace.a \
+        $(INTLLIBS)
+
 if MAKE_GUILE
 AM_CFLAGS +=  -I$(includedir) -I$(top_srcdir) -DMAKE_GUILE
+LDADD += $(top_builddir)/mixguile/libmixguile.a
 else
 AM_CFLAGS += -I$(includedir) -I$(top_srcdir)
 endif
 
-LDADD = $(top_builddir)/mixlib/libmix.a $(top_builddir)/lib/libreplace.a \
-        $(top_builddir)/mixguile/libmixguile.a $(INTLLIBS)
-
 bin_PROGRAMS = mixasm mixvm
 mixasm_SOURCES = mixasm.c mixasm_comp.h mixasm_comp.c
 mixvm_SOURCES = mixvm.c mixvm_loop.h mixvm_loop.c mixvm_command.h \
-- 
cgit v1.2.3