configure.ac: C++ not needed (#504)

diff --git a/INSTALL b/INSTALL
index 099c0292fdbda5b8d1c11df10d9bcd24295268f3..fcabb24e05f735d8070a424e0501608058461408 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -16,10 +16,9 @@ found in "CHANGES.md".
 
 BEFORE YOU BEGIN
 
-    You'll need ANSI-compliant C and C++ compilers, plus a make program and
-    POSIX-compliant shell (/bin/sh).  The GNU compiler tools and Bash work well
-    and we have tested the current CUPS code against several versions of GCC
-    with excellent results.
+    You'll need ANSI-compliant C, plus a make program and POSIX-compliant shell
+    (/bin/sh).  The GNU compiler tools and Bash work well and we have tested
+    the current CUPS code against several versions of GCC with excellent results.
 
     The Makefiles used by the project should work with most versions of make.
     We've tested them with GNU make as well as the make programs shipped by

diff --git a/configure.ac b/configure.ac
index 8138081846dc4f41911f6b2d2540df62cec50928..cf898bace3b73bf86f7ea60894317cd60f6e19f5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ m4_include([m4/ax_compare_version.m4])
 m4_include([m4/basic-directories.m4])
 AM_INIT_AUTOMAKE([1.11 gnu dist-xz dist-bzip2 subdir-objects foreign])
 AM_SILENT_RULES([yes])
-AC_LANG([C++])
+AC_LANG([C])
 AC_CONFIG_HEADERS([config.h])
 # Extra defines for the config.h
 AH_BOTTOM([
@@ -50,11 +50,8 @@ AH_BOTTOM([
 # Find required base packages
 # ===========================
 AC_PROG_CC
-AC_PROG_CXX
-AX_CXX_COMPILE_STDCXX([11],[noext],[mandatory])
 AM_PROG_CC_C_O
 AM_ICONV
-AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AS_LN_SRF_PREPARE