Source: foobillardplus
Version: 3.43~svn170+dfsg-5
Tags: patch upstream
User: [email protected]
Usertags: rebootstrap
The patch that fixed #892338 in 3.43~svn170+dfsg-5 regressed cross
building, because it improperly uses pkg-config and thus uses the wrong
one. The attached patch defers discovery of pkg-config to autotools and
thus makes foobillardplus cross build successfully again. Please
consider applying it.
Helmut
--- foobillardplus-3.43~svn170+dfsg.orig/configure.in
+++ foobillardplus-3.43~svn170+dfsg/configure.in
@@ -55,6 +55,10 @@
dnl Checks for library functions.
AC_CHECK_FUNCS(socket poll)
+PKG_CHECK_MODULES([FREETYPE],[freetype2],[],[AC_MSG_ERROR([freetype2 not found])])
+AC_SUBST([FREETYPE_CFLAGS])
+AC_SUBST([FREETYPE_LIBS])
+
### Enable Debian/Linux default locations for compiling
AC_ARG_ENABLE([debian],
[AS_HELP_STRING([--enable-debian],[automatic guess for Debian/Linux Filesystem [no]])],
--- foobillardplus-3.43~svn170+dfsg.orig/src/Makefile.am
+++ foobillardplus-3.43~svn170+dfsg/src/Makefile.am
@@ -158,9 +158,6 @@
SDL_CFLAGS = `sdl-config --cflags`
SDL_LIBS = `sdl-config --libs`
-FREETYPE_CFLAGS = `pkg-config --cflags freetype2`
-FREETYPE_LIBS = `pkg-config --libs freetype2`
-
if USE_MATHSINGLE
MATH_CFLAGS = -DVMATH_SINGLE_PRECISION
else
