A better fix for missing options when the satellite plugin is not

configured.

configure.ac

 dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.131 2003/12/11 05:49:20 rocky Exp $
+dnl $Id: configure.ac,v 1.132 2003/12/13 00:53:50 rocky Exp $
 
 AC_INIT(vlc,0.7.0-test1)
 
@@ -1584,6 +1584,8 @@ AC_ARG_ENABLE(satellite,
   [  --enable-satellite      satellite card support (default disabled)],
   [ if test "${enable_satellite}" = "yes"
     then
+      AC_DEFINE(HAVE_SATELLITE, [], 
+      [Define for the VCD plugin using libcdio/libvcdinfo])
       AX_ADD_PLUGINS([satellite])
     fi])
 

modules/gui/gtk/open.c

@@ -2,7 +2,7 @@
  * gtk_open.c : functions to handle file/disc/network open widgets.
  *****************************************************************************
  * Copyright (C) 2000, 2001, 2003 VideoLAN
- * $Id: open.c,v 1.20 2003/12/13 00:00:45 rocky Exp $
+ * $Id: open.c,v 1.21 2003/12/13 00:53:50 rocky Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stphane Borel <stef@via.ecp.fr>
@@ -582,7 +582,7 @@ static void GtkOpenShow( intf_thread_t *p_intf, int i_page )
         GTK_OBJECT( p_intf->p_sys->p_open ), "network_http_url" ) ),
         "http://" );
 
-#if SATELLITE_OPTIONS_FIXED
+#ifdef HAVE_SATELLITE
     /* Satellite stuff */
     psz_var = config_GetPsz( p_intf, "frequency" );
     if( psz_var )
@@ -601,7 +601,7 @@ static void GtkOpenShow( intf_thread_t *p_intf, int i_page )
             psz_var );
         free( psz_var );
     }
-#endif /*SATELITE_OPTIONS_FIXED*/
+#endif /*HAVE_SATELITE*/
 
     /* subtitle stuff */
     /* hide hbox_subtitle */