config: remove deprecated xft-config script and man page

This was put in place early 2000 when pkg-config was not used.

Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

6 files changed, 4 insertions, 231 deletions

diff --git a/.gitignore b/.gitignore
index cc3c213..4678108 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,9 +71,8 @@ core
 *.tar.bz2
 *.tar.gz
 #
-#		Add & Override patterns for libXft 
+#		Add & Override patterns for libXft
 #
 #		Edit the following section as needed
 # For example, !report.pc overrides *.pc. See 'man gitignore'
-# 
-xft-config
+#
diff --git a/Makefile.am b/Makefile.am
index df2ee70..aeacfe6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,13 +21,9 @@
 
 SUBDIRS = man src
 
-bin_SCRIPTS = xft-config
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xft.pc
 
-CLEANFILES = xft-config
-
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 
 .PHONY: ChangeLog INSTALL
diff --git a/configure.ac b/configure.ac
index cc3332a..e6fd99a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -149,8 +149,6 @@ fi
 
 AC_OUTPUT([Makefile
 	   xft.pc
-	   xft-config
 	   src/Makefile
 	   man/Makefile
-	   man/xft-config.1
 	   man/Xft.3])
diff --git a/man/Makefile.am b/man/Makefile.am
index 990e9b3..766a627 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,2 +1,2 @@
-dist_man_MANS = Xft.3 xft-config.1
-EXTRA_DIST = xft-config.1.in Xft.3.in 
+dist_man_MANS = Xft.3
+EXTRA_DIST = Xft.3.in
diff --git a/man/xft-config.1.in b/man/xft-config.1.in
deleted file mode 100644
index 904c243..0000000
--- a/man/xft-config.1.in
+++ /dev/null
@@ -1,120 +0,0 @@
-.\" Copyright 2005 Branden Robinson
-.\"
-.\" Permission is hereby granted, free of charge, to any person obtaining a copy
-.\" of this document (the "Document"), to deal in the Document without
-.\" restriction, including without limitation the rights to use, copy, modify,
-.\" merge, publish, distribute, sublicense, and/or sell copies of the Document,
-.\" and to permit persons to whom the Document is furnished to do so, subject to
-.\" the following conditions:
-.\"
-.\" The above copyright notice and this permission notice shall be included in
-.\" all copies or substantial portions of the Document.
-.\"
-.\" THE DOCUMENT IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-.\" THE AUTHOR(S) OR COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
-.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE DOCUMENT OR THE USE OR OTHER
-.\" DEALINGS IN THE DOCUMENT.
-.TH xft-config 1 "Version @VERSION@" "Xft"
-.SH NAME
-xft\-config \- report Xft version, compiler, linker, and/or installation \
-directory information
-.SH SYNOPSIS
-.B xft\-config
-{
-.BR \-\-exec\-prefix [ =\fIlocal_prefix\fR ]
-|
-.BR \-\-prefix [ =\fIlocal_prefix\fR ]
-|
-.B \-\-cflags
-|
-.B \-\-libs
-} ...
-.PP
-.B xft\-config \-\-version
-.SH DESCRIPTION
-.B xft\-config
-reports information of interest to users and developers about the installed
-version of the X FreeType library,
-.BR Xft (3).
-Depending on how it is invoked,
-.B xft\-config
-reports the installed version of Xft, the compiler and linker flags
-that are required to successfully compile and link C (or C-compatible) code
-that uses the library, and/or the directories used by the GNU Autotools to
-install its files.
-Note that if the system's installed version of Xft came from an OS vendor
-or other third party, the actual location of its files may differ from
-those reported by
-.BR xft\-config .
-The system adminstrator can also relocate Xft's files.
-.PP
-If invoked without any arguments,
-.B xft\-config
-will print a usage message on standard error and exit.
-.SH OPTIONS
-.TP
-.B \-\-cflags
-Report the compiler flags that are required to compile code that uses Xft
-symbols.
-.TP
-.BR \-\-exec\-prefix [ =\fIlocal_prefix\fR ]
-If specified without the parameter
-.IR local_prefix ,
-report the file specification prefix that Xft uses for installation of
-executable files.
-If
-.I local_prefix
-is specified, it is used instead of the file specification prefix used for
-installation of executable files by Xft and the value of the option
-argument specified with
-.BR \-\-prefix ,
-if any, when compile and linker flags are reported (with
-.B \-\-cflags
-and
-.BR \-\-libs ,
-respectively).
-.TP
-.B \-\-libs
-Report the linker flags that are required to link code that uses Xft
-symbols.
-.TP
-.BR \-\-prefix [ =\fIlocal_prefix\fR ]
-If specified without the parameter
-.IR local_prefix ,
-report the file specification prefix that Xft uses for installation of
-files.
-If
-.I local_prefix
-is specified, it is used instead of the file specification prefix used for
-installation of files by Xft when compile and linker flags are reported
-(with
-.B \-\-cflags
-and
-.BR \-\-libs ,
-respectively); also see
-.BR \-\-exec\-prefix .
-.TP
-.B \-\-version
-Report the version of the Xft library installed on the system and exit.
-.SH OPERANDS
-.B xft\-config
-does not recognize any non-option arguments.
-At least one option must be specified.
-.SH "EXIT STATUS"
-.TP
-0
-Information was successfully reported.
-.TP
-1
-.B xft\-config
-was invoked with invalid arguments, or no arguments at all.
-.SH AUTHOR
-.B xft\-config
-was written by Keith Packard.
-This manual page was written by Branden Robinson.
-.SH "SEE ALSO"
-.BR Xft (3)
-.\" vim:set et tw=80
diff --git a/xft-config.in b/xft-config.in
deleted file mode 100644
index 549b73a..0000000
--- a/xft-config.in
+++ /dev/null
@@ -1,100 +0,0 @@
-#! /bin/sh
-
-prefix="@prefix@"
-exec_prefix="@exec_prefix@"
-libdir="@libdir@"
-includedir="@includedir@"
-version="@VERSION@"
-freetypelibs="@FREETYPE_LIBS@"
-freetypecflags="@FREETYPE_CFLAGS@"
-fontconfiglibs="@FONTCONFIG_LIBS@"
-fontconfigcflags="@FONTCONFIG_CFLAGS@"
-xrenderlibs="@XRENDER_LIBS@"
-xrendercflags="@XRENDER_CFLAGS@"
-
-usage()
-{
-  cat <<EOF
-Usage: xft-config [OPTIONS] [LIBRARIES]
-Options:
- [--prefix[=DIR]]
- [--exec-prefix[=DIR]]
- [--version]
- [--libs]
- [--cflags]
-EOF
-  exit $1
-}
-
-if test $# -eq 0 ; then
-  usage 1 1>&2
-fi
-
-while test $# -gt 0 ; do
-  case "$1" in
-  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  case $1 in
-  --prefix=*)
-    prefix=$optarg
-    local_prefix=yes
-    ;;
-  --prefix)
-    echo_prefix=yes
-    ;;
-  --exec-prefix=*)
-    exec_prefix=$optarg
-    exec_prefix_set=yes
-    local_prefix=yes
-    ;;
-  --exec-prefix)
-    echo_exec_prefix=yes
-    ;;
-  --version)
-    echo $version
-    exit 0
-    ;;
-  --cflags)
-    echo_cflags=yes
-    ;;
-  --libs)
-    echo_libs=yes
-    ;;
-  *)
-    usage 1 1>&2
-    ;;
-  esac
-  shift
-done
-
-if test "$local_prefix" = "yes" ; then
-    if test "$exec_prefix_set" != "yes" ; then
-      exec_prefix=$prefix
-    fi
-fi
-
-if test "$echo_prefix" = "yes" ; then
- echo $prefix
-fi
-
-if test "$echo_exec_prefix" = "yes" ; then
- echo $exec_prefix
-fi
-
-if test "$echo_cflags" = "yes" ; then
- cflags="-I${includedir} ${freetypecflags} ${fontconfigcflags} ${xrendercflags}"
- echo $cflags
-fi
-
-if test "$echo_libs" = "yes" ; then
- libs="-lXft -lX11 ${freetypelibs} ${fontconfiglibs} ${xrenderlibs}"
- if test "${libdir}" != "/usr/lib" ; then
-  echo -L${libdir} $libs
- else
-  echo $libs
- fi
-fi
-
-# EOF