changeset 37182:1c64016edce3

Cosmetic: Place pkg-config options first.
author ib
date Tue, 09 Sep 2014 10:52:21 +0000
parents 04373738d82b
children eaa58d991a06
files configure
diffstat 1 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Mon Sep 08 21:29:05 2014 +0000
+++ b/configure	Tue Sep 09 10:52:21 2014 +0000
@@ -7875,28 +7875,28 @@
     # Check for GTK2
     echocheck "GTK+ version"
 
-    if $_pkg_config gtk+-2.0 --exists ; then
-      _gtk=$($_pkg_config "gtk+-2.0 >= 2.4.0" --modversion 2>&1)
+    if $_pkg_config --exists gtk+-2.0 ; then
+      _gtk=$($_pkg_config --modversion "gtk+-2.0 >= 2.4.0" 2>&1)
       if [ $? -eq 0 ]; then
-        extra_cflags="$extra_cflags $($_pkg_config gtk+-2.0 --cflags 2>/dev/null)"
-        libs_mplayer="$libs_mplayer $($_pkg_config gtk+-2.0 --libs 2>/dev/null)"
+        extra_cflags="$extra_cflags $($_pkg_config --cflags gtk+-2.0 2>/dev/null)"
+        libs_mplayer="$libs_mplayer $($_pkg_config --libs gtk+-2.0 2>/dev/null)"
         echores "$_gtk"
       else
         res_comment="too old"
-        echores "$($_pkg_config gtk+-2.0 --modversion 2>/dev/null)"
+        echores "$($_pkg_config --modversion gtk+-2.0 2>/dev/null)"
         die "$_gtk"
       fi
 
       # Check for GLIB2
       echocheck "GLib version"
-      if $_pkg_config glib-2.0 --exists ; then
-        _glib=$($_pkg_config "glib-2.0 >= 2.6.0" --modversion 2>&1)
+      if $_pkg_config --exists glib-2.0 ; then
+        _glib=$($_pkg_config --modversion "glib-2.0 >= 2.6.0" 2>&1)
         if [ $? -eq 0 ]; then
-          libs_mplayer="$libs_mplayer $($_pkg_config glib-2.0 --libs 2>/dev/null)"
+          libs_mplayer="$libs_mplayer $($_pkg_config --libs glib-2.0 2>/dev/null)"
           echores "$_glib"
         else
           res_comment="too old"
-          echores "$($_pkg_config glib-2.0 --modversion 2>/dev/null)"
+          echores "$($_pkg_config --modversion glib-2.0 2>/dev/null)"
           die "$_glib"
         fi