diff --git a/configure.ac b/configure.ac
index e2839ca86..1e4c3ef47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,6 +83,33 @@ dnl SED is supposed to be set in AC_LIBTOOL_SETUP, but the
 dnl sequence seems to get mixed up.
 SED=${SED-sed}
 
+
+dnl If CXX is neither unset nor empty nor "no", presume we can compile
+dnl C++ sources. A C++ compiler is not required for libgphoto2 itself,
+dnl but is useful to make sure that the libgphoto2 header files
+dnl compile when included into C++ source files.
+AM_CONDITIONAL([HAVE_CXX], [test "x$CXX" != "x" && test "x$CXX" != "xno"])
+
+
+dnl --------------------------------------------------------------------
+dnl Determine the most pedantic compiler flags we can can find for both
+dnl C and C++, so that we can test that the libgphoto2 headers compile
+dnl with those flags.
+dnl --------------------------------------------------------------------
+GP_PEDANTIC_COMPILER_FLAGS([C90],   [C],   [-std=c90])
+GP_PEDANTIC_COMPILER_FLAGS([C99],   [C],   [-std=c99])
+GP_PEDANTIC_COMPILER_FLAGS([C11],   [C],   [-std=c11])
+dnl
+GP_PEDANTIC_COMPILER_FLAGS([CXX98], [C++], [-std=c++98])
+GP_PEDANTIC_COMPILER_FLAGS([CXX11], [C++], [-std=c++11])
+GP_PEDANTIC_COMPILER_FLAGS([CXX14], [C++], [-std=c++14])
+GP_PEDANTIC_COMPILER_FLAGS([CXX17], [C++], [-std=c++17])
+
+
+dnl Every compile example after here will be using the C language
+AC_LANG([C])
+
+
 dnl ---------------------------------------------------------------------------
 dnl Turn on (almost) all warnings when using gcc
 dnl ---------------------------------------------------------------------------
@@ -631,10 +658,6 @@ CPPFLAGS="$CPPFLAGS_save"
 ],[],[default-on],[http://www.sourceforge.net/projects/libexif])dnl
 
 
-dnl FIXME: Is this accurate?
-AM_CONDITIONAL([HAVE_CXX], [test -n "$CXX" && test "X$CXX" != "Xno"])
-
-
 dnl ---------------------------------------------------------------------------
 dnl Configure subprojects
 dnl ---------------------------------------------------------------------------
diff --git a/gphoto-m4/gp-pedantic-compiler-flags.m4 b/gphoto-m4/gp-pedantic-compiler-flags.m4
new file mode 100644
index 000000000..bb5adfc71
--- /dev/null
+++ b/gphoto-m4/gp-pedantic-compiler-flags.m4
@@ -0,0 +1,123 @@
+dnl ####################################################################
+dnl GP_PEDANTIC_COMPILER_FLAGS & Co.
+dnl ####################################################################
+dnl
+m4_pattern_forbid([_GP_])dnl
+dnl
+dnl
+dnl ####################################################################
+dnl _GP_CONDITIONAL_COMPILE_FLAGS(FLAG_VAR, FLAGS)
+dnl ####################################################################
+AC_DEFUN([_GP_CONDITIONAL_COMPILE_FLAGS], [dnl
+# BEGIN $0($@)
+AS_VAR_IF([$1], [], [dnl
+  $1="$2"
+], [dnl
+  $1="[$]{$1} $2"
+])
+AC_MSG_CHECKING([whether $1="[$]$1" compiles])
+AC_COMPILE_IFELSE([m4_case([$1], [CFLAGS], [dnl
+AC_LANG_SOURCE([[
+#include <stdio.h>
+int main(int argc, char *argv[])
+{
+  int i;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    printf("  %d %s\n", i, argv[i]);
+  }
+  return 0;
+}
+]])dnl
+], [CXXFLAGS], [dnl
+AC_LANG_SOURCE([[
+#include <iostream>
+int main(int argc, char *argv[])
+{
+  int i;
+  /* Use argc and argv to prevent warning about unused function params */
+  for (i=0; i<argc; ++i) {
+    std::cout << "  " << i << " " << argv[i] << std::endl;
+  }
+  return 0;
+}
+]])dnl
+], [m4_fatal([wrong compiler flag])])], [dnl
+  : "Added flag $2 to $1 and it works"
+  AC_MSG_RESULT([yes])
+], [dnl
+  : "Added flag $2 to $1 and it does not work"
+  AC_MSG_RESULT([no])
+  gp_have_pedantic_compiler=no
+])
+# END $0($@)
+])dnl
+dnl
+dnl
+dnl ####################################################################
+dnl Params:
+dnl   $1 Depending on the language, CFLAGS or CXXFLAGS
+dnl   $2 The flag variable the caller wants us to set
+dnl   $3 The AM_CONDITIONAL the caller wants us to set
+dnl   $4 The -std= argument (such as -std=c++98 or -std=c99)
+dnl ####################################################################
+AC_DEFUN([__GP_PEDANTIC_COMPILER_FLAGS], [dnl
+# BEGIN $0($@)
+gp_have_pedantic_compiler=yes
+_GP_CONDITIONAL_COMPILE_FLAGS([$1], [$4])dnl
+AS_VAR_IF([gp_have_pedantic_compiler], [yes], [dnl
+  _GP_CONDITIONAL_COMPILE_FLAGS([$1], [-pedantic -Wall -Wextra -Werror])dnl
+])
+AM_CONDITIONAL([$3], [test "x$gp_have_pedantic_compiler" = "xyes"])
+AC_SUBST([$2], ["[$]$1"])
+AC_MSG_CHECKING([whether to test pedantic ][$4])
+AM_COND_IF([$3], [dnl
+  AC_MSG_RESULT([yes])
+], [dnl
+  AC_MSG_RESULT([no])
+])
+# END $0($@)
+])dnl
+dnl
+dnl
+dnl ####################################################################
+dnl Params:
+dnl   $1 Depending on the language, CFLAGS or CXXFLAGS
+dnl   $2 The variable/conditional component the caller wants us to use
+dnl   $3 The -std= argument (such as -std=c++98 or -std=c99)
+dnl ####################################################################
+m4_pattern_allow([GP_PEDANTIC_CFLAGS_])dnl
+m4_pattern_allow([GP_PEDANTIC_CXXFLAGS_])dnl
+m4_pattern_allow([GP_HAVE_PEDANTIC_FLAGS_])dnl
+AC_DEFUN([_GP_PEDANTIC_COMPILER_FLAGS], [dnl
+# BEGIN $0($@)
+gp_compiler_flags_saved_$1="[$]$1"
+$1=""
+__GP_PEDANTIC_COMPILER_FLAGS([$1],
+                             [GP_PEDANTIC_][$1][_][$2],
+                             [GP_HAVE_PEDANTIC_FLAGS_][$2],
+                             [$3])
+GP_PEDANTIC_$1_$2="[$]$1"
+$1="[$]gp_compiler_flags_saved_$1"
+# END $0($@)
+])dnl
+dnl
+dnl
+dnl ####################################################################
+dnl GP_PEDANTIC_COMPILER_FLAGS(VAR_COMPONENT, LANG, std-arg)
+dnl Start a new series of compiler flags
+dnl ####################################################################
+AC_DEFUN([GP_PEDANTIC_COMPILER_FLAGS], [dnl
+# BEGIN $0($@)
+AC_LANG_PUSH([$2])
+_GP_PEDANTIC_COMPILER_FLAGS(m4_case($2,[C],[CFLAGS],[C++],[CXXFLAGS],[m4_fatal([Unknown language given: ][$2])]), [$1], [$3])
+AC_LANG_POP([$2])
+# END $0($@)
+])dnl
+dnl
+dnl
+dnl ####################################################################
+dnl
+dnl Local Variables:
+dnl mode: autoconf
+dnl End:
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c20c0e9f8..6c3d4449c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -143,6 +143,101 @@ test_pedantic_cxx_LDADD = \
 	$(INTLLIBS)
 
 
+########################################################################
+# Test pendantic compilation for multiple language standard
+########################################################################
+
+generic_pedantic_cppflags =
+generic_pedantic_cppflags += -I$(top_srcdir)/libgphoto2_port
+generic_pedantic_cppflags += -I$(top_srcdir)
+
+if GP_HAVE_PEDANTIC_FLAGS_C90
+TESTS                     += test-pedantic-c90
+check_PROGRAMS            += test-pedantic-c90
+test_pedantic_c90_SOURCES  = test-pedantic-compilation.c
+test_pedantic_c90_CPPFLAGS = $(generic_pedantic_cppflags)
+test_pedantic_c90_CFLAGS   = $(GP_PEDANTIC_CFLAGS_C90)
+test_pedantic_c90_LDADD    =
+test_pedantic_c90_LDFLAGS  =
+endif
+
+if GP_HAVE_PEDANTIC_FLAGS_C99
+TESTS                     += test-pedantic-c99
+check_PROGRAMS            += test-pedantic-c99
+test_pedantic_c99_SOURCES  = test-pedantic-compilation.c
+test_pedantic_c99_CPPFLAGS = $(generic_pedantic_cppflags)
+test_pedantic_c99_CFLAGS   = $(GP_PEDANTIC_CFLAGS_C99)
+test_pedantic_c99_LDADD    =
+test_pedantic_c99_LDFLAGS  =
+endif
+
+if GP_HAVE_PEDANTIC_FLAGS_C11
+TESTS                     += test-pedantic-c11
+check_PROGRAMS            += test-pedantic-c11
+test_pedantic_c11_SOURCES  = test-pedantic-compilation.c
+test_pedantic_c11_CPPFLAGS = $(generic_pedantic_cppflags)
+test_pedantic_c11_CFLAGS   = $(GP_PEDANTIC_CFLAGS_C11)
+test_pedantic_c11_LDADD    =
+test_pedantic_c11_LDFLAGS  =
+endif
+
+if GP_HAVE_PEDANTIC_FLAGS_CXX98
+if HAVE_CXX
+TESTS                       += test-pedantic-cxx98
+check_PROGRAMS              += test-pedantic-cxx98
+else
+EXTRA_PROGRAMS              += test-pedantic-cxx98
+endif
+test_pedantic_cxx98_SOURCES  = test-pedantic-compilation.cxx
+test_pedantic_cxx98_CPPFLAGS = $(generic_pedantic_cppflags)
+test_pedantic_cxx98_CXXFLAGS = $(GP_PEDANTIC_CXXFLAGS_CXX98)
+test_pedantic_cxx98_LDADD    =
+test_pedantic_cxx98_LDFLAGS  =
+endif
+
+if GP_HAVE_PEDANTIC_FLAGS_CXX11
+if HAVE_CXX
+TESTS                       += test-pedantic-cxx11
+check_PROGRAMS              += test-pedantic-cxx11
+else
+EXTRA_PROGRAMS              += test-pedantic-cxx11
+endif
+test_pedantic_cxx11_SOURCES  = test-pedantic-compilation.cxx
+test_pedantic_cxx11_CPPFLAGS = $(generic_pedantic_cppflags)
+test_pedantic_cxx11_CXXFLAGS = $(GP_PEDANTIC_CXXFLAGS_CXX11)
+test_pedantic_cxx11_LDADD    =
+test_pedantic_cxx11_LDFLAGS  =
+endif
+
+if GP_HAVE_PEDANTIC_FLAGS_CXX14
+if HAVE_CXX
+TESTS                       += test-pedantic-cxx14
+check_PROGRAMS              += test-pedantic-cxx14
+else
+EXTRA_PROGRAMS              += test-pedantic-cxx14
+endif
+test_pedantic_cxx14_SOURCES  = test-pedantic-compilation.cxx
+test_pedantic_cxx14_CPPFLAGS = $(generic_pedantic_cppflags)
+test_pedantic_cxx14_CXXFLAGS = $(GP_PEDANTIC_CXXFLAGS_CXX14)
+test_pedantic_cxx14_LDADD    =
+test_pedantic_cxx14_LDFLAGS  =
+endif
+
+if GP_HAVE_PEDANTIC_FLAGS_CXX17
+if HAVE_CXX
+TESTS                       += test-pedantic-cxx17
+check_PROGRAMS              += test-pedantic-cxx17
+else
+EXTRA_PROGRAMS              += test-pedantic-cxx17
+endif
+test_pedantic_cxx17_SOURCES  = test-pedantic-compilation.cxx
+test_pedantic_cxx17_CPPFLAGS = $(generic_pedantic_cppflags)
+test_pedantic_cxx17_CXXFLAGS = $(GP_PEDANTIC_CXXFLAGS_CXX17)
+test_pedantic_cxx17_LDADD    =
+test_pedantic_cxx17_LDFLAGS  =
+endif
+
+
 ########################################################################
 # Implement the checks for the installed library
 ########################################################################
diff --git a/tests/test-pedantic-compilation.c b/tests/test-pedantic-compilation.c
index 269ea080d..bb88d1a82 100644
--- a/tests/test-pedantic-compilation.c
+++ b/tests/test-pedantic-compilation.c
@@ -17,10 +17,16 @@
 
 #include <stdio.h>
 
+#ifdef __STDC_VERSION__
 unsigned long stdc_version = __STDC_VERSION__;
+#endif
 
 int main()
 {
+#ifdef __STDC_VERSION__
   printf("stdc_version = %lu\n", stdc_version);
+#else
+  printf("stdc_version = undefined\n");
+#endif
   return 0;
 }
diff --git a/tests/test-pedantic-compilation.cxx b/tests/test-pedantic-compilation.cxx
index 70bac2f2b..5dbe12083 100644
--- a/tests/test-pedantic-compilation.cxx
+++ b/tests/test-pedantic-compilation.cxx
@@ -15,12 +15,12 @@
 #include <gphoto2/gphoto2-port-result.h>
 #include <gphoto2/gphoto2-port-version.h>
 
-#include <stdio.h>
+#include <iostream>
 
 unsigned long cxx_version = __cplusplus;
 
 int main()
 {
-  printf("cxx_version = %lu\n", cxx_version);
+  std::cout << "cxx_version = " << cxx_version << std::endl;
   return 0;
 }