Skip to content

V
vlc-1.1
Commit 51d61548 authored by Christophe Massiot's avatar Christophe Massiot
Browse files
Options

Fixed configure script (alcohol isn't the solution).

parent b5d99c64
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
configure.ac.in
View file @ 51d61548
...@@ -1998,15 +1998,15 @@ then ...@@ -1998,15 +1998,15 @@ then
then then
FREETYPE_PATH="${with_freetype_config_path}:${PATH}" FREETYPE_PATH="${with_freetype_config_path}:${PATH}"
fi ]) fi ])
AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no, ${SDL_PATH}) AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no, ${FREETYPE_PATH})
if test "x${SDL_CONFIG}" != "xno" if test "x${FREETYPE_CONFIG}" != "xno"
then then
PLUGINS="${PLUGINS} osdtext" PLUGINS="${PLUGINS} osdtext"
CFLAGS_osdtext="${CFLAGS_osdtext} `${FREETYPE_CONFIG} --cflags`" CFLAGS_osdtext="${CFLAGS_osdtext} `${FREETYPE_CONFIG} --cflags`"
LDFLAGS_osdtext="${LDFLAGS_osdtext} `${FREETYPE_CONFIG} --libs`" LDFLAGS_osdtext="${LDFLAGS_osdtext} `${FREETYPE_CONFIG} --libs`"
CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_freetype}" CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_freetype}"
elif test "x${enable_sdl}" = "xyes" elif test "x${enable_freetype}" = "xyes"
then then
AC_MSG_ERROR([I couldn't find the freetype package. You can download libfreetype2 AC_MSG_ERROR([I couldn't find the freetype package. You can download libfreetype2
from http://www.freetype.org/, or configure with --disable-freetype. Have a nice day. from http://www.freetype.org/, or configure with --disable-freetype. Have a nice day.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment