gcompris r3262 - in trunk: . src/boards src/gcompris

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Sun Feb 17 23:47:05 2008
New Revision: 3262
URL: http://svn.gnome.org/viewvc/gcompris?rev=3262&view=rev

Log:
	* configure.in: now put libxf86vm in a separate variable and no more use
	  it to compile plugins (only core need it).
	* src/gcompris/Makefile.am: -
	* boards/voices/nn: created a link to nb voices until we get a voice set.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/boards/wordsgame.c
   trunk/src/gcompris/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Feb 17 23:47:05 2008
@@ -183,8 +183,7 @@
   fi
 fi
 
-#LDFLAGS="-Wl,--as-needed ${LDFLAGS} ${XF86VM_LIBS}"
-LDFLAGS="${LDFLAGS} ${XF86VM_LIBS}"
+AC_SUBST(XF86VM_LIBS)
 
 dnl Add the languages which your application supports here.
 ALL_LINGUAS="af am ar ar_TN az bg br ca cs da de dz el en_CA en_GB es et eu fi fr ga gl gu he hi hr hu id it ja ka ko lt mk ml mr ms nb ne nl nn oc pa pl pt pt_BR ro ru rw sk sl so sq sr sr Latn sv ta th tr ur vi wa zh_CN zh_TW"

Modified: trunk/src/boards/wordsgame.c
==============================================================================
--- trunk/src/boards/wordsgame.c	(original)
+++ trunk/src/boards/wordsgame.c	Sun Feb 17 23:47:05 2008
@@ -1,7 +1,5 @@
 /* gcompris - wordsgame.c
  *
- * Time-stamp: <2007-08-22 01:27:15 bruno>
- *
  * Copyright (C) 2000 Bruno Coudoin
  *
  *   This program is free software; you can redistribute it and/or modify

Modified: trunk/src/gcompris/Makefile.am
==============================================================================
--- trunk/src/gcompris/Makefile.am	(original)
+++ trunk/src/gcompris/Makefile.am	Sun Feb 17 23:47:05 2008
@@ -126,7 +126,7 @@
 
 gcompris_LDADD = \
 	$(GCOMPRIS_LIBS) $(sqlite_ldadd) $(XML_LIBS) $(GNET_LIBS) \
-        $(INTLLIBS) $(NSBUNDLE_LDFLAGS)
+        $(INTLLIBS) $(NSBUNDLE_LDFLAGS) $(XF86VM_LIBS)
 
 EXTRA_DIST = \
 	Makefile.mingw gcomprisrc.rc