summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-12-31 21:35:52 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-12-31 21:35:52 +0000
commit93a6074b1a094479460c9fdcdf5d72c23fc8df45 (patch)
tree090319be17668f3adbe1732e9b93bdeef9638467 /configure
parentd0ec40d5b3a7aef7351d058cde25f78c39ab8ec2 (diff)
downloadmpv-93a6074b1a094479460c9fdcdf5d72c23fc8df45.tar.bz2
mpv-93a6074b1a094479460c9fdcdf5d72c23fc8df45.tar.xz
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
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure8
1 files changed, 4 insertions, 4 deletions
diff --git a/configure b/configure
index 3077f26767..9a7e2dbcee 100755
--- a/configure
+++ b/configure
@@ -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