Skip to content

Commit

Permalink
build: remove nonsensical check for freetype
Browse files Browse the repository at this point in the history
The examples need Gtk+, nothing uses freetype directly.
  • Loading branch information
tp-m committed Jan 25, 2016
1 parent 1e4f674 commit 183610c
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 161 deletions.
9 changes: 0 additions & 9 deletions configure.ac
Expand Up @@ -737,15 +737,6 @@ AM_CONDITIONAL(USE_VORBIS, false)

fi dnl of EXT plugins

dnl seeking needs freetype, so check for it here
PKG_CHECK_MODULES(FT2, freetype2 >= 2.0.9, HAVE_FT2="yes", [
AC_CHECK_FT2(2.0.9, HAVE_FT2="yes", HAVE_FT2="no")
])
dnl make the HAVE_FT2 variable available to automake and Makefile.am
AM_CONDITIONAL(HAVE_FT2, test "x$HAVE_FT2" = "xyes")
AC_SUBST(FT2_CFLAGS)
AC_SUBST(FT2_LIBS)

dnl *** gio-unix-2.0 for tests/check/pipelines/tcp.c ***
PKG_CHECK_MODULES(GIO_UNIX_2_0, gio-unix-2.0 >= 2.24,
HAVE_GIO_UNIX_2_0="yes",
Expand Down
1 change: 0 additions & 1 deletion m4/Makefile.am
@@ -1,7 +1,6 @@
EXTRA_DIST = \
check-libheader.m4 \
codeset.m4 \
freetype2.m4 \
gettext.m4 \
glibc21.m4 \
gst-alsa.m4 \
Expand Down
143 changes: 0 additions & 143 deletions m4/freetype2.m4

This file was deleted.

10 changes: 2 additions & 8 deletions tests/examples/Makefile.am
@@ -1,14 +1,8 @@
if HAVE_FT2
FT2_SUBDIRS = seek snapshot
else
FT2_SUBDIRS =
endif

if HAVE_GTK
GTK_SUBDIRS = playback
GTK_SUBDIRS = playback seek snapshot
endif

SUBDIRS = app audio dynamic fft $(FT2_SUBDIRS) $(GTK_SUBDIRS) gio overlay playrec encoding
SUBDIRS = app audio dynamic fft $(GTK_SUBDIRS) gio overlay playrec encoding
DIST_SUBDIRS = app audio dynamic fft gio playback overlay seek snapshot playrec encoding

include $(top_srcdir)/common/parallel-subdirs.mak
Expand Down

0 comments on commit 183610c

Please sign in to comment.