0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove freetype configuration stuff, as we no longer build our own ttf library.

Browse source
This commit is contained in:
Eric S. Raymond 2008-03-27 20:59:02 +00:00
parent dd2224dfb0
commit 595ecf4ed9
2 changed files with 1 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
configure.ac
View file

@ -733,46 +733,6 @@ AC_SUBST([SDL_MIXER_LIBS])
AC_SUBST([SDL_NET_LIBS])
AC_SUBST([SDL_TTF_LIBS])
# Checking for the freetype library. This was copied from the
# config script of SDL_ttf, modified for CPPFLAGS
dnl Get the cflags and libraries from the freetype-config script
AC_ARG_WITH([freetype-prefix],
AS_HELP_STRING([--with-freetype-prefix=PFX], [Prefix where FREETYPE is installed (optional)]),
[freetype_prefix="$withval"],
[freetype_prefix=""])
AC_ARG_WITH([freetype-exec-prefix],
AS_HELP_STRING([--with-freetype-exec-prefix=PFX], [Exec prefix where FREETYPE is installed (optional)]),
[freetype_exec_prefix="$withval"],
[freetype_exec_prefix=""])
if test x$freetype_exec_prefix != x ; then
freetype_args="$freetype_args --exec-prefix=$freetype_exec_prefix"
if test x${FREETYPE_CONFIG+set} != xset ; then
FREETYPE_CONFIG=$freetype_exec_prefix/bin/freetype-config
fi
fi
if test x$freetype_prefix != x ; then
freetype_args="$freetype_args --prefix=$freetype_prefix"
if test x${FREETYPE_CONFIG+set} != xset ; then
FREETYPE_CONFIG=$freetype_prefix/bin/freetype-config
fi
fi
AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
no_freetype=""
if test "$FREETYPE_CONFIG" = "no" ; then
AC_MSG_ERROR([
*** Unable to find FreeType2 library (http://www.freetype.org/)
])
else
CPPFLAGS="$CPPFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`"
FREETYPE_LIBS=`$FREETYPE_CONFIG $freetypeconf_args --libs`
fi
AC_SUBST([FREETYPE_LIBS])
#######################################################################
# Checks for header files. #
#######################################################################

2
src/Makefile.am
View file

@ -36,7 +36,7 @@ noinst_LIBRARIES = libwesnoth-core.a libwesnoth.a
pkgdatadir=$(datadir)/@DATADIR@
THELIBS = -L. -lwesnoth-core $(SDL_IMAGE_LIBS) $(SDL_MIXER_LIBS) $(SDL_NET_LIBS) \
$(SDL_TTF_LIBS) $(SDL_LIBS) $(PYTHON_LIBS) $(FREETYPE_LIBS) $(LIBINTL) \
$(SDL_TTF_LIBS) $(SDL_LIBS) $(PYTHON_LIBS) $(LIBINTL) \
$(BOOST_IOSTREAMS_LIBS) $(BOOST_REGEX_LIBS)
wesnoth_source = \