[Mplayer-cvslog] CVS: main configure,1.824,1.825

[Diego Biurrun CVS]

Update of /cvsroot/mplayer/main
In directory mail:/tmp/cvs-serv5344

Modified Files:
	configure 
Log Message:
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 at vzavenue.net>


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.824
retrieving revision 1.825
diff -u -r1.824 -r1.825
--- configure	27 Dec 2003 19:27:59 -0000	1.824
+++ configure	31 Dec 2003 21:35:52 -0000	1.825
@@ -4277,7 +4277,7 @@
 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 @@
 }
 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