From ecbdedc6c05c1d8a6259e55fb36ea501f3b379a5 Mon Sep 17 00:00:00 2001
From: Leo Singer <leo.singer@ligo.org>
Date: Mon, 18 Nov 2019 15:10:27 -0500
Subject: [PATCH 2/4] Use CXX to build tksao C++ files

---
 tksao/Makefile.in  | 6 +++++-
 tksao/configure.ac | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 tksao/configure.ac

diff --git a/tksao/Makefile.in b/tksao/Makefile.in
index 2120066f..55306071 100644
--- a/tksao/Makefile.in
+++ b/tksao/Makefile.in
@@ -96,6 +96,7 @@ INSTALL_LIBRARY	= ${INSTALL_DATA}
 PACKAGE_NAME	= @PACKAGE_NAME@
 PACKAGE_VERSION	= @PACKAGE_VERSION@
 CC		= @CC@
+CXX		= @CXX@
 CFLAGS_DEFAULT	= @CFLAGS_DEFAULT@
 CFLAGS_WARNING	= @CFLAGS_WARNING@
 EXEEXT		= @EXEEXT@
@@ -165,8 +166,11 @@ CPPFLAGS	= @CPPFLAGS@
 LIBS		= @PKG_LIBS@ @LIBS@
 AR		= @AR@
 CFLAGS		= @CFLAGS@
+CXXFLAGS		= @CXXFLAGS@
 COMPILE		= $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) \
 			  $(CFLAGS_DEFAULT) $(CFLAGS_WARNING) $(SHLIB_CFLAGS) $(CFLAGS)
+COMPILE_CXX		= $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) \
+			  $(CFLAGS_DEFAULT) $(CFLAGS_WARNING) $(SHLIB_CFLAGS) $(CXXFLAGS)
 
 GDB		= gdb
 VALGRIND	= valgrind
@@ -382,7 +386,7 @@ VPATH = $(srcdir):$(srcdir)/generic:$(srcdir)/unix:$(srcdir)/win:$(srcdir)/macos
 	$(COMPILE) -c `@CYGPATH@ $<` -o $@
 
 .C.@OBJEXT@:
-	$(COMPILE) -c `@CYGPATH@ $<` -o $@
+	$(COMPILE_CXX) -c `@CYGPATH@ $<` -o $@
 
 #========================================================================
 # Distribution creation
diff --git a/tksao/configure.ac b/tksao/configure.ac
old mode 100644
new mode 100755
index 129faf39..4159f185
--- a/tksao/configure.ac
+++ b/tksao/configure.ac
@@ -59,6 +59,7 @@ TEA_PREFIX
 # necessary to compile executables.
 #-----------------------------------------------------------------------
 
+AC_PROG_CXX
 TEA_SETUP_COMPILER
 
 #-----------------------------------------------------------------------
-- 
2.24.0