gdlib-config: punt!

We've been shipping the pkg-config file for a while now and
want people to use that only, so drop this old script.

This also drop the FEATURES variable as it was only available
via `gdlib-config --features` (and no one has complained).

.gitignore

@@ -66,7 +66,6 @@ Testing
 /install_manifest.txt
 
 # Common GD artifacts.
-/config/gdlib-config
 /config/gdlib.pc
 /src/config.h
 /src/annotate

config/Makefile.am

@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
-EXTRA_DIST = gdlib-config.in gdlib.pc.in getver.pl
-
-bin_SCRIPTS = gdlib-config
+EXTRA_DIST = gdlib.pc.in getver.pl
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gdlib.pc

config/gdlib-config.in

@@ -1,99 +0,0 @@
-#!/bin/sh
-#
-# Return information about the local GD library installation
-#
-# Modeled after pdflib-config
-
-echo "gdlib-config: warning: this script is deprecated;" \
-     "please use the pkg-config file instead." >&2
-
-# installation directories
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-bindir=@bindir@
-
-usage()
-{
-	cat <<EOF
-Print information on GD library's version, configuration, and use.
-Usage: gdlib-config [options]
-Options:
-	--libdir          # directory where GD library is installed
-	--includedir      # directory where GD library headers are installed
-	--version         # complete GD library version string
-	--majorversion    # GD library major version number
-	--minorversion    # GD library minor version number
-	--revision        # GD library revision version number
-	--ldflags         # options required for linking against GD library
-	--libs            # libs required for linking against GD library
-	--cflags          # options required for compiling GD library apps
-	--includes        # same as --cflags
-	--features        # lists features compiled into gd, separated by spaces.
-                          # Currently (as of @VERSION@) the optional features
-                          # are GD_PNG, GD_JPEG, GD_XPM, GD_FREETYPE, and 
-                          # GD_FONTCONFIG. When these features are reported by
-                          # --features, it is safe to include calls to the
-                          # related functions in your code.
-	--all             # print a summary of all GD library configure options
-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
-    --libdir)
-	echo $libdir
-	;;
-    --includedir)
-	echo $includedir
-	;;
-    --version)
-	echo @VERSION@
-	;;
-    --majorversion)
-	echo @GDLIB_MAJOR@
-	;;
-    --minorversion)
-	echo @GDLIB_MINOR@
-	;;
-    --revision)
-	echo @GDLIB_REVISION@
-	;;
-    --ldflags)
-	echo @LDFLAGS@
-	;;
-    --libs)
-	echo -lgd @LIBS@ @LIBICONV@
-	;;
-    --cflags|--includes)
-	echo -I@includedir@
-	;;
-    --features)
-	echo @FEATURES@
-	;;
-    --all)
-	echo "GD library  @VERSION@"
-	echo "includedir: $includedir"
-	echo "cflags:     -I@includedir@"
-	echo "ldflags:    @LDFLAGS@"
-	echo "libs:       @LIBS@ @LIBICONV@"
-	echo "libdir:     $libdir"
-	echo "features:   @FEATURES@"
-	;;
-    *)
-	usage 1 1>&2
-	;;
-    esac
-    shift
-done

configure.ac

@@ -52,12 +52,6 @@ AC_SUBST(GDLIB_LT_CURRENT)
 AC_SUBST(GDLIB_LT_REVISION)
 AC_SUBST(GDLIB_LT_AGE)
 
-#Expanded by tests later in this file. TBB 2.0.26
-#2.0.28: GIF is standard now. Doesn't depend on anything else,
-#so we always build it.
-FEATURES="GD_GIF GD_GIFANIM GD_OPENPOLYGON"
-AC_SUBST(FEATURES)
-
 AM_INIT_AUTOMAKE([1.11 foreign dist-xz -Wall -Werror subdir-objects])
 AC_CONFIG_HEADERS([src/config.h:src/config.hin])
 
@@ -173,7 +167,6 @@ m4_define([GD_LIB_CHECK], [dnl
 
     if test "$gd_found_lib" = "yes"; then
       AC_DEFINE([HAVE_$1], [1], [Define if you have $3])
-      AS_VAR_APPEND([FEATURES], [" GD_$2"])
       dnl Merge the flags into the main LIBS/CPPFLAGS.
       $1][_LIBS="$gd_lib_ldflags $][$1][_LIBS"
       $1][_CFLAGS="$gd_lib_cflags $][$1][_CFLAGS"
@@ -334,7 +327,6 @@ AC_CONFIG_FILES([Makefile
                 src/Makefile
                 tests/Makefile
                 config/Makefile
-                config/gdlib-config
                 config/gdlib.pc])
 
 AC_OUTPUT