57 lines
1.8 KiB
Diff
57 lines
1.8 KiB
Diff
From f481b848646c99d935b4dc300c87e5c3f049b9c3 Mon Sep 17 00:00:00 2001
|
|
From: Zdenek Dohnal <zdohnal@redhat.com>
|
|
Date: Thu, 2 Feb 2023 15:55:16 +0100
|
|
Subject: [PATCH] configure.ac: cups-browsed doesn't need C++
|
|
|
|
---
|
|
INSTALL | 7 +++----
|
|
configure.ac | 5 +----
|
|
2 files changed, 4 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/INSTALL b/INSTALL
|
|
index 7a2cf563..192ee5b1 100644
|
|
--- a/INSTALL
|
|
+++ b/INSTALL
|
|
@@ -8,10 +8,9 @@ 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 cf2ca1fa..c33ac7e3 100644
|
|
--- 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
|
|
AC_PROG_MAKE_SET
|
|
--
|
|
2.39.1
|
|
|