diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | src/boards/wordsgame.c | 2 | ||||
| -rw-r--r-- | src/gcompris/Makefile.am | 2 |
4 files changed, 9 insertions, 5 deletions
@@ -1,3 +1,10 @@ +2008-02-18 Bruno coudoin <bruno.coudoin@free.fr> + + * 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. + 2008-02-14 Bruno coudoin <bruno.coudoin@free.fr> Windows issue. Translation was broken in all python modules. diff --git a/configure.in b/configure.in index 685373a..67a91f8 100644 --- a/configure.in +++ b/configure.in @@ -183,8 +183,7 @@ if test "x$USE_XF86VM" == "xyes" ; then 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" diff --git a/src/boards/wordsgame.c b/src/boards/wordsgame.c index 8318b9f..c984a40 100644 --- a/src/boards/wordsgame.c +++ b/src/boards/wordsgame.c @@ -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 diff --git a/src/gcompris/Makefile.am b/src/gcompris/Makefile.am index e54a398..bb3c1e7 100644 --- a/src/gcompris/Makefile.am +++ b/src/gcompris/Makefile.am @@ -126,7 +126,7 @@ gcompris_LDFLAGS = \ gcompris_LDADD = \ $(GCOMPRIS_LIBS) $(sqlite_ldadd) $(XML_LIBS) $(GNET_LIBS) \ - $(INTLLIBS) $(NSBUNDLE_LDFLAGS) + $(INTLLIBS) $(NSBUNDLE_LDFLAGS) $(XF86VM_LIBS) EXTRA_DIST = \ Makefile.mingw gcomprisrc.rc |