Skip to content

Commit

Permalink
gdlib-config: punt!
Browse files Browse the repository at this point in the history
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).
  • Loading branch information
vapier committed Oct 6, 2016
1 parent 4ebdb48 commit d62f608
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 111 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ Testing
/install_manifest.txt

# Common GD artifacts.
/config/gdlib-config
/config/gdlib.pc
/src/config.h
/src/annotate
Expand Down
4 changes: 1 addition & 3 deletions config/Makefile.am
Original file line number Diff line number Diff line change
@@ -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
99 changes: 0 additions & 99 deletions config/gdlib-config.in

This file was deleted.

8 changes: 0 additions & 8 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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])

Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -334,7 +327,6 @@ AC_CONFIG_FILES([Makefile
src/Makefile
tests/Makefile
config/Makefile
config/gdlib-config
config/gdlib.pc])

AC_OUTPUT

0 comments on commit d62f608

Please sign in to comment.