]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
Drop cups-config script.
authorMichael R Sweet <msweet@msweet.org>
Thu, 27 Feb 2025 15:50:10 +0000 (10:50 -0500)
committerMichael R Sweet <msweet@msweet.org>
Thu, 27 Feb 2025 15:50:10 +0000 (10:50 -0500)
CHANGES.md
Makefile
configure
configure.ac
cups-config.in [deleted file]
doc/Makefile
doc/help/man-cups-config.html [deleted file]
man/Makefile
man/cups-config.1 [deleted file]

index 314557053afe74490d863f3244d0285d0483768f..8d06497031d4f4d71ed6e196c5c6c377fbfde943 100644 (file)
@@ -67,6 +67,7 @@ Changes in CUPS v2.5b1 (YYYY-MM-DD)
 - Updated the `ipptool` utility to support the `--bearer-token` and
   `--client-name` options.
 - Deprecated the "page-border" Job Template attribute (Issue #1020)
+- Removed the `cups-config` utility (use `pkg-config` instead)
 - Fixed use-after-free in `cupsdAcceptClient()` when we log warning during error
   handling (fixes CVE-2023-34241)
 - Fixed hanging of `lpstat` on Solaris (Issue #156)
index ea9d6bd614ed692e6dce81ef8180c37193d7cab4..53cba9cef68d4f25cf849a9139c3c0193546ca13 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -171,9 +171,6 @@ install-data:
                echo Installing data files in $$dir... ;\
                (cd $$dir; $(MAKE) $(MFLAGS) install-data) || exit 1;\
        done
-       echo Installing cups-config script...
-       $(INSTALL_DIR) -m 755 $(BINDIR)
-       $(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
        echo Installing cups.pc file...
        $(INSTALL_DIR) -m 755 $(CUPS_PKGCONFPATH)
        $(INSTALL_DATA) cups.pc $(CUPS_PKGCONFPATH)/cups.pc
index 9469bf370f52ea389a7fcd353accba6d3957df04..a93b86a6edf34a6e21ca83a05b0459d7c8a602de 100755 (executable)
--- a/configure
+++ b/configure
@@ -11955,7 +11955,7 @@ fi
 
 
 
-ac_config_files="$ac_config_files Makedefs conf/cups-files.conf conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf cups.pc cups-config desktop/cups.desktop doc/index.html scheduler/cups-lpd.xinetd scheduler/cups.sh scheduler/cups.xml scheduler/org.cups.cups-lpd.plist scheduler/cups-lpdAT.service scheduler/cups.path scheduler/cups.service scheduler/cups.socket templates/header.tmpl packaging/cups.list $LANGFILES"
+ac_config_files="$ac_config_files Makedefs conf/cups-files.conf conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf cups.pc desktop/cups.desktop doc/index.html scheduler/cups-lpd.xinetd scheduler/cups.sh scheduler/cups.xml scheduler/org.cups.cups-lpd.plist scheduler/cups-lpdAT.service scheduler/cups.path scheduler/cups.service scheduler/cups.socket templates/header.tmpl packaging/cups.list $LANGFILES"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -12651,7 +12651,6 @@ do
     "conf/pam.std") CONFIG_FILES="$CONFIG_FILES conf/pam.std" ;;
     "conf/snmp.conf") CONFIG_FILES="$CONFIG_FILES conf/snmp.conf" ;;
     "cups.pc") CONFIG_FILES="$CONFIG_FILES cups.pc" ;;
-    "cups-config") CONFIG_FILES="$CONFIG_FILES cups-config" ;;
     "desktop/cups.desktop") CONFIG_FILES="$CONFIG_FILES desktop/cups.desktop" ;;
     "doc/index.html") CONFIG_FILES="$CONFIG_FILES doc/index.html" ;;
     "scheduler/cups-lpd.xinetd") CONFIG_FILES="$CONFIG_FILES scheduler/cups-lpd.xinetd" ;;
index fe2e252e4bc40cbc5cfdaff044639074106938e4..615049e7a390dad095d45d6696c75488551ae0d9 100644 (file)
@@ -79,7 +79,6 @@ AC_CONFIG_FILES([
     conf/pam.std
     conf/snmp.conf
     cups.pc
-    cups-config
     desktop/cups.desktop
     doc/index.html
     scheduler/cups-lpd.xinetd
diff --git a/cups-config.in b/cups-config.in
deleted file mode 100755 (executable)
index 5d850a6..0000000
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/bin/sh
-#
-# CUPS configuration utility.
-#
-# Copyright © 2020-2024 by OpenPrinting.
-# Copyright © 2007-2019 by Apple Inc.
-# Copyright © 2001-2006 by Easy Software Products, all rights reserved.
-#
-# Licensed under Apache License v2.0.  See the file "LICENSE" for more
-# information.
-#
-
-VERSION="@CUPS_VERSION@"
-APIVERSION="@CUPS_API_VERSION@"
-BUILD="@CUPS_BUILD@"
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-includedir=@includedir@
-libdir=@libdir@
-datarootdir=@datadir@
-datadir=@datadir@
-sysconfdir=@sysconfdir@
-cups_datadir=@CUPS_DATADIR@
-cups_serverbin=@CUPS_SERVERBIN@
-cups_serverroot=@CUPS_SERVERROOT@
-INSTALLSTATIC=@INSTALLSTATIC@
-
-# flags for compiler and linker...
-CFLAGS=""
-LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_TLSLIBS@ @LIBZ@ @LIBS@"
-
-# Check for local invocation...
-selfdir=`dirname $0`
-
-if test -f "$selfdir/cups/cups.h"; then
-    CFLAGS="-I$selfdir"
-    LDFLAGS="-L$selfdir/cups $LDFLAGS"
-    libdir="$selfdir/cups"
-else
-    if test $includedir != /usr/include; then
-       CFLAGS="$CFLAGS -I$includedir"
-    fi
-
-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
-       LDFLAGS="$LDFLAGS -L$libdir"
-    fi
-fi
-
-
-usage()
-{
-    echo "Usage: cups-config --api-version"
-    echo "       cups-config --build"
-    echo "       cups-config --cflags"
-    echo "       cups-config --datadir"
-    echo "       cups-config --help"
-    echo "       cups-config --ldflags"
-    echo "       cups-config [--image] [--static] --libs"
-    echo "       cups-config --serverbin"
-    echo "       cups-config --serverroot"
-    echo "       cups-config --version"
-    echo ""
-    echo "Note: The cups-config utility is deprecated and will be removed in a future"
-    echo "      version of CUPS.  Use the pkg-config utility instead."
-
-    exit $1
-}
-
-if test $# -eq 0; then
-    usage 1
-fi
-
-# Parse command line options
-static=no
-
-while test $# -gt 0; do
-    case $1 in
-       --api-version)
-           echo $APIVERSION
-           ;;
-       --build)
-           echo $BUILD
-           ;;
-       --cflags)
-           echo $CFLAGS
-           ;;
-       --datadir)
-           echo $cups_datadir
-           ;;
-       --help)
-           usage 0
-           ;;
-       --image)
-           # Do nothing
-           ;;
-       --ldflags)
-           echo $LDFLAGS
-           ;;
-       --libs)
-           if test $static = no; then
-               libs="@EXTLINKCUPS@";
-           else
-               libs="$libdir/libcups.a $LIBS";
-           fi
-           echo $libs
-           ;;
-       --serverbin)
-           echo $cups_serverbin
-           ;;
-       --serverroot)
-           echo $cups_serverroot
-           ;;
-       --static)
-           if test -z "$INSTALLSTATIC"; then
-               echo "WARNING: Static libraries not installed." >&2
-           else
-               static=yes
-           fi
-           ;;
-       --version)
-           echo $VERSION
-           ;;
-       *)
-           usage 1
-           ;;
-    esac
-
-    shift
-done
index 89ec7c729d491830a68fc8b9aa4d8a2a0f732f1f..fab908857f29dbdb178f97305a4821ed80561a32 100644 (file)
@@ -1,7 +1,7 @@
 #
 # Documentation makefile for CUPS.
 #
-# Copyright © 2020-2024 by OpenPrinting.
+# Copyright © 2020-2025 by OpenPrinting.
 # Copyright © 2007-2019 by Apple Inc.
 # Copyright © 1997-2007 by Easy Software Products.
 #
@@ -51,7 +51,6 @@ HELPFILES     =       \
                        help/man-classes.conf.html \
                        help/man-client.conf.html \
                        help/man-cups.html \
-                       help/man-cups-config.html \
                        help/man-cups-files.conf.html \
                        help/man-cups-lpd.html \
                        help/man-cups-snmp.html \
diff --git a/doc/help/man-cups-config.html b/doc/help/man-cups-config.html
deleted file mode 100644 (file)
index b84282e..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta name="creator" content="mantohtml v2.0.2">
-    <title>cups-config(1)</title>
-  </head>
-  <body>
-    <h1 id="cups-config-1">cups-config(1)</h1>
-    <h2 id="cups-config-1.name">Name</h2>
-<p>cups-config - get cups api, compiler, directory, and link information (deprecated).
-</p>
-    <h2 id="cups-config-1.synopsis">Synopsis</h2>
-<p><strong>cups-config</strong>
-<em>--api-version</em>
-<br>
-<strong>cups-config</strong>
-<em>--build</em>
-<br>
-<strong>cups-config</strong>
-<em>--cflags</em>
-<br>
-<strong>cups-config</strong>
-<em>--datadir</em>
-<br>
-<strong>cups-config</strong>
-<em>--help</em>
-<br>
-<strong>cups-config</strong>
-<em>--ldflags</em>
-<br>
-<strong>cups-config</strong>
-[
-<em>--image</em>
-] [
-<em>--static</em>
-]
-<em>--libs</em>
-<br>
-<strong>cups-config</strong>
-<em>--serverbin</em>
-<br>
-<strong>cups-config</strong>
-<em>--serverroot</em>
-<br>
-<strong>cups-config</strong>
-<em>--version</em>
-<br>
-</p>
-    <h2 id="cups-config-1.description">Description</h2>
-<p>The <strong>cups-config</strong> command allows application developers to determine the necessary command-line options for the compiler and linker, as well as the installation directories for filters, configuration files, and drivers.
-All values are reported to the standard output.
-<strong>Note:</strong>
-This command is deprecated and will be removed in a future version of CUPS.
-The
-<strong>pkg-config</strong>(1)
-
-command should be used instead.
-</p>
-    <h2 id="cups-config-1.options">Options</h2>
-<p>The <strong>cups-config</strong> command accepts the following command-line options:
-</p>
-    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>--api-version</strong><br>
-Reports the current API version (major.minor).
-</p>
-    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>--build</strong><br>
-Reports a system-specific build number.
-</p>
-    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>--cflags</strong><br>
-Reports the necessary compiler options.
-</p>
-    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>--datadir</strong><br>
-Reports the default CUPS data directory.
-</p>
-    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>--help</strong><br>
-Reports the program usage message.
-</p>
-    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>--ldflags</strong><br>
-Reports the necessary linker options.
-</p>
-    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>--libs</strong><br>
-Reports the necessary libraries to link to.
-</p>
-    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>--serverbin</strong><br>
-Reports the default CUPS binary directory, where filters and backends are stored.
-</p>
-    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>--serverroot</strong><br>
-Reports the default CUPS configuration file directory.
-</p>
-    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>--static</strong><br>
-When used with <em>--libs</em>, reports the static libraries instead of the default (shared) libraries.
-</p>
-    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>--version</strong><br>
-Reports the full version number of the CUPS installation (major.minor.patch).
-</p>
-    <h2 id="cups-config-1.examples">Examples</h2>
-<p>Show the currently installed version of CUPS:
-</p>
-    <pre>
-    cups-config --version
-
-</pre>
-<p>Compile a simple one-file CUPS filter:
-</p>
-    <pre>
-    cc `cups-config --cflags --ldflags` -o filter filter.c \
-        `cups-config --libs`
-</pre>
-    <h2 id="cups-config-1.deprecated-options">Deprecated Options</h2>
-<p>The following options are deprecated but continue to work for backwards compatibility:
-</p>
-    <p style="margin-left: 2.5em; text-indent: -2.5em;"><strong>--image</strong><br>
-Formerly used to add the CUPS imaging library to the list of libraries.
-</p>
-    <h2 id="cups-config-1.see-also">See Also</h2>
-<a href="cups.html"><p><strong>cups</strong>(1),</a>
-
-<strong>pkg-config</strong>(1),
-
-CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
-</p>
-    <h2 id="cups-config-1.copyright">Copyright</h2>
-<p>Copyright &copy; 2020-2024 by OpenPrinting.
-  </body>
-</html>
index c06c26322d0fe5a499d57668f3b36cde185946b0..83a0f6d5df4c9fbf502cb9fbd8fcc87927cbe742 100644 (file)
@@ -3,7 +3,7 @@
 #
 # The "html" target depends on "mantohtml" from https://www.msweet.org/mantohtml
 #
-# Copyright © 2020-2024 by OpenPrinting.
+# Copyright © 2020-2025 by OpenPrinting.
 # Copyright © 2007-2019 by Apple Inc.
 # Copyright © 1993-2006 by Easy Software Products.
 #
@@ -20,7 +20,6 @@ include ../Makedefs
 
 MAN1   =       cancel.1 \
                cups.1 \
-               cups-config.1 \
                cupstestppd.1 \
                ippeveprinter.1 \
                $(IPPFIND_MAN) \
diff --git a/man/cups-config.1 b/man/cups-config.1
deleted file mode 100644 (file)
index 018349c..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-.\"
-.\" cups-config man page for CUPS.
-.\"
-.\" Copyright © 2020-2024 by OpenPrinting.
-.\" Copyright © 2007-2019 by Apple Inc.
-.\" Copyright © 1997-2006 by Easy Software Products.
-.\"
-.\" Licensed under Apache License v2.0.  See the file "LICENSE" for more
-.\" information.
-.\"
-.TH cups-config 1 "CUPS" "2021-03-10" "OpenPrinting"
-.SH NAME
-cups\-config \- get cups api, compiler, directory, and link information (deprecated).
-.SH SYNOPSIS
-.B cups\-config
-.I \-\-api\-version
-.br
-.B cups\-config
-.I \-\-build
-.br
-.B cups\-config
-.I \-\-cflags
-.br
-.B cups\-config
-.I \-\-datadir
-.br
-.B cups\-config
-.I \-\-help
-.br
-.B cups\-config
-.I \-\-ldflags
-.br
-.B cups\-config
-[
-.I \-\-image
-] [
-.I \-\-static
-]
-.I \-\-libs
-.br
-.B cups\-config
-.I \-\-serverbin
-.br
-.B cups\-config
-.I \-\-serverroot
-.br
-.B cups-config
-.I \-\-version
-.br
-.SH DESCRIPTION
-The \fBcups-config\fR command allows application developers to determine the necessary command-line options for the compiler and linker, as well as the installation directories for filters, configuration files, and drivers.
-All values are reported to the standard output.
-.B Note:
-This command is deprecated and will be removed in a future version of CUPS.
-The
-.BR pkg-config (1)
-command should be used instead.
-.SH OPTIONS
-The \fBcups-config\fR command accepts the following command-line options:
-.TP 5
-.B \-\-api-version
-Reports the current API version (major.minor).
-.TP 5
-.B \-\-build
-Reports a system-specific build number.
-.TP 5
-.B \-\-cflags
-Reports the necessary compiler options.
-.TP 5
-.B \-\-datadir
-Reports the default CUPS data directory.
-.TP 5
-.B \-\-help
-Reports the program usage message.
-.TP 5
-.B \-\-ldflags
-Reports the necessary linker options.
-.TP 5
-.B \-\-libs
-Reports the necessary libraries to link to.
-.TP 5
-.B \-\-serverbin
-Reports the default CUPS binary directory, where filters and backends are stored.
-.TP 5
-.B \-\-serverroot
-Reports the default CUPS configuration file directory.
-.TP 5
-.B \-\-static
-When used with \fI\-\-libs\fR, reports the static libraries instead of the default (shared) libraries.
-.TP 5
-.B \-\-version
-Reports the full version number of the CUPS installation (major.minor.patch).
-.SH EXAMPLES
-Show the currently installed version of CUPS:
-.nf
-
-    cups-config \-\-version
-
-.fi
-Compile a simple one-file CUPS filter:
-.nf
-
-    cc `cups\-config \-\-cflags \-\-ldflags` \-o filter filter.c \\
-        `cups\-config \-\-libs`
-.fi
-.SH DEPRECATED OPTIONS
-The following options are deprecated but continue to work for backwards compatibility:
-.TP 5
-.B \-\-image
-Formerly used to add the CUPS imaging library to the list of libraries.
-.SH SEE ALSO
-.BR cups (1),
-.BR pkg-config (1),
-CUPS Online Help (http://localhost:631/help)
-.SH COPYRIGHT
-Copyright \[co] 2020-2024 by OpenPrinting.