Mercurial > mplayer.hg

comparison configure @ 36789:82a86ba65249

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure (cosmetic): Adjust indent and add blank lines.
author ib
date Wed, 19 Feb 2014 15:30:22 +0000
parents 64a53697effe
children e19232375229
comparison
equal deleted inserted replaced
36788:64a53697effe 36789:82a86ba65249
7787 if test "$_gui" = yes ; then 7787 if test "$_gui" = yes ; then
7788 7788
7789 # Required libraries 7789 # Required libraries
7790 test "$ffmpeg" != yes && die "The GUI requires FFmpeg." 7790 test "$ffmpeg" != yes && die "The GUI requires FFmpeg."
7791 test "$ffmpeg_so" = yes || case "$libavdecoders" in 7791 test "$ffmpeg_so" = yes || case "$libavdecoders" in
7792 *PNG_DECODER*) ;; 7792 *PNG_DECODER*) ;;
7793 *) die "The GUI requires libavcodec with PNG support (needs zlib)." ;; 7793 *) die "The GUI requires libavcodec with PNG support (needs zlib)." ;;
7794 esac 7794 esac
7795 test "$_freetype" = no && test "$_bitmap_font" = no && 7795 test "$_freetype" = no && test "$_bitmap_font" = no &&
7796 die "The GUI requires either FreeType or bitmap font support." 7796 die "The GUI requires either FreeType or bitmap font support."
7797 if ! win32 ; then 7797
7798 _gui_gtk=yes 7798 if ! win32 ; then
7799 test "$_x11" != yes && die "X11 support required for GUI compilation." 7799 _gui_gtk=yes
7800 7800 test "$_x11" != yes && die "X11 support required for GUI compilation."
7801 echocheck "XShape extension" 7801
7802 if test "$_xshape" = auto ; then 7802 echocheck "XShape extension"
7803 _xshape=no 7803 if test "$_xshape" = auto ; then
7804 cat > $TMPC << EOF 7804 _xshape=no
7805 cat > $TMPC << EOF
7805 #include <X11/Xlib.h> 7806 #include <X11/Xlib.h>
7806 #include <X11/Xproto.h> 7807 #include <X11/Xproto.h>
7807 #include <X11/Xutil.h> 7808 #include <X11/Xutil.h>
7808 #include <X11/extensions/shape.h> 7809 #include <X11/extensions/shape.h>
7809 #include <stdlib.h> 7810 #include <stdlib.h>
7811 char *name = ":0.0"; 7812 char *name = ":0.0";
7812 Display *wsDisplay; 7813 Display *wsDisplay;
7813 int exitvar = 0; 7814 int exitvar = 0;
7814 int eventbase, errorbase; 7815 int eventbase, errorbase;
7815 if (getenv("DISPLAY")) 7816 if (getenv("DISPLAY"))
7816 name=getenv("DISPLAY"); 7817 name=getenv("DISPLAY");
7817 wsDisplay=XOpenDisplay(name); 7818 wsDisplay=XOpenDisplay(name);
7818 if (!XShapeQueryExtension(wsDisplay, &eventbase, &errorbase)) 7819 if (!XShapeQueryExtension(wsDisplay, &eventbase, &errorbase))
7819 exitvar=1; 7820 exitvar=1;
7820 XCloseDisplay(wsDisplay); 7821 XCloseDisplay(wsDisplay);
7821 return exitvar; 7822 return exitvar;
7822 } 7823 }
7823 EOF 7824 EOF
7824 cc_check -lXext && _xshape=yes 7825 cc_check -lXext && _xshape=yes
7825 fi 7826 fi
7826 if test "$_xshape" = yes ; then 7827 if test "$_xshape" = yes ; then
7827 def_xshape='#define CONFIG_XSHAPE 1' 7828 def_xshape='#define CONFIG_XSHAPE 1'
7828 else 7829 else
7829 die "The GUI requires the X11 extension XShape (which was not found)." 7830 die "The GUI requires the X11 extension XShape (which was not found)."
7830 fi 7831 fi
7831 echores "$_xshape" 7832 echores "$_xshape"
7832 7833
7833 #Check for GTK 7834 # Check for GTK
7834 if test "$_gtk1" = no ; then 7835 if test "$_gtk1" = no ; then
7835 #Check for GTK2 : 7836 # Check for GTK2 :
7836 echocheck "GTK+ version" 7837 echocheck "GTK+ version"
7837 7838
7838 if $_pkg_config gtk+-2.0 --exists ; then 7839 if $_pkg_config gtk+-2.0 --exists ; then
7839 _gtk=$($_pkg_config gtk+-2.0 --modversion 2>/dev/null) 7840 _gtk=$($_pkg_config gtk+-2.0 --modversion 2>/dev/null)
7840 extra_cflags="$extra_cflags $($_pkg_config gtk+-2.0 --cflags 2>/dev/null)" 7841 extra_cflags="$extra_cflags $($_pkg_config gtk+-2.0 --cflags 2>/dev/null)"
7841 libs_mplayer="$libs_mplayer $($_pkg_config gtk+-2.0 --libs 2>/dev/null)" 7842 libs_mplayer="$libs_mplayer $($_pkg_config gtk+-2.0 --libs 2>/dev/null)"
7842 echores "$_gtk" 7843 echores "$_gtk"
7843 7844
7844 # Check for GLIB2 7845 # Check for GLIB2
7845 echocheck "GLib version" 7846 echocheck "GLib version"
7846 if $_pkg_config glib-2.0 --exists ; then 7847 if $_pkg_config glib-2.0 --exists ; then
7847 _glib=$($_pkg_config glib-2.0 --modversion 2>/dev/null) 7848 _glib=$($_pkg_config glib-2.0 --modversion 2>/dev/null)
7848 libs_mplayer="$libs_mplayer $($_pkg_config glib-2.0 --libs 2>/dev/null)" 7849 libs_mplayer="$libs_mplayer $($_pkg_config glib-2.0 --libs 2>/dev/null)"
7849 echores "$_glib" 7850 echores "$_glib"
7851
7852 def_gui='#define CONFIG_GUI 1'
7853 def_gtk2='#define CONFIG_GTK2 1'
7854 else
7855 _gtk1=yes
7856 echores "GLib 2 devel packages were not found, trying GTK+ 1.2"
7857 fi
7858 else
7859 echores "GTK+ 2 devel packages were not found, trying GTK+ 1.2"
7860 _gtk1=yes
7861 fi
7862 fi
7863
7864 if test "$_gtk1" = yes ; then
7865 # Check for old GTK (1.2.x)
7866 echocheck "GTK+ version"
7867
7868 if test -z "$_gtkconfig" ; then
7869 if ( gtk-config --version ) >/dev/null 2>&1 ; then
7870 _gtkconfig="gtk-config"
7871 elif ( gtk12-config --version ) >/dev/null 2>&1 ; then
7872 _gtkconfig="gtk12-config"
7873 else
7874 die "The GUI requires GTK+ devel packages (which were not found)."
7875 fi
7876 fi
7877 _gtk=$($_gtkconfig --version 2>&1)
7878 extra_cflags="$extra_cflags $($_gtkconfig --cflags 2>&1)"
7879 libs_mplayer="$libs_mplayer $($_gtkconfig --libs 2>&1)"
7880 echores "$_gtk (using $_gtkconfig)"
7881
7882 # Check for GLIB
7883 echocheck "GLib version"
7884 if test -z "$_glibconfig" ; then
7885 if ( glib-config --version ) >/dev/null 2>&1 ; then
7886 _glibconfig="glib-config"
7887 elif ( glib12-config --version ) >/dev/null 2>&1 ; then
7888 _glibconfig="glib12-config"
7889 else
7890 die "The GUI requires GLib devel packages (which were not found)"
7891 fi
7892 fi
7893 _glib=$($_glibconfig --version 2>&1)
7894 libs_mplayer="$libs_mplayer $($_glibconfig --libs 2>&1)"
7895 echores "$_glib (using $_glibconfig)"
7850 7896
7851 def_gui='#define CONFIG_GUI 1' 7897 def_gui='#define CONFIG_GUI 1'
7852 def_gtk2='#define CONFIG_GTK2 1' 7898 def_gtk2='#undef CONFIG_GTK2'
7853 else
7854 _gtk1=yes
7855 echores "GLib 2 devel packages were not found, trying GTK+ 1.2"
7856 fi 7899 fi
7857 else 7900
7858 echores "GTK+ 2 devel packages were not found, trying GTK+ 1.2" 7901 else #if ! win32
7859 _gtk1=yes 7902 _gui_win32=yes
7860 fi 7903 libs_mplayer="$libs_mplayer -lcomdlg32 -lcomctl32 -lshell32 -lkernel32"
7861 fi 7904 def_gui='#define CONFIG_GUI 1'
7862 7905 def_gtk2='#undef CONFIG_GTK2'
7863 if test "$_gtk1" = yes ; then 7906 fi #if ! win32
7864 # Check for old GTK (1.2.x)
7865 echocheck "GTK+ version"
7866 if test -z "$_gtkconfig" ; then
7867 if ( gtk-config --version ) >/dev/null 2>&1 ; then
7868 _gtkconfig="gtk-config"
7869 elif ( gtk12-config --version ) >/dev/null 2>&1 ; then
7870 _gtkconfig="gtk12-config"
7871 else
7872 die "The GUI requires GTK+ devel packages (which were not found)."
7873 fi
7874 fi
7875 _gtk=$($_gtkconfig --version 2>&1)
7876 extra_cflags="$extra_cflags $($_gtkconfig --cflags 2>&1)"
7877 libs_mplayer="$libs_mplayer $($_gtkconfig --libs 2>&1)"
7878 echores "$_gtk (using $_gtkconfig)"
7879
7880 # Check for GLIB
7881 echocheck "GLib version"
7882 if test -z "$_glibconfig" ; then
7883 if ( glib-config --version ) >/dev/null 2>&1 ; then
7884 _glibconfig="glib-config"
7885 elif ( glib12-config --version ) >/dev/null 2>&1 ; then
7886 _glibconfig="glib12-config"
7887 else
7888 die "The GUI requires GLib devel packages (which were not found)"
7889 fi
7890 fi
7891 _glib=$($_glibconfig --version 2>&1)
7892 libs_mplayer="$libs_mplayer $($_glibconfig --libs 2>&1)"
7893 echores "$_glib (using $_glibconfig)"
7894
7895 def_gui='#define CONFIG_GUI 1'
7896 def_gtk2='#undef CONFIG_GTK2'
7897 fi
7898
7899 else #if ! win32
7900 _gui_win32=yes
7901 libs_mplayer="$libs_mplayer -lcomdlg32 -lcomctl32 -lshell32 -lkernel32"
7902 def_gui='#define CONFIG_GUI 1'
7903 def_gtk2='#undef CONFIG_GTK2'
7904 fi #if ! win32
7905 7907
7906 else #if test "$_gui" 7908 else #if test "$_gui"
7907 def_gui='#undef CONFIG_GUI' 7909 def_gui='#undef CONFIG_GUI'
7908 def_gtk2='#undef CONFIG_GTK2' 7910 def_gtk2='#undef CONFIG_GTK2'
7909 fi #if test "$_gui" 7911 fi #if test "$_gui"