[MPlayer-cvslog] r26454 - in trunk: gui/cfg.c mpcommon.c

[albeu]

Author: albeu
Date: Tue Apr 15 15:20:15 2008
New Revision: 26454

Log:
noconfig fix, disable_gui_conf was not defined when compiling mencoder.
Fix mencoder linking when the GUI is enabled.
Patch by Norman Yarvin (yarvin -at- yarchive -dot- net).


Modified:
   trunk/gui/cfg.c
   trunk/mpcommon.c

Modified: trunk/gui/cfg.c
==============================================================================
--- trunk/gui/cfg.c	(original)
+++ trunk/gui/cfg.c	Tue Apr 15 15:20:15 2008
@@ -83,7 +83,7 @@ gtkASS_t gtkASS;
 
 extern int    stop_xscreensaver;
 extern int    m_config_parse_config_file(m_config_t* config, char *conffile);
-int disable_gui_conf=0;
+extern int    disable_gui_conf;
 
 static m_config_t * gui_conf;
 static const m_option_t gui_opts[] =

Modified: trunk/mpcommon.c
==============================================================================
--- trunk/mpcommon.c	(original)
+++ trunk/mpcommon.c	Tue Apr 15 15:20:15 2008
@@ -210,7 +210,9 @@ int select_audio(demuxer_t* demuxer, int
 /* Parse -noconfig common to both programs */
 int disable_system_conf=0;
 int disable_user_conf=0;
-extern int disable_gui_conf;
+#ifdef HAVE_NEW_GUI
+int disable_gui_conf=0;
+#endif /* HAVE_NEW_GUI */
 
 /* Disable all configuration files */
 static void noconfig_all(void)