[Toxine-cvs] CVS: toxine/src Makefile.am,1.9,1.10 loader.c,1.17,1.18

[Daniel Caujolle-B. <f1...@us...>]

Update of /cvsroot/toxine/toxine/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20682

Modified Files:
	Makefile.am loader.c 
Log Message:
Finally fix the local loader recurrent bug i commit each single days ;-).
Just touching .local in srr directory define the LOCAL_BUILD in loader.c.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/toxine/toxine/src/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.am	9 Apr 2004 17:43:14 -0000	1.9
+++ Makefile.am	17 May 2004 20:15:52 -0000	1.10
@@ -1,7 +1,7 @@
 
 SUBDIRS = plugins
 
-AM_CFLAGS = @CFLAGS@ @XINE_CFLAGS@ @READLINE_INCLUDES@
+AM_CFLAGS = @CFLAGS@ @XINE_CFLAGS@ @READLINE_INCLUDES@ `if test -f .local; then echo -DLOCAL_BUILD; fi`
 LIBTOOL = $(SHELL) $(top_builddir)/libtoollib-nofpic
 
 bin_PROGRAMS = toxine
@@ -30,7 +30,7 @@
 noinst_HEADERS = common.h utils.h commands.h parse.h xine_commands.h loader.h script.h playlist.h
 
 debug:
-	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) @XINE_CFLAGS@"
+	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) @XINE_CFLAGS@ `if test -f .local; then echo -DLOCAL_BUILD; fi`"
 
 install-debug: debug
 	@list='$(SUBDIRS)'; for subdir in $$list; do \

Index: loader.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/loader.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- loader.c	17 May 2004 20:08:28 -0000	1.17
+++ loader.c	17 May 2004 20:15:52 -0000	1.18
@@ -35,8 +35,8 @@
 
 extern int errno;
 
-/* #define LOCAL_BUILD 1 */
 #ifdef LOCAL_BUILD
+#warning "Load plugins from plugins/.libs"
 #undef TOXINE_PLUGINDIR
 #define TOXINE_PLUGINDIR "plugins/.libs"
 #endif