summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2024-02-29 18:04:57 +0200
committerArnold D. Robbins <arnold@skeeve.com>2024-02-29 18:04:57 +0200
commit828e0e31f46b405e0a62a512238a5263cd025d67 (patch)
tree86533f77ebb82f8366e6641c126b3e007fa1643f
parent6184bf7e2833a42d9057722d919cf62b17b7935a (diff)
downloadgawk-828e0e31f46b405e0a62a512238a5263cd025d67.tar.gz
Make build complete all the way, ensure C++17 for minrx.
-rw-r--r--Makefile.am2
-rw-r--r--Makefile.in2
-rwxr-xr-xconfigure7
-rw-r--r--configure.ac7
-rw-r--r--extension/Makefile.am2
-rw-r--r--extension/Makefile.in1
6 files changed, 20 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 9f5e40c..d8ae9f5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,6 +30,8 @@ ACLOCAL_AMFLAGS = -I m4
AM_CFLAGS = @CFLAGS@
AM_LDFLAGS = @LDFLAGS@
+CCLD = g++ # temporary, until minrx is rewritten in C
+
# Stuff to include in the dist that doesn't need it's own
# Makefile.am files
EXTRA_DIST = \
diff --git a/Makefile.in b/Makefile.in
index a8fd98b..ec10544 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -223,7 +223,6 @@ AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
am__v_CC_1 =
-CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
@@ -483,6 +482,7 @@ top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
AM_CFLAGS = @CFLAGS@
AM_LDFLAGS = @LDFLAGS@
+CCLD = g++ # temporary, until minrx is rewritten in C
# Stuff to include in the dist that doesn't need it's own
# Makefile.am files
diff --git a/configure b/configure
index b0b6d94..d2f053b 100755
--- a/configure
+++ b/configure
@@ -7876,6 +7876,13 @@ fi
+if test -f $srcdir/support/minrx.h && test -f $srcdir/support/minrx.cpp
+then
+ CXXFLAGS='-std=c++17'
+fi
+
+
+
# shared library suffix for dynamic loading:
diff --git a/configure.ac b/configure.ac
index 355560e..da52ae9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,6 +147,13 @@ fi
AC_SUBST(CFLAGS)
+if test -f $srcdir/support/minrx.h && test -f $srcdir/support/minrx.cpp
+then
+ CXXFLAGS='-std=c++17'
+fi
+
+AC_SUBST(CXXFLAGS)
+
# shared library suffix for dynamic loading:
AC_SUBST(acl_shlibext)
diff --git a/extension/Makefile.am b/extension/Makefile.am
index 0427d2d..0f5abcc 100644
--- a/extension/Makefile.am
+++ b/extension/Makefile.am
@@ -26,6 +26,8 @@
AM_CPPFLAGS = -I$(srcdir)/..
+AM_CXXFLAGS = @CXXFLAGS@
+
# This variable insures that aclocal runs
# correctly after changing configure.ac
ACLOCAL_AMFLAGS = -I ../m4
diff --git a/extension/Makefile.in b/extension/Makefile.in
index ce490c9..e2933d1 100644
--- a/extension/Makefile.in
+++ b/extension/Makefile.in
@@ -555,6 +555,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I$(srcdir)/..
+AM_CXXFLAGS = @CXXFLAGS@
# This variable insures that aclocal runs
# correctly after changing configure.ac