[PATCH 1/3] Support C++ source files, use -fexceptions.

[Taahir Ahmed]

-fexceptions allows C++ exceptions to pass through C stack frames.
---
 configure.ac         | 1 +
 libguile/Makefile.am | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 19e00d8..78cbffc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,6 +66,7 @@ AC_LIBTOOL_WIN32_DLL
 
 AC_PROG_INSTALL
 AC_PROG_CC
+AC_PROG_CXX
 gl_EARLY
 AC_PROG_CPP
 AC_PROG_SED
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 8302a18..cc88215 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -38,7 +38,8 @@ DEFAULT_INCLUDES =
 AM_CPPFLAGS = -DBUILDING_LIBGUILE=1 -I$(top_srcdir) -I$(top_builddir) \
              -I$(top_srcdir)/lib -I$(top_builddir)/lib $(LIBFFI_CFLAGS)
 
-AM_CFLAGS = $(GCC_CFLAGS) $(CFLAG_VISIBILITY)
+AM_CFLAGS = -fexceptions $(GCC_CFLAGS) $(CFLAG_VISIBILITY)
+AM_CXXFLAGS = $(GCC_CFLAGS) $(CFLAG_VISIBILITY)
 
 ## The Gnulib Libtool archive.
 gnulib_library = $(top_builddir)/lib/libgnu.la
@@ -113,10 +114,12 @@ guile_filter_doc_snarfage$(EXEEXT): 
$(guile_filter_doc_snarfage_OBJECTS) $(guile
 
 guile_SOURCES = guile.c
 guile_CFLAGS = $(GUILE_CFLAGS) $(AM_CFLAGS)
+guile_CXXFLAGS = $(GUILE_CXXFLAGS) $(AM_CXXFLAGS)
 guile_LDADD = address@hidden@.la
 guile_LDFLAGS = $(GUILE_CFLAGS)
 
 address@hidden@_la_CFLAGS = $(GUILE_CFLAGS) $(AM_CFLAGS)
address@hidden@_la_CXXFLAGS = $(GUILE_CXXFLAGS) $(AM_CXXFLAGS)
 
 address@hidden@_la_SOURCES =                           \
        alist.c                                 \
-- 
2.3.6