diff --git a/bootstrap.sh b/bootstrap.sh
index ee24b53..1bca169 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,7 +1,9 @@
+#!/bin/sh
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (C) 2018 IBM Corp.
 
-#!/bin/sh
+set -e
+set -x
 
 AUTOCONF_FILES="Makefile.in aclocal.m4 ar-lib autom4te.cache compile \
         config.guess config.h.in config.sub configure depcomp install-sh \
@@ -17,5 +19,5 @@
         ;;
 esac
 
-autoreconf -i
+autoreconf -vfi
 echo 'Run "./configure ${CONFIGURE_FLAGS} && make"'
diff --git a/configure.ac b/configure.ac
index 5c033b0..12e6b0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,6 +7,7 @@
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([subdir-objects -Wall -Werror foreign dist-xz])
 AM_SILENT_RULES([yes])
+AC_LANG([C++])
 
 # Checks for programs.
 AC_PROG_CXX