diff mpcommon.c @ 27343:5fe6a8adf569

Rename two GUI-related preprocessor directives: HAVE_NEW_GUI --> CONFIG_GUI, HAVE_GTK2_GUI --> CONFIG_GTK2

--- a/mpcommon.c	Wed Jul 30 12:03:30 2008 +0000
+++ b/mpcommon.c	Wed Jul 30 13:44:59 2008 +0000
@@ -210,26 +210,26 @@
 /* Parse -noconfig common to both programs */
 int disable_system_conf=0;
 int disable_user_conf=0;
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 int disable_gui_conf=0;
-#endif /* HAVE_NEW_GUI */
+#endif /* CONFIG_GUI */
 
 /* Disable all configuration files */
 static void noconfig_all(void)
 {
     disable_system_conf = 1;
     disable_user_conf = 1;
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
     disable_gui_conf = 1;
-#endif /* HAVE_NEW_GUI */
+#endif /* CONFIG_GUI */
 }
 
 const m_option_t noconfig_opts[] = {
     {"all", noconfig_all, CONF_TYPE_FUNC, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 0, NULL},
     {"system", &disable_system_conf, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 1, NULL},
     {"user", &disable_user_conf, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 1, NULL},
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
     {"gui", &disable_gui_conf, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 1, NULL},
-#endif /* HAVE_NEW_GUI */
+#endif /* CONFIG_GUI */
     {NULL, NULL, 0, 0, 0, 0, NULL}
 };