1.1 --- a/gmyth/configure.ac	Thu Jan 18 20:48:09 2007 +0000
     1.2 +++ b/gmyth/configure.ac	Thu Jan 18 20:51:59 2007 +0000
     1.3 @@ -87,16 +87,6 @@
     1.4      CFLAGS="$CFLAGS -O2 -DG_DISABLE_CHECKS"
     1.5  fi          
     1.6  
     1.7 -dnl Test if --disable-upnp / --enable-upnp given
     1.8 -AC_ARG_ENABLE(upnp,
     1.9 -        AC_HELP_STRING([--disable-upnp], [disable/enable UPnP discovery/search functions]))
    1.10 -
    1.11 -if test x"$enable_upnp" != xno; then
    1.12 -  AC_DEFINE(WITH_GMYTH_UPNP, 1, [Enable UPnP discovery/search functions.])
    1.13 -fi
    1.14 -
    1.15 -AM_CONDITIONAL(WITH_GMYTH_UPNP, test x"$enable_upnp" != xno )
    1.16 -
    1.17  # Check for pkgconfig
    1.18  AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
    1.19  # Give error and exit if we don't have pkgconfig
    1.20 @@ -231,22 +221,6 @@
    1.21  fi
    1.22  AC_SUBST(MYSQL_LIBS)
    1.23  
    1.24 -if test x"$enable_upnp" != xno; then
    1.25 -	PKG_CHECK_MODULES(GMYTH_UPNP, gmyth-upnp, HAVE_GMYTH_UPNP=yes, HAVE_GMYTH_UPNP=no)
    1.26 -
    1.27 -	# Shows a warning message if we don't have gmyth-upnp libraries
    1.28 -	if test x"$HAVE_GMYTH_UPNP" != xno; then
    1.29 -	  AC_MSG_WARN([GMyth UPnP development packages found!])
    1.30 -
    1.31 -	  AC_SUBST(GMYTH_UPNP_CFLAGS)
    1.32 -	  AC_SUBST(GMYTH_UPNP_LIBS)
    1.33 -	else
    1.34 -	  AC_MSG_WARN([Couldn't find the GMyth UPnP development packages installed. UPnP discovery functions cannot run.])
    1.35 -	fi
    1.36 -
    1.37 -fi
    1.38 -
    1.39 -AM_CONDITIONAL(WITH_GMYTH_UPNP, test x"$HAVE_GMYTH_UPNP" != xno )
    1.40  #dnl Enable gtk-doc
    1.41  #GTK_DOC_CHECK(1.4)
    1.42  

     2.1 --- a/gmyth/src/Makefile.am	Thu Jan 18 20:48:09 2007 +0000
     2.2 +++ b/gmyth/src/Makefile.am	Thu Jan 18 20:51:59 2007 +0000
     2.3 @@ -49,11 +49,6 @@
     2.4  	$(GSTPLUGINSBASE_CFLAGS)	\
     2.5  	$(MYSQL_CFLAGS)
     2.6  
     2.7 -if WITH_GMYTH_UPNP
     2.8 -libgmyth_la_CFLAGS += 			\
     2.9 -	$(GMYTH_UPNP_CFLAGS)
    2.10 -endif
    2.11 -
    2.12  libgmyth_la_LDFLAGS = 			\
    2.13  	-export-dynamic 			\
    2.14  	$(MYSQL_LIBS) 				\
    2.15 @@ -61,11 +56,6 @@
    2.16  	$(GSTBASE_LIBS)				\
    2.17  	$(GSTPLUGINS_LIBS)
    2.18  
    2.19 -if WITH_GMYTH_UPNP
    2.20 -libgmyth_la_LIBS = 			\
    2.21 -	$(GMYTH_UPNP_LIBS)
    2.22 -endif
    2.23 -
    2.24  libgmyth_includedir = 			\
    2.25  	$(pkgincludedir)
    2.26  

     3.1 --- a/gmyth/src/gmyth_backendinfo.c	Thu Jan 18 20:48:09 2007 +0000
     3.2 +++ b/gmyth/src/gmyth_backendinfo.c	Thu Jan 18 20:51:59 2007 +0000
     3.3 @@ -32,10 +32,6 @@
     3.4  #include "gmyth_uri.h"
     3.5  #include "gmyth_debug.h"
     3.6  
     3.7 -#ifdef WITH_GMYTH_UPNP
     3.8 -#include <gmyth-upnp/gmyth_upnp.h>
     3.9 -#endif
    3.10 -
    3.11  static void gmyth_backend_info_class_init  (GMythBackendInfoClass *klass);
    3.12  static void gmyth_backend_info_init        (GMythBackendInfo *object);
    3.13  
    3.14 @@ -146,15 +142,8 @@
    3.15      
    3.16      if ( NULL == hostname || strlen(hostname) <= 0 )
    3.17      { 
    3.18 -    #ifdef WITH_GMYTH_UPNP
    3.19 -	    GMythUPnP *gmyth_upnp = gmyth_upnp_new( backend_info );
    3.20 -	    /* backend_info = gmyth_upnp_get_backend_info( gmyth_upnp ); */
    3.21 -	    backend_info->hostname = g_strdup ( gmyth_upnp_get_host( gmyth_upnp ) );
    3.22 -	    g_object_unref( gmyth_upnp );
    3.23 -    #else
    3.24 -	  	gmyth_debug ( "Error trying to set a hostname equals to NULL (it doesn't using UPnP)." );
    3.25 +	  	gmyth_debug ( "Error trying to set a hostname equals to NULL." );
    3.26    		return NULL;
    3.27 -    #endif
    3.28      } else {    	
    3.29      	backend_info->hostname = g_strdup (hostname);
    3.30      }
    3.31 @@ -191,15 +180,8 @@
    3.32  
    3.33      if ( port <= 0 )
    3.34      { 
    3.35 -    #ifdef WITH_GMYTH_UPNP
    3.36 -	    GMythUPnP *gmyth_upnp = gmyth_upnp_new( backend_info );
    3.37 -	    backend_info = gmyth_upnp_get_backend_info( gmyth_upnp );
    3.38 -	    backend_info->port = gmyth_upnp_get_port( gmyth_upnp );
    3.39 -	    g_object_unref( gmyth_upnp );
    3.40 -    #else
    3.41  	  	gmyth_debug ( "Error trying to set a hostname equals to NULL (it doesn't using UPnP)." );
    3.42    		return NULL;
    3.43 -    #endif
    3.44      } else {    	
    3.45      	backend_info->port = port;
    3.46      }