diff options
38 files changed, 48 insertions, 43 deletions
diff --git a/Makefile.am b/Makefile.am index 1e5cc64..4ad7cd2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with libcanberra. If not, If not, see +# License along with libcanberra. If not, see # <http://www.gnu.org/licenses/>. dist_doc_DATA = README @@ -15,7 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with libcanberra. If not, If not, see +# License along with libcanberra. If not, see # <http://www.gnu.org/licenses/>. # Only there to make jhbuild and Marc-Andre happy diff --git a/bootstrap.sh b/bootstrap.sh index d9a2483..799d427 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -15,7 +15,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with libcanberra. If not, If not, see +# License along with libcanberra. If not, see # <http://www.gnu.org/licenses/>. VERSION=1.9 diff --git a/configure.ac b/configure.ac index 2edc828..0026d7f 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with libcanberra. If not, If not, see +# License along with libcanberra. If not, see # <http://www.gnu.org/licenses/>. AC_PREREQ(2.62) @@ -84,6 +84,8 @@ esac AM_CONDITIONAL(OS_IS_WIN32, test "x$os_is_win32" = "x1") +AM_CONDITIONAL(USE_VERSION_SCRIPT, test "x$supports_anon_versioning" = "xyes" ) + ################################### # Basic environment checks # ################################### @@ -272,7 +274,7 @@ AC_ARG_ENABLE([gtk], [gtk=auto]) if test "x${gtk}" != xno ; then - PKG_CHECK_MODULES(GTK, [ gtk+-2.0 gthread-2.0 ], + PKG_CHECK_MODULES(GTK, [ gtk+-2.0 >= 2.14 gthread-2.0 ], [ HAVE_GTK=1 AC_DEFINE([HAVE_GTK], 1, [Have GTK?]) diff --git a/src/Makefile.am b/src/Makefile.am index 27208fa..198202b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,7 +13,7 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with libcanberra. If not, If not, see +# License along with libcanberra. If not, see # <http://www.gnu.org/licenses/>. gtkmoduledir = @GTK_MODULES_DIR@ @@ -60,8 +60,11 @@ libcanberra_la_LIBADD = \ $(VORBIS_LIBS) libcanberra_la_LDFLAGS = \ -export-dynamic \ - -version-info $(LIBCANBERRA_VERSION_INFO) \ - -Wl,-version-script=$(srcdir)/map-file + -version-info $(LIBCANBERRA_VERSION_INFO) + +if USE_VERSION_SCRIPT +libcanberra_la_LDFLAGS += -Wl,-version-script=$(srcdir)/map-file +endif plugin_LTLIBRARIES = @@ -14,7 +14,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c index dd63ee7..d82d34e 100644 --- a/src/canberra-gtk-module.c +++ b/src/canberra-gtk-module.c @@ -14,7 +14,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ @@ -621,8 +621,8 @@ static void dispatch_sound_event(SoundEventData *d) { NULL); } - if (ret != CA_SUCCESS) - g_warning("Failed to play event sound: %s", ca_strerror(ret)); +/* if (ret != CA_SUCCESS) */ +/* g_warning("Failed to play event sound: %s", ca_strerror(ret)); */ } static gboolean idle_cb(void *userdata) { diff --git a/src/canberra-gtk-play.c b/src/canberra-gtk-play.c index 8c141f6..d0338db 100644 --- a/src/canberra-gtk-play.c +++ b/src/canberra-gtk-play.c @@ -14,7 +14,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c index c6eeb21..66a2b9a 100644 --- a/src/canberra-gtk.c +++ b/src/canberra-gtk.c @@ -14,7 +14,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/canberra-gtk.h b/src/canberra-gtk.h index d359797..c9b3a99 100644 --- a/src/canberra-gtk.h +++ b/src/canberra-gtk.h @@ -17,7 +17,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/canberra.h b/src/canberra.h index 3a3b88f..9a844bf 100644 --- a/src/canberra.h +++ b/src/canberra.h @@ -17,7 +17,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/common.c b/src/common.c index 260c461..ce2ffb3 100644 --- a/src/common.c +++ b/src/common.c @@ -14,7 +14,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/common.h b/src/common.h index 7f0ee9e..072c7d1 100644 --- a/src/common.h +++ b/src/common.h @@ -17,7 +17,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/driver-order.c b/src/driver-order.c index d97c0e1..252111b 100644 --- a/src/driver-order.c +++ b/src/driver-order.c @@ -14,7 +14,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/driver-order.h b/src/driver-order.h index 23e0783..44f7eff 100644 --- a/src/driver-order.h +++ b/src/driver-order.h @@ -17,7 +17,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/driver.h b/src/driver.h index 06acf3c..fca5529 100644 --- a/src/driver.h +++ b/src/driver.h @@ -17,7 +17,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ @@ -14,7 +14,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/llist.h b/src/llist.h index ddd95f7..cf49bef 100644 --- a/src/llist.h +++ b/src/llist.h @@ -17,7 +17,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/macro.c b/src/macro.c index 93af6ee..f47aa21 100644 --- a/src/macro.c +++ b/src/macro.c @@ -14,7 +14,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/macro.h b/src/macro.h index efc57dc..10b217f 100644 --- a/src/macro.h +++ b/src/macro.h @@ -17,7 +17,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/malloc.c b/src/malloc.c index 4ce9f60..2a15b70 100644 --- a/src/malloc.c +++ b/src/malloc.c @@ -14,7 +14,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/malloc.h b/src/malloc.h index 573a252..30f0216 100644 --- a/src/malloc.h +++ b/src/malloc.h @@ -17,7 +17,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/multi.c b/src/multi.c index 68d6d64..14cc074 100644 --- a/src/multi.c +++ b/src/multi.c @@ -14,7 +14,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/mutex-posix.c b/src/mutex-posix.c index 3475334..8d8b88b 100644 --- a/src/mutex-posix.c +++ b/src/mutex-posix.c @@ -14,7 +14,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/mutex.h b/src/mutex.h index 959bb11..e0575ba 100644 --- a/src/mutex.h +++ b/src/mutex.h @@ -17,7 +17,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ @@ -14,7 +14,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/proplist.c b/src/proplist.c index 7f8bb40..15c6993 100644 --- a/src/proplist.c +++ b/src/proplist.c @@ -14,7 +14,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/proplist.h b/src/proplist.h index 5af15e3..f795e58 100644 --- a/src/proplist.h +++ b/src/proplist.h @@ -17,7 +17,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/pulse.c b/src/pulse.c index 80a8033..ac86fc4 100644 --- a/src/pulse.c +++ b/src/pulse.c @@ -14,7 +14,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/read-sound-file.c b/src/read-sound-file.c index 84c202a..d1c718b 100644 --- a/src/read-sound-file.c +++ b/src/read-sound-file.c @@ -14,7 +14,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/read-sound-file.h b/src/read-sound-file.h index e9273ea..fe9d76a 100644 --- a/src/read-sound-file.h +++ b/src/read-sound-file.h @@ -17,7 +17,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/read-vorbis.c b/src/read-vorbis.c index 5629676..6bafd54 100644 --- a/src/read-vorbis.c +++ b/src/read-vorbis.c @@ -14,7 +14,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/read-vorbis.h b/src/read-vorbis.h index e97aeac..ada9d25 100644 --- a/src/read-vorbis.h +++ b/src/read-vorbis.h @@ -17,7 +17,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/read-wav.c b/src/read-wav.c index 23c0e7e..3d78255 100644 --- a/src/read-wav.c +++ b/src/read-wav.c @@ -14,7 +14,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/read-wav.h b/src/read-wav.h index 8393b6d..9ecf263 100644 --- a/src/read-wav.h +++ b/src/read-wav.h @@ -17,7 +17,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/sound-theme-spec.c b/src/sound-theme-spec.c index 611b008..8c78f89 100644 --- a/src/sound-theme-spec.c +++ b/src/sound-theme-spec.c @@ -14,7 +14,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/sound-theme-spec.h b/src/sound-theme-spec.h index 6e29118..2986605 100644 --- a/src/sound-theme-spec.h +++ b/src/sound-theme-spec.h @@ -17,7 +17,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ diff --git a/src/test-canberra.c b/src/test-canberra.c index e20af8a..05fcb54 100644 --- a/src/test-canberra.c +++ b/src/test-canberra.c @@ -14,7 +14,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with libcanberra. If not, If not, see + License along with libcanberra. If not, see <http://www.gnu.org/licenses/>. ***/ |