Skip to content

Commit

Permalink
use pkg-config instead freetype-config
Browse files Browse the repository at this point in the history
freetype-config has been removed from freetype earlier this year

compiling iwth gcc 4.3 works, and fails with >=4.5 and clang

At least on Archlinux one must provide the option --with-freetype-prefix=/usr/lib

As this is an old version of wesnoth, options such as --with-preferences-dir,
--program-suffix, --with-datadir-name and --docdir are useful to avoid collisions
with other wesnoth versions. For more, see ./configure --help.
  • Loading branch information
sevu committed Dec 24, 2018
1 parent 9b13e16 commit 9eba5ce
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions configure.ac
Expand Up @@ -642,8 +642,8 @@ if test "$FREETYPE_CONFIG" = "no" ; then
*** Unable to find FreeType2 library (http://www.freetype.org/)
])
else
CPPFLAGS="$CPPFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`"
FREETYPE_LIBS=`$FREETYPE_CONFIG $freetypeconf_args --libs`
CPPFLAGS="$CPPFLAGS `pkg-config --cflags freetype2`"
FREETYPE_LIBS="`pkg-config --libs freetype2`"
fi

AC_SUBST([FREETYPE_LIBS])
Expand Down

0 comments on commit 9eba5ce

Please sign in to comment.