Savannah Git Hosting - mdk.git/commitdiff

diff --git a/configure.ac b/configure.ac

index 5b8d40c325e2d0993afaf986a44219a915b76cf2..a78ef2329594ff75b78df003857c99eff68c4b29 100644 (file)

--- a/configure.ac

+++ b/configure.ac

# 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

# 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

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],

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 4cb6620751321468fb9d97e25d91869d65cb794f..c651df13eacab5657e0e4864772085b06c9c2052 100644 (file)

--- a/mixgtk/Makefile.am

+++ b/mixgtk/Makefile.am

if MAKE_GUILE

GUILED = -DMAKE_GUILE

+GUILEL = $(top_builddir)/mixguile/libmixguile.a

else

GUILED =

+GUILEL =

endif

if DARWIN_SYSTEM

-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 384d89dd2ac25eb0c3601c37aabe1fcb2252e2be..9c874452b475d20d593d0abb42d6741df39c24c9 100644 (file)

--- a/mixutils/Makefile.am

+++ b/mixutils/Makefile.am

# 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 \