mirror of
https://github.com/mpv-player/mpv
synced 2025-01-12 09:59:44 +00:00
MPlayer's configure fails to detect fontconfig on a system with
POSIXLY_CORRECT set in the environment. The reason it fails is that it passes the arguments to pkg-config in the wrong order. (When POSIXLY_CORRECT is not set, glibc takes the liberty of rearranging the parameters.) patch by Matthew Fischer <futhark@vzavenue.net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11706 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
d0ec40d5b3
commit
93a6074b1a
8
configure
vendored
8
configure
vendored
@ -4277,7 +4277,7 @@ if test "$_freetype" = no ; then
|
||||
fi
|
||||
echocheck "fontconfig"
|
||||
if test "$_fontconfig" = auto ; then
|
||||
if ( pkg-config fontconfig --modversion) > /dev/null 2>&1 ; then
|
||||
if ( pkg-config --modversion fontconfig) > /dev/null 2>&1 ; then
|
||||
cat > $TMPC << EOF
|
||||
#include <stdio.h>
|
||||
#include <fontconfig/fontconfig.h>
|
||||
@ -4293,15 +4293,15 @@ int main()
|
||||
}
|
||||
EOF
|
||||
_fontconfig=no
|
||||
cc_check `pkg-config fontconfig --cflags --libs` && ( $TMPO >> "$TMPLOG" ) && _fontconfig=yes
|
||||
cc_check `pkg-config --cflags --libs fontconfig` && ( $TMPO >> "$TMPLOG" ) && _fontconfig=yes
|
||||
else
|
||||
_fontconfig=no
|
||||
fi
|
||||
fi
|
||||
if test "$_fontconfig" = yes ; then
|
||||
_def_fontconfig='#define HAVE_FONTCONFIG'
|
||||
_inc_fontconfig=`pkg-config fontconfig --cflags`
|
||||
_ld_fontconfig=`pkg-config fontconfig --libs`
|
||||
_inc_fontconfig=`pkg-config --cflags fontconfig`
|
||||
_ld_fontconfig=`pkg-config --libs fontconfig`
|
||||
else
|
||||
_def_fontconfig='#undef HAVE_FONTCONFIG'
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user