diff --git a/.gitignore b/.gitignore index 2aaf679a0..890c1fcf6 100644 --- a/.gitignore +++ b/.gitignore @@ -66,7 +66,6 @@ Testing /install_manifest.txt # Common GD artifacts. -/config/gdlib-config /config/gdlib.pc /src/config.h /src/annotate diff --git a/config/Makefile.am b/config/Makefile.am index 5c2db7069..ced3c37db 100644 --- a/config/Makefile.am +++ b/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 diff --git a/config/gdlib-config.in b/config/gdlib-config.in deleted file mode 100644 index 6e4e49447..000000000 --- a/config/gdlib-config.in +++ /dev/null @@ -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 <&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 diff --git a/configure.ac b/configure.ac index abfb59aa6..f7a943fb1 100644 --- a/configure.ac +++ b/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