[gst-cvs] CVS: gstreamer/tools Makefile.am,1.14.4.2,1.14.4.3 gstreamer-inspect.c,1.30,1.30.4.1 gstreamer-launch.c,1.24.4.1,1.24.4.2

[Wim Taymans]

Update of /cvsroot/gstreamer/gstreamer/tools
In directory usw-pr-cvs1:/tmp/cvs-serv32315

Modified Files:
      Tag: BRANCH-EVENTS1
	Makefile.am gstreamer-inspect.c gstreamer-launch.c 
Log Message:
Added ifdefs around xml code when it was not compiled into the core.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/tools/Makefile.am,v
retrieving revision 1.14.4.2
retrieving revision 1.14.4.3
diff -u -d -r1.14.4.2 -r1.14.4.3
--- Makefile.am	2001/09/30 22:44:25	1.14.4.2
+++ Makefile.am	2001/10/01 20:23:49	1.14.4.3
@@ -5,10 +5,16 @@
 GST_REGISTRY_SRC = gstreamer-register
 endif
 
+if GST_DISABLE_LOADSAVE
+GST_LOADSAVE_SRC = 
+else
+GST_LOADSAVE_SRC = gstreamer-compprep
+endif
+
 bin_PROGRAMS = 	gstreamer-launch 	\
 		$(GST_REGISTRY_SRC) 	\
 		gstreamer-inspect 	\
-		gstreamer-compprep 	\
+		$(GST_LOADSAVE_SRC) 	\
 		gstreamer-complete
 
 man_MANS = gstreamer-launch.1 gstreamer-register.1 gstreamer-inspect.1 \

Index: gstreamer-inspect.c
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/tools/gstreamer-inspect.c,v
retrieving revision 1.30
retrieving revision 1.30.4.1
diff -u -d -r1.30 -r1.30.4.1
--- gstreamer-inspect.c	2001/08/21 20:16:48	1.30
+++ gstreamer-inspect.c	2001/10/01 20:23:49	1.30.4.1
@@ -221,10 +221,12 @@
 
   printf("  Has change_state() function: %s\n",
          GST_DEBUG_FUNCPTR_NAME(gstelement_class->change_state));
+#ifndef GST_DISABLE_LOADSAVE
   printf("  Has custom save_thyself() function: %s\n",
          GST_DEBUG_FUNCPTR_NAME(gstobject_class->save_thyself));
   printf("  Has custom restore_thyself() function: %s\n",
          GST_DEBUG_FUNCPTR_NAME(gstobject_class->restore_thyself));
+#endif
 
 
 

Index: gstreamer-launch.c
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/tools/gstreamer-launch.c,v
retrieving revision 1.24.4.1
retrieving revision 1.24.4.2
diff -u -d -r1.24.4.1 -r1.24.4.2
--- gstreamer-launch.c	2001/09/30 22:19:04	1.24.4.1
+++ gstreamer-launch.c	2001/10/01 20:23:49	1.24.4.2
@@ -152,9 +152,11 @@
 
   gst_parse_launch (cmdline, GST_BIN (pipeline));
 
+#ifndef GST_DISABLE_LOADSAVE
   if (save_pipeline) {
     xmlSaveFile (savefile, gst_xml_write (pipeline));
   }
+#endif
   if (run_pipeline) {
     arg_search(GST_BIN(pipeline),"xid",xid_handler,NULL);