Add support for guile 2.0: configure and makefiles.

Note: guile-config is badly broken for guile 2. So
the guile configure  section has been rewritten to
use pkg-config instead.

Manually resolved conflicts:
	Examples/Makefile.in
This commit is contained in:
Geert Janssens 2013-03-07 11:55:01 +01:00
commit b072f22930
4 changed files with 122 additions and 123 deletions

View file

@ -7,8 +7,8 @@ SWIG = ../$(top_srcdir)/preinst-swig
CC = @CC@
CXX = @CXX@
CFLAGS = @PLATFLAGS@
GUILEINCLUDE = @GUILEINCLUDE@
GUILELINK = @GUILELINK@
GUILE_CFLAGS = @GUILE_CFLAGS@
GUILE_LIBS = @GUILE_LIBS@
SWIGOPT =
WRAP = $(IFILE:.i=_wrap.c)
@ -31,10 +31,10 @@ guile_clean:
sub-all:
$(SWIG) -guile $(SWIGOPT) $(IFILE)
$(CC) $(CFLAGS) -o $(TARGET) $(SRCS) $(WRAP) $(GUILEINCLUDE) $(GUILELINK)
$(CC) $(CFLAGS) -o $(TARGET) $(SRCS) $(WRAP) $(GUILE_CFLAGS) $(GUILE_LIBS)
sub-all-cxx:
$(SWIG) -c++ -guile $(SWIGOPT) $(IFILE)
$(CXX) $(CFLAGS) -o $(TARGET) $(SRCS) $(CXXWRAP) $(GUILEINCLUDE) $(GUILELINK)
$(CXX) $(CFLAGS) -o $(TARGET) $(SRCS) $(CXXWRAP) $(GUILE_CFLAGS) $(GUILE_LIBS)
# Makefile ends here