Mercurial > mplayer.hg
comparison configure @ 37182:1c64016edce3
Cosmetic: Place pkg-config options first.
| author | ib |
|---|---|
| date | Tue, 09 Sep 2014 10:52:21 +0000 |
| parents | 04373738d82b |
| children | baa61e26cf83 |
comparison
equal
deleted
inserted
replaced
| 37181:04373738d82b | 37182:1c64016edce3 |
|---|---|
| 7873 echores "$_xshape" | 7873 echores "$_xshape" |
| 7874 | 7874 |
| 7875 # Check for GTK2 | 7875 # Check for GTK2 |
| 7876 echocheck "GTK+ version" | 7876 echocheck "GTK+ version" |
| 7877 | 7877 |
| 7878 if $_pkg_config gtk+-2.0 --exists ; then | 7878 if $_pkg_config --exists gtk+-2.0 ; then |
| 7879 _gtk=$($_pkg_config "gtk+-2.0 >= 2.4.0" --modversion 2>&1) | 7879 _gtk=$($_pkg_config --modversion "gtk+-2.0 >= 2.4.0" 2>&1) |
| 7880 if [ $? -eq 0 ]; then | 7880 if [ $? -eq 0 ]; then |
| 7881 extra_cflags="$extra_cflags $($_pkg_config gtk+-2.0 --cflags 2>/dev/null)" | 7881 extra_cflags="$extra_cflags $($_pkg_config --cflags gtk+-2.0 2>/dev/null)" |
| 7882 libs_mplayer="$libs_mplayer $($_pkg_config gtk+-2.0 --libs 2>/dev/null)" | 7882 libs_mplayer="$libs_mplayer $($_pkg_config --libs gtk+-2.0 2>/dev/null)" |
| 7883 echores "$_gtk" | 7883 echores "$_gtk" |
| 7884 else | 7884 else |
| 7885 res_comment="too old" | 7885 res_comment="too old" |
| 7886 echores "$($_pkg_config gtk+-2.0 --modversion 2>/dev/null)" | 7886 echores "$($_pkg_config --modversion gtk+-2.0 2>/dev/null)" |
| 7887 die "$_gtk" | 7887 die "$_gtk" |
| 7888 fi | 7888 fi |
| 7889 | 7889 |
| 7890 # Check for GLIB2 | 7890 # Check for GLIB2 |
| 7891 echocheck "GLib version" | 7891 echocheck "GLib version" |
| 7892 if $_pkg_config glib-2.0 --exists ; then | 7892 if $_pkg_config --exists glib-2.0 ; then |
| 7893 _glib=$($_pkg_config "glib-2.0 >= 2.6.0" --modversion 2>&1) | 7893 _glib=$($_pkg_config --modversion "glib-2.0 >= 2.6.0" 2>&1) |
| 7894 if [ $? -eq 0 ]; then | 7894 if [ $? -eq 0 ]; then |
| 7895 libs_mplayer="$libs_mplayer $($_pkg_config glib-2.0 --libs 2>/dev/null)" | 7895 libs_mplayer="$libs_mplayer $($_pkg_config --libs glib-2.0 2>/dev/null)" |
| 7896 echores "$_glib" | 7896 echores "$_glib" |
| 7897 else | 7897 else |
| 7898 res_comment="too old" | 7898 res_comment="too old" |
| 7899 echores "$($_pkg_config glib-2.0 --modversion 2>/dev/null)" | 7899 echores "$($_pkg_config --modversion glib-2.0 2>/dev/null)" |
| 7900 die "$_glib" | 7900 die "$_glib" |
| 7901 fi | 7901 fi |
| 7902 | 7902 |
| 7903 def_gui='#define CONFIG_GUI 1' | 7903 def_gui='#define CONFIG_GUI 1' |
| 7904 else | 7904 else |