diff -Nru chromium-bsu-0.9.15/ChangeLog chromium-bsu-0.9.15.1/ChangeLog --- chromium-bsu-0.9.15/ChangeLog 2011-02-14 03:55:29.000000000 +0000 +++ chromium-bsu-0.9.15.1/ChangeLog 2013-05-25 05:43:50.000000000 +0000 @@ -1,3 +1,156 @@ +2013-05-25 Paul Wise + + * NEWS, configure.ac: Release version 0.9.15.1 + +2013-05-25 Paul Wise + + * po/bg.po, po/de.po, po/es.po, po/fr.po, po/it.po, po/ru.po, + po/sv.po, po/tr.po, po/zh_CN.po, po/zh_TW.po: Translation file + updates + +2013-05-25 Paul Wise + + * .tx/config: Switch to HTTPS transifex.com + +2013-05-17 Paul Wise + + * configure.ac: Split out orthogonal image library detection tests. This reduces complexity & will help with the future SDL2 port. + +2011-12-26 Paul Wise + + * src/Image.cpp: Add missing include for glu.h in the image loader. + +2013-05-14 Paul Wise + + * misc/Makefile.am: Install the application icon into the hicolor + theme dir + +2013-05-14 Paul Wise + + * data/png/Makefile.am, src/MainSDL.cpp: Drop duplicate icon + +2013-05-14 Paul Wise + + * misc/chromium-bsu.desktop: Add some keywords to the freedesktop + menu file + +2013-05-14 Paul Wise + + * src/Audio.cpp, src/AudioOpenAL.cpp, src/HiScore.cpp: Check the + return codes of functions declared with warn_unused_result + +2013-05-14 Paul Wise + + * src/MainGL.cpp: Drop an unused variable + +2013-05-14 Paul Wise + + * src/EnemyFleet.cpp, src/GroundMetal.cpp, src/GroundSea.cpp, + src/StatusDisplay.cpp: Comply with C++11 rules about narrowing + conversions inside {} + +2013-05-11 Paul Wise + + * configure.ac, src/AudioSDLMixer.h: Switch to using pkg-config for + detecting SDL_mixer + +2013-05-11 Paul Wise + + * configure.ac, src/Image.cpp, src/MainSDL.cpp: Switch to using + pkg-config for detecting SDL_image + +2013-05-11 Paul Wise + + * src/Audio.h, src/Image.cpp, src/MainSDL.cpp, src/MainSDL.h: Use + the SDL header paths returned by pkg-config. + +2012-10-26 Paul Wise + + * po/de.po: Fix syntax error in German translation file + +2012-10-21 Paul Wise + + * src/MainSDL_Event.cpp: Fix movement using the diagonal keys on + keypads + +2012-10-09 Paul Wise + + * po/LINGUAS, po/bg.po, po/de.po, po/es.po, po/fr.po, po/it.po, + po/ru.po, po/sv.po, po/tr.po, po/zh_CN.po, po/zh_TW.po: Pull + translation updates from transifex, update translation files. + +2012-10-09 Paul Wise + + * .gitignore: Get git to ignore some files + +2012-10-09 Paul Wise + + * Makefile.am: Clean up some more files on maintainer-clean + +2012-06-04 Paul Wise + + * README.install: AX_CHECK_GL* moved from autoconf-archive to + autoconf-gl-macros + +2012-05-24 Paul Wise + + * src/MainGL.cpp: Do not assign a variable to itself + +2012-05-17 Paul Wise + + * src/Text.cpp: The std namespace is implicit, no need to explcitly + say we are using it. + +2011-12-08 Paul Wise + + * src/EnemyAircraft_Straight.cpp, src/HeroAmmo.cpp, src/HiScore.cpp: + Fix some printf format issues + +2011-12-08 Paul Wise + + * src/EnemyAircraft_Boss00.cpp, src/EnemyAircraft_Tank.cpp: Avoid + undefined behaviour with the ++ and % operators + +2011-12-02 Tristan Heaven + + * src/MenuGL.cpp: Silence the GCC -Wformat-security warning + +2011-12-02 Tristan Heaven + + * src/main.cpp, src/textGeometryBSU.cpp, + src/textGeometryChromium.cpp: Include some headers that are + responsible for setting argument defaults. + +2011-12-02 Paul Wise + + * src/AudioOpenAL.cpp, src/EnemyAircraft_Straight.cpp, + src/MainSDL.cpp, src/MenuGL.cpp: Drop some variables that are set + but not used. + +2011-11-10 Paul Wise + + * src/MainSDL_Event.cpp: SDL_GetKeyState was renamed SDL 1.3, + support SDL_GetKeyboardState too Thanks to Sam Hocevar for the advice. + +2011-10-31 Paul Wise + + * po/fr.po: Unfuzzy some French translations. Pulled from Transifex. + +2011-10-31 Paul Wise + + * po/LINGUAS, po/ru.po: Add Russian translation from Transifex Translator: Евгений Лежнин + +2011-10-31 Paul Wise + + * po/LINGUAS, po/zh_CN.po: Add 简体中文 (Simplified Chinese) + translation Translator: Wei-Lun Chao Translator: Long + Si-Tai-Zi + +2011-02-14 Paul Wise + + * src/AudioOpenAL.cpp: Do not leak a file descriptor when loading a + music list + 2011-02-14 Paul Wise * NEWS: Release version 0.9.15 diff -Nru chromium-bsu-0.9.15/Makefile.am chromium-bsu-0.9.15.1/Makefile.am --- chromium-bsu-0.9.15/Makefile.am 2011-02-14 03:26:04.000000000 +0000 +++ chromium-bsu-0.9.15.1/Makefile.am 2013-05-11 04:48:17.000000000 +0000 @@ -25,6 +25,11 @@ po/quot.sed \ po/remove-potcdate.sin \ po/*.pot \ + po/*.po~ \ + m4/fcntl-o.m4 \ + m4/intl.m4 \ + m4/intldir.m4 \ + m4/threadlib.m4 \ m4/acx_pthread.m4 \ m4/ax_check_gl.m4 \ m4/ax_check_glu.m4 \ diff -Nru chromium-bsu-0.9.15/Makefile.in chromium-bsu-0.9.15.1/Makefile.in --- chromium-bsu-0.9.15/Makefile.in 2011-02-14 03:55:05.000000000 +0000 +++ chromium-bsu-0.9.15.1/Makefile.in 2013-05-25 05:40:40.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -36,12 +52,11 @@ subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/chromium-bsu-config.h.in \ - $(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \ - NEWS config.guess config.rpath config.sub depcomp install-sh \ + $(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING NEWS \ + config.guess config.rpath config.sub depcomp install-sh \ missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/m4/ax_check_gl.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_gl.m4 \ $(top_srcdir)/m4/ax_check_glu.m4 \ $(top_srcdir)/m4/ax_check_glut.m4 \ $(top_srcdir)/m4/ax_lang_compiler_ms.m4 \ @@ -68,21 +83,30 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck + cscope distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -110,7 +134,10 @@ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best +DIST_TARGETS = dist-gzip distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -189,11 +216,13 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ +SDLIMAGE_CFLAGS = @SDLIMAGE_CFLAGS@ +SDLIMAGE_LIBS = @SDLIMAGE_LIBS@ +SDLMIXER_CFLAGS = @SDLMIXER_CFLAGS@ +SDLMIXER_LIBS = @SDLMIXER_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_LIBS = @SDL_LIBS@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -217,7 +246,6 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -290,6 +318,11 @@ po/quot.sed \ po/remove-potcdate.sin \ po/*.pot \ + po/*.po~ \ + m4/fcntl-o.m4 \ + m4/intl.m4 \ + m4/intldir.m4 \ + m4/threadlib.m4 \ m4/acx_pthread.m4 \ m4/ax_check_gl.m4 \ m4/ax_check_glu.m4 \ @@ -346,7 +379,7 @@ $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -382,10 +415,8 @@ $(am__aclocal_m4_deps): chromium-bsu-config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @if test ! -f $@; then rm -f stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi stamp-h1: $(srcdir)/chromium-bsu-config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -399,12 +430,12 @@ -rm -f chromium-bsu-config.h stamp-h1 # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -414,7 +445,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -428,37 +463,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -467,6 +471,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -530,8 +538,32 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) + +clean-cscope: + -rm -f cscope.files + +cscope.files: clean-cscope cscopelist-recursive cscopelist + +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -567,13 +599,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -605,36 +634,36 @@ || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__post_remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__post_remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -645,8 +674,8 @@ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -656,9 +685,9 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ @@ -666,6 +695,7 @@ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -689,13 +719,21 @@ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -726,10 +764,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -812,23 +855,24 @@ uninstall-am: .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-hook dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ - distcheck distclean distclean-generic distclean-hdr \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am + all all-am am--refresh check check-am clean clean-cscope \ + clean-generic cscope cscopelist cscopelist-recursive ctags \ + ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \ + dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \ + distclean distclean-generic distclean-hdr distclean-tags \ + distcleancheck distdir distuninstallcheck dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags tags-recursive uninstall uninstall-am dist-hook: diff -Nru chromium-bsu-0.9.15/NEWS chromium-bsu-0.9.15.1/NEWS --- chromium-bsu-0.9.15/NEWS 2011-02-14 03:54:04.000000000 +0000 +++ chromium-bsu-0.9.15.1/NEWS 2013-05-25 05:38:47.000000000 +0000 @@ -1,3 +1,9 @@ +Chromium B.S.U. 0.9.15.1 + - Fix diagonal keypad keys + - Add Russian, Simplified Chinese translations + - Translation updates + - Compile fixes + Chromium B.S.U. 0.9.15 - Fix some MacOS X portability issues - Fix mouse grabbing and pause issue diff -Nru chromium-bsu-0.9.15/README.install chromium-bsu-0.9.15.1/README.install --- chromium-bsu-0.9.15/README.install 2011-02-14 03:54:04.000000000 +0000 +++ chromium-bsu-0.9.15.1/README.install 2013-05-25 05:35:51.000000000 +0000 @@ -67,7 +67,7 @@ automake gettext pkg-config -autoconf-archive +autoconf-gl-macros or autoconf-archive before 20111221 Pre-build step ------------------ diff -Nru chromium-bsu-0.9.15/aclocal.m4 chromium-bsu-0.9.15.1/aclocal.m4 --- chromium-bsu-0.9.15/aclocal.m4 2011-02-14 03:55:01.000000000 +0000 +++ chromium-bsu-0.9.15.1/aclocal.m4 2013-05-25 05:40:38.000000000 +0000 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.12.6 -*- Autoconf -*- + +# Copyright (C) 1996-2012 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,13 +13,13 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, -[m4_warning([this file was generated for autoconf 2.67. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -31,10 +31,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.12' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.12.6], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,22 +50,22 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.12.6])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -84,7 +84,7 @@ # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -110,22 +110,19 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -144,16 +141,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -163,7 +158,7 @@ # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -176,12 +171,13 @@ AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -189,8 +185,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -229,16 +226,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -247,16 +244,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -304,7 +301,7 @@ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -314,28 +311,33 @@ # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ @@ -354,7 +356,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -366,21 +368,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` test -z "am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -398,7 +398,7 @@ # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -408,15 +408,12 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -461,31 +458,41 @@ # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], +[$0: two- and three-arguments forms are deprecated. For more info, see: +http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -496,28 +503,35 @@ [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +dnl Support for Objective C++ was only introduced in Autoconf 2.65, +dnl but we still cater to Autoconf 2.62. +m4_ifdef([AC_PROG_OBJCXX], +[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl ]) _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl ]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], @@ -545,7 +559,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -564,16 +578,14 @@ install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -589,14 +601,12 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -614,7 +624,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -641,15 +651,12 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -657,7 +664,6 @@ $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ # Define MISSING if not defined so far and test if it supports --run. @@ -678,11 +684,11 @@ am_missing_run="$MISSING --run " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -690,10 +696,15 @@ # AM_PROG_MKDIR_P # --------------- -# Check for `mkdir -p'. +# Check for 'mkdir -p'. AC_DEFUN([AM_PROG_MKDIR_P], [AC_PREREQ([2.60])dnl AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl FIXME to be removed in Automake 1.13. +AC_DIAGNOSE([obsolete], +[$0: this macro is deprecated, and will soon be removed. +You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead, +and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.]) dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, dnl while keeping a definition of mkdir_p for backward compatibility. dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. @@ -710,27 +721,25 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -743,22 +752,16 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -769,32 +772,40 @@ esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -804,9 +815,25 @@ AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -814,34 +841,32 @@ # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -849,24 +874,22 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -877,10 +900,11 @@ # a tarball read from stdin. # $(am__untar) < result.tar AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], [m4_case([$1], [ustar],, [pax],, [m4_fatal([Unknown tar format])]) AC_MSG_CHECKING([how to create a $1 tar archive]) @@ -888,7 +912,7 @@ _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' _am_tools=${am_cv_prog_tar_$1-$_am_tools} # Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. +# Solaris sh will not grok spaces in the rhs of '-'. for _am_tool in $_am_tools do case $_am_tool in @@ -949,7 +973,6 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -m4_include([m4/acx_pthread.m4]) m4_include([m4/ax_check_gl.m4]) m4_include([m4/ax_check_glu.m4]) m4_include([m4/ax_check_glut.m4]) diff -Nru chromium-bsu-0.9.15/chromium-bsu-config.h.in chromium-bsu-0.9.15.1/chromium-bsu-config.h.in --- chromium-bsu-0.9.15/chromium-bsu-config.h.in 2011-02-14 03:55:03.000000000 +0000 +++ chromium-bsu-0.9.15.1/chromium-bsu-config.h.in 2013-05-25 05:40:39.000000000 +0000 @@ -104,9 +104,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_OPENGL_GL_H -/* Define if you have POSIX threads libraries and header files. */ -#undef HAVE_PTHREAD - /* Define to 1 if you have the header file. */ #undef HAVE_QUESOGLC_GLC_H @@ -199,10 +196,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Define to necessary symbol if this constant uses a non-standard name on - your system. */ -#undef PTHREAD_CREATE_JOINABLE - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff -Nru chromium-bsu-0.9.15/config.guess chromium-bsu-0.9.15.1/config.guess --- chromium-bsu-0.9.15/config.guess 2010-03-06 13:24:27.000000000 +0000 +++ chromium-bsu-0.9.15.1/config.guess 2012-06-08 16:15:38.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2009-12-30' +timestamp='2012-02-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -57,8 +55,8 @@ Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -145,7 +143,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -181,7 +179,7 @@ fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -224,7 +222,7 @@ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -270,7 +268,10 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -296,7 +297,7 @@ echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} @@ -395,23 +396,23 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -481,8 +482,8 @@ echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -495,7 +496,7 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -552,7 +553,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -595,52 +596,52 @@ 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -731,22 +732,22 @@ exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -770,14 +771,14 @@ exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -789,13 +790,12 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -804,15 +804,18 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@ -858,6 +861,13 @@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -867,7 +877,7 @@ EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac + esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} @@ -879,20 +889,29 @@ then echo ${UNAME_MACHINE}-unknown-linux-gnu else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + fi fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -934,7 +953,7 @@ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu @@ -960,7 +979,7 @@ echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -968,14 +987,17 @@ sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -984,11 +1006,11 @@ echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1020,7 +1042,7 @@ fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1048,13 +1070,13 @@ exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp - exit ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1089,8 +1111,8 @@ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1133,10 +1155,10 @@ echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1162,11 +1184,11 @@ exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1231,6 +1253,9 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; @@ -1276,13 +1301,13 @@ echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1300,6 +1325,9 @@ i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1322,11 +1350,11 @@ #include printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff -Nru chromium-bsu-0.9.15/config.sub chromium-bsu-0.9.15.1/config.sub --- chromium-bsu-0.9.15/config.sub 2010-03-06 13:24:27.000000000 +0000 +++ chromium-bsu-0.9.15.1/config.sub 2012-06-08 16:15:38.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2010-01-22' +timestamp='2012-04-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,9 +21,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -76,8 +74,8 @@ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -124,13 +122,18 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -157,8 +160,8 @@ os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -174,10 +177,10 @@ os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -222,6 +225,12 @@ -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -246,17 +255,22 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ | maxq | mb | microblaze | mcore | mep | metag \ @@ -282,29 +296,39 @@ | moxie \ | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ + | open8 \ | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -314,6 +338,21 @@ basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -328,21 +367,25 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ @@ -368,26 +411,29 @@ | mmix-* \ | mt-* \ | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile-* | tilegx-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -412,7 +458,7 @@ basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -482,11 +528,20 @@ basic_machine=powerpc-ibm os=-cnk ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -518,7 +573,7 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -676,7 +731,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -734,7 +788,7 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze) basic_machine=microblaze-xilinx ;; mingw32) @@ -773,10 +827,18 @@ ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -841,6 +903,12 @@ np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -923,9 +991,10 @@ ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -1019,6 +1088,9 @@ basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1075,25 +1147,8 @@ basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; - # This must be matched before tile*. - tilegx*) - basic_machine=tilegx-unknown - os=-linux-gnu - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1163,6 +1218,9 @@ xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1260,11 +1318,11 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + -auroraux) + os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -1300,8 +1358,9 @@ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1348,7 +1407,7 @@ -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1397,7 +1456,7 @@ -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1442,8 +1501,8 @@ -dicos*) os=-dicos ;; - -nacl*) - ;; + -nacl*) + ;; -none) ;; *) @@ -1466,10 +1525,10 @@ # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1481,8 +1540,20 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1502,14 +1573,11 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1536,7 +1604,7 @@ *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) diff -Nru chromium-bsu-0.9.15/configure chromium-bsu-0.9.15.1/configure --- chromium-bsu-0.9.15/configure 2011-02-14 03:55:03.000000000 +0000 +++ chromium-bsu-0.9.15.1/configure 2013-05-25 05:40:39.000000000 +0000 @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for Chromium B.S.U. 0.9.15. +# Generated by GNU Autoconf 2.69 for Chromium B.S.U. 0.9.15.1. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -91,6 +89,7 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -135,6 +134,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -168,7 +192,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -213,14 +238,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -323,6 +359,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -444,6 +488,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -478,16 +526,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -499,28 +547,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -552,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='Chromium B.S.U.' PACKAGE_TARNAME='chromium-bsu' -PACKAGE_VERSION='0.9.15' -PACKAGE_STRING='Chromium B.S.U. 0.9.15' +PACKAGE_VERSION='0.9.15.1' +PACKAGE_STRING='Chromium B.S.U. 0.9.15.1' PACKAGE_BUGREPORT='http://sf.net/projects/chromium-bsu/bugs' PACKAGE_URL='' @@ -606,6 +634,10 @@ WINDOW_CFLAGS TEXT_CFLAGS TEXT_LIBS +SDLIMAGE_LIBS +SDLIMAGE_CFLAGS +SDLMIXER_LIBS +SDLMIXER_CFLAGS FREEALUT_LIBS FREEALUT_CFLAGS OPENAL_LIBS @@ -626,10 +658,7 @@ GLU_CFLAGS GL_LIBS GL_CFLAGS -PTHREAD_CFLAGS -PTHREAD_LIBS -PTHREAD_CC -acx_pthread_config +SED XMKMF POSUB LTLIBINTL @@ -672,6 +701,7 @@ am__fastdepCXX_FALSE am__fastdepCXX_TRUE CXXDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -793,7 +823,11 @@ OPENAL_CFLAGS OPENAL_LIBS FREEALUT_CFLAGS -FREEALUT_LIBS' +FREEALUT_LIBS +SDLMIXER_CFLAGS +SDLMIXER_LIBS +SDLIMAGE_CFLAGS +SDLIMAGE_LIBS' # Initialize some variables set by options. @@ -1198,7 +1232,7 @@ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1249,8 +1283,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1336,7 +1368,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Chromium B.S.U. 0.9.15 to adapt to many kinds of systems. +\`configure' configures Chromium B.S.U. 0.9.15.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1410,7 +1442,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Chromium B.S.U. 0.9.15:";; + short | recursive ) echo "Configuration of Chromium B.S.U. 0.9.15.1:";; esac cat <<\_ACEOF @@ -1418,8 +1450,10 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --disable-nls do not use Native Language Support --disable-rpath do not hardcode runtime library paths --disable-glc do not use GLC @@ -1480,6 +1514,14 @@ C compiler flags for FREEALUT, overriding pkg-config FREEALUT_LIBS linker flags for FREEALUT, overriding pkg-config + SDLMIXER_CFLAGS + C compiler flags for SDLMIXER, overriding pkg-config + SDLMIXER_LIBS + linker flags for SDLMIXER, overriding pkg-config + SDLIMAGE_CFLAGS + C compiler flags for SDLIMAGE, overriding pkg-config + SDLIMAGE_LIBS + linker flags for SDLIMAGE, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1547,10 +1589,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Chromium B.S.U. configure 0.9.15 -generated by GNU Autoconf 2.67 +Chromium B.S.U. configure 0.9.15.1 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1594,7 +1636,7 @@ ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_cxx_try_compile @@ -1632,7 +1674,7 @@ ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1669,7 +1711,7 @@ ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -1711,7 +1753,7 @@ ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -1724,10 +1766,10 @@ ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval "test \"\${$3+set}\"" = set; then : + if eval \${$3+:} false; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1794,7 +1836,7 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -1803,7 +1845,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_mongrel @@ -1816,7 +1858,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1834,7 +1876,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -1847,7 +1889,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=no" @@ -1888,7 +1930,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_type @@ -1919,7 +1961,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1933,7 +1975,7 @@ # interfere with the next link command; also delete a directory that is # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -1946,7 +1988,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2001,15 +2043,15 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Chromium B.S.U. $as_me 0.9.15, which was -generated by GNU Autoconf 2.67. Invocation command line was +It was created by Chromium B.S.U. $as_me 0.9.15.1, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2267,7 +2309,7 @@ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2357,7 +2399,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.11' +am__api_version='1.12' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2405,7 +2447,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then : +if ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2425,7 +2467,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2483,45 +2525,50 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -2533,6 +2580,16 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -2559,8 +2616,8 @@ am_missing_run="$MISSING --run " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -2572,17 +2629,17 @@ esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then : +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -2594,7 +2651,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2622,7 +2679,7 @@ set dummy strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -2634,7 +2691,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2675,7 +2732,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then : + if ${ac_cv_path_mkdir+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2685,7 +2742,7 @@ test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2714,19 +2771,13 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then : +if ${ac_cv_prog_AWK+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2738,7 +2789,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2766,7 +2817,7 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2824,7 +2875,7 @@ # Define the identity of the package. PACKAGE='chromium-bsu' - VERSION='0.9.15' + VERSION='0.9.15.1' cat >>confdefs.h <<_ACEOF @@ -2852,13 +2903,19 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' -AMTAR=${AMTAR-"${am_missing_run}tar"} - -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -2886,7 +2943,7 @@ set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then : +if ${ac_cv_prog_CXX+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then @@ -2898,7 +2955,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2930,7 +2987,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : +if ${ac_cv_prog_ac_ct_CXX+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CXX"; then @@ -2942,7 +2999,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3094,7 +3151,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C++ compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3137,7 +3194,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3196,7 +3253,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run C++ compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -3207,7 +3264,7 @@ ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then : +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3248,7 +3305,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -3258,7 +3315,7 @@ ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : +if ${ac_cv_cxx_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3295,7 +3352,7 @@ ac_save_CXXFLAGS=$CXXFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 $as_echo_n "checking whether $CXX accepts -g... " >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then : +if ${ac_cv_prog_cxx_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_cxx_werror_flag=$ac_cxx_werror_flag @@ -3395,7 +3452,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -3428,6 +3485,7 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -3443,15 +3501,16 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then : +if ${am_cv_CXX_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -3485,16 +3544,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -3503,16 +3562,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -3572,13 +3631,14 @@ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -3592,7 +3652,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3621,7 +3681,7 @@ set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in @@ -3635,7 +3695,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3697,7 +3757,7 @@ set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3709,7 +3769,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3737,7 +3797,7 @@ set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3749,7 +3809,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3790,7 +3850,7 @@ set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3802,7 +3862,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3830,7 +3890,7 @@ set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3843,7 +3903,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3889,7 +3949,7 @@ set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3901,7 +3961,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3933,7 +3993,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3945,7 +4005,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3988,7 +4048,7 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -4017,7 +4077,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4054,7 +4114,7 @@ ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -4132,7 +4192,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -4141,8 +4201,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -4231,15 +4290,16 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : +if ${am_cv_CC_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -4273,16 +4333,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -4291,16 +4351,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -4367,7 +4427,7 @@ CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then : + if ${ac_cv_prog_CPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -4483,7 +4543,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -4495,7 +4555,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then : +if ${ac_cv_path_GREP+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -4509,7 +4569,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4558,7 +4618,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then : +if ${ac_cv_path_EGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -4575,7 +4635,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4625,7 +4685,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4769,84 +4829,66 @@ # Types and compiler bits { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 $as_echo_n "checking for stdbool.h that conforms to C99... " >&6; } -if test "${ac_cv_header_stdbool_h+set}" = set; then : +if ${ac_cv_header_stdbool_h+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#ifndef bool - "error: bool is not defined" -#endif -#ifndef false - "error: false is not defined" -#endif -#if false - "error: false is not 0" -#endif -#ifndef true - "error: true is not defined" -#endif -#if true != 1 - "error: true is not 1" -#endif -#ifndef __bool_true_false_are_defined - "error: __bool_true_false_are_defined is not defined" -#endif - - struct s { _Bool s: 1; _Bool t; } s; - - char a[true == 1 ? 1 : -1]; - char b[false == 0 ? 1 : -1]; - char c[__bool_true_false_are_defined == 1 ? 1 : -1]; - char d[(bool) 0.5 == true ? 1 : -1]; - bool e = &s; - char f[(_Bool) 0.0 == false ? 1 : -1]; - char g[true]; - char h[sizeof (_Bool)]; - char i[sizeof s.t]; - enum { j = false, k = true, l = false * true, m = true * 256 }; - /* The following fails for - HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ - _Bool n[m]; - char o[sizeof n == m * sizeof n[0] ? 1 : -1]; - char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; -# if defined __xlc__ || defined __GNUC__ - /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0 - reported by James Lemley on 2005-10-05; see - http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html - This test is not quite right, since xlc is allowed to - reject this program, as the initializer for xlcbug is - not one of the forms that C requires support for. - However, doing the test right would require a runtime - test, and that would make cross-compilation harder. - Let us hope that IBM fixes the xlc bug, and also adds - support for this kind of constant expression. In the - meantime, this test will reject xlc, which is OK, since - our stdbool.h substitute should suffice. We also test - this with GCC, where it should work, to detect more - quickly whether someone messes up the test in the - future. */ - char digs[] = "0123456789"; - int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1); -# endif - /* Catch a bug in an HP-UX C compiler. See - http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html - http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html - */ - _Bool q = true; - _Bool *pq = &q; + #include + #ifndef bool + "error: bool is not defined" + #endif + #ifndef false + "error: false is not defined" + #endif + #if false + "error: false is not 0" + #endif + #ifndef true + "error: true is not defined" + #endif + #if true != 1 + "error: true is not 1" + #endif + #ifndef __bool_true_false_are_defined + "error: __bool_true_false_are_defined is not defined" + #endif + + struct s { _Bool s: 1; _Bool t; } s; + + char a[true == 1 ? 1 : -1]; + char b[false == 0 ? 1 : -1]; + char c[__bool_true_false_are_defined == 1 ? 1 : -1]; + char d[(bool) 0.5 == true ? 1 : -1]; + /* See body of main program for 'e'. */ + char f[(_Bool) 0.0 == false ? 1 : -1]; + char g[true]; + char h[sizeof (_Bool)]; + char i[sizeof s.t]; + enum { j = false, k = true, l = false * true, m = true * 256 }; + /* The following fails for + HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ + _Bool n[m]; + char o[sizeof n == m * sizeof n[0] ? 1 : -1]; + char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; + /* Catch a bug in an HP-UX C compiler. See + http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html + http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html + */ + _Bool q = true; + _Bool *pq = &q; int main () { - *pq |= q; - *pq |= ! q; - /* Refer to every declared value, to avoid compiler optimizations. */ - return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l - + !m + !n + !o + !p + !q + !pq); + bool e = &s; + *pq |= q; + *pq |= ! q; + /* Refer to every declared value, to avoid compiler optimizations. */ + return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l + + !m + !n + !o + !p + !q + !pq); ; return 0; @@ -4861,8 +4903,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 $as_echo "$ac_cv_header_stdbool_h" >&6; } -ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" -if test "x$ac_cv_type__Bool" = x""yes; then : + ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" +if test "x$ac_cv_type__Bool" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE__BOOL 1 @@ -4871,6 +4913,7 @@ fi + if test $ac_cv_header_stdbool_h = yes; then $as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h @@ -4879,7 +4922,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 $as_echo_n "checking for an ANSI C-conforming const... " >&6; } -if test "${ac_cv_c_const+set}" = set; then : +if ${ac_cv_c_const+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4888,11 +4931,11 @@ int main () { -/* FIXME: Include the comments suggested by Paul. */ + #ifndef __cplusplus - /* Ultrix mips cc rejects this. */ + /* Ultrix mips cc rejects this sort of thing. */ typedef int charset[2]; - const charset cs; + const charset cs = { 0, 0 }; /* SunOS 4.1.1 cc rejects this. */ char const *const *pcpcc; char **ppc; @@ -4909,8 +4952,9 @@ ++pcpcc; ppc = (char**) pcpcc; pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; + { /* SCO 3.2v4 cc rejects this sort of thing. */ + char tx; + char *t = &tx; char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; @@ -4926,10 +4970,10 @@ iptr p = 0; ++p; } - { /* AIX XL C 1.02.0.0 rejects this saying + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; + struct s { int j; const int *ap[3]; } bx; + struct s *b = &bx; b->j = 5; } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; @@ -4959,7 +5003,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 $as_echo_n "checking for inline... " >&6; } -if test "${ac_cv_c_inline+set}" = set; then : +if ${ac_cv_c_inline+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_c_inline=no @@ -5001,7 +5045,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } -if test "${ac_cv_struct_tm+set}" = set; then : +if ${ac_cv_struct_tm+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5039,7 +5083,7 @@ for ac_header in stdlib.h do : ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" -if test "x$ac_cv_header_stdlib_h" = x""yes; then : +if test "x$ac_cv_header_stdlib_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_STDLIB_H 1 _ACEOF @@ -5050,7 +5094,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5 $as_echo_n "checking for GNU libc compatible malloc... " >&6; } -if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then : +if ${ac_cv_func_malloc_0_nonnull+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -5105,7 +5149,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5 $as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; } -if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then : +if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then : $as_echo_n "(cached) " >&6 else rm -f conftest.sym conftest.file @@ -5167,7 +5211,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5 $as_echo_n "checking whether stat accepts an empty string... " >&6; } -if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then : +if ${ac_cv_func_stat_empty_string_bug+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -5214,13 +5258,13 @@ for ac_func in vprintf do : ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf" -if test "x$ac_cv_func_vprintf" = x""yes; then : +if test "x$ac_cv_func_vprintf" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_VPRINTF 1 _ACEOF ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt" -if test "x$ac_cv_func__doprnt" = x""yes; then : +if test "x$ac_cv_func__doprnt" = xyes; then : $as_echo "#define HAVE_DOPRNT 1" >>confdefs.h @@ -5257,6 +5301,13 @@ # gettext for internationalisation +mkdir_p="$MKDIR_P" +case $mkdir_p in + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 $as_echo_n "checking whether NLS is requested... " >&6; } # Check whether --enable-nls was given. @@ -5309,7 +5360,7 @@ set dummy msgfmt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGFMT+set}" = set; then : +if ${ac_cv_path_MSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case "$MSGFMT" in @@ -5350,7 +5401,7 @@ set dummy gmsgfmt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GMSGFMT+set}" = set; then : +if ${ac_cv_path_GMSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case $GMSGFMT in @@ -5364,7 +5415,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5432,7 +5483,7 @@ set dummy xgettext; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XGETTEXT+set}" = set; then : +if ${ac_cv_path_XGETTEXT+:} false; then : $as_echo_n "(cached) " >&6 else case "$XGETTEXT" in @@ -5510,7 +5561,7 @@ set dummy msgmerge; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGMERGE+set}" = set; then : +if ${ac_cv_path_MSGMERGE+:} false; then : $as_echo_n "(cached) " >&6 else case "$MSGMERGE" in @@ -5578,7 +5629,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then : +if ${ac_cv_build+:} false; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias @@ -5594,7 +5645,7 @@ $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -5612,7 +5663,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then : +if ${ac_cv_host+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then @@ -5627,7 +5678,7 @@ $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -5703,7 +5754,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${acl_cv_path_LD+set}" = set; then : +if ${acl_cv_path_LD+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -5740,7 +5791,7 @@ test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${acl_cv_prog_gnu_ld+set}" = set; then : +if ${acl_cv_prog_gnu_ld+:} false; then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU ld's only accept -v. @@ -5760,7 +5811,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5 $as_echo_n "checking for shared library run path origin... " >&6; } -if test "${acl_cv_rpath+set}" = set; then : +if ${acl_cv_rpath+:} false; then : $as_echo_n "(cached) " >&6 else @@ -5798,7 +5849,7 @@ solaris*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5 $as_echo_n "checking for 64-bit host... " >&6; } -if test "${gl_cv_solaris_64bit+set}" = set; then : +if ${gl_cv_solaris_64bit+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6345,7 +6396,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 $as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } -if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then : +if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then : $as_echo_n "(cached) " >&6 else gt_save_LIBS="$LIBS" @@ -6379,7 +6430,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5 $as_echo_n "checking for CFLocaleCopyCurrent... " >&6; } -if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then : +if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then : $as_echo_n "(cached) " >&6 else gt_save_LIBS="$LIBS" @@ -6455,7 +6506,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 $as_echo_n "checking for GNU gettext in libc... " >&6; } -if eval "test \"\${$gt_func_gnugettext_libc+set}\"" = set; then : +if eval \${$gt_func_gnugettext_libc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6518,7 +6569,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 $as_echo_n "checking for iconv... " >&6; } -if test "${am_cv_func_iconv+set}" = set; then : +if ${am_cv_func_iconv+:} false; then : $as_echo_n "(cached) " >&6 else @@ -6575,7 +6626,7 @@ if test "$am_cv_func_iconv" = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5 $as_echo_n "checking for working iconv... " >&6; } -if test "${am_cv_func_iconv_works+set}" = set; then : +if ${am_cv_func_iconv_works+:} false; then : $as_echo_n "(cached) " >&6 else @@ -7171,7 +7222,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 $as_echo_n "checking for GNU gettext in libintl... " >&6; } -if eval "test \"\${$gt_func_gnugettext_libintl+set}\"" = set; then : +if eval \${$gt_func_gnugettext_libintl+:} false; then : $as_echo_n "(cached) " >&6 else gt_save_CPPFLAGS="$CPPFLAGS" @@ -7364,8 +7415,8 @@ have_x=disabled else case $x_includes,$x_libraries in #( - *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( - *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : + *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( + *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : $as_echo_n "(cached) " >&6 else # One or both of the vars are not set, and there is no cached value. @@ -7542,352 +7593,74 @@ $as_echo "libraries $x_libraries, headers $x_includes" >&6; } fi - - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -acx_pthread_ok=no - -# We used to check for pthread.h first, but this fails if pthread.h -# requires special compiler flags (e.g. on True64 or Sequent). -# It gets checked for in the link test anyway. - -# First of all, check if the user has set any of the PTHREAD_LIBS, -# etcetera environment variables, and if threads linking works using -# them: -if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 -$as_echo_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char pthread_join (); -int -main () -{ -return pthread_join (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - acx_pthread_ok=yes -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5 -$as_echo "$acx_pthread_ok" >&6; } - if test x"$acx_pthread_ok" = xno; then - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" - fi - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" -fi - -# We must check for the threads library under a number of different -# names; the ordering is very important because some systems -# (e.g. DEC) have both -lpthread and -lpthreads, where one of the -# libraries is broken (non-POSIX). - -# Create a list of thread flags to try. Items starting with a "-" are -# C compiler flags, and other items are library names, except for "none" -# which indicates that we try without any flags at all, and "pthread-config" -# which is a program returning the flags for the Pth emulation library. - -acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" - -# The ordering *is* (sometimes) important. Some notes on the -# individual items follow: - -# pthreads: AIX (must check this before -lpthread) -# none: in case threads are in libc; should be tried before -Kthread and -# other compiler flags to prevent continual compiler warnings -# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) -# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) -# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) -# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) -# -pthreads: Solaris/gcc -# -mthreads: Mingw32/gcc, Lynx/gcc -# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it -# doesn't hurt to check since this sometimes defines pthreads too; -# also defines -D_REENTRANT) -# ... -mt is also the pthreads flag for HP/aCC -# pthread: Linux, etcetera -# --thread-safe: KAI C++ -# pthread-config: use pthread-config program (for GNU Pth library) - -case "${host_cpu}-${host_os}" in - *solaris*) - - # On Solaris (at least, for some versions), libc contains stubbed - # (non-functional) versions of the pthreads routines, so link-based - # tests will erroneously succeed. (We need to link with -pthreads/-mt/ - # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather - # a function called by this macro, so we could check for that, but - # who knows whether they'll stub that too in a future libc.) So, - # we'll just look for -pthreads and -lpthread first: - - acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags" - ;; -esac - -if test x"$acx_pthread_ok" = xno; then -for flag in $acx_pthread_flags; do - - case $flag in - none) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5 -$as_echo_n "checking whether pthreads work without any flags... " >&6; } - ;; - - -*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5 -$as_echo_n "checking whether pthreads work with $flag... " >&6; } - PTHREAD_CFLAGS="$flag" - ;; - - pthread-config) - # Extract the first word of "pthread-config", so it can be a program name with args. -set dummy pthread-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_acx_pthread_config+set}" = set; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if ${ac_cv_path_SED+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$acx_pthread_config"; then - ac_cv_prog_acx_pthread_config="$acx_pthread_config" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. + for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_acx_pthread_config="yes" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_SED" || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_acx_pthread_config" && ac_cv_prog_acx_pthread_config="no" -fi -fi -acx_pthread_config=$ac_cv_prog_acx_pthread_config -if test -n "$acx_pthread_config"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_config" >&5 -$as_echo "$acx_pthread_config" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - if test x"$acx_pthread_config" = xno; then continue; fi - PTHREAD_CFLAGS="`pthread-config --cflags`" - PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" - ;; - - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5 -$as_echo_n "checking for the pthreads library -l$flag... " >&6; } - PTHREAD_LIBS="-l$flag" - ;; - esac - - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Check for various functions. We must include pthread.h, - # since some functions may be macros. (On the Sequent, we - # need a special flag -Kthread to make this header compile.) - # We check for pthread_join because it is in -lpthread on IRIX - # while pthread_create is in libc. We check for pthread_attr_init - # due to DEC craziness with -lpthreads. We check for - # pthread_cleanup_push because it is one of the few pthread - # functions on Solaris that doesn't have a non-functional libc stub. - # We try pthread_create on general principles. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -pthread_t th; pthread_join(th, 0); - pthread_attr_init(0); pthread_cleanup_push(0, 0); - pthread_create(0,0,0,0); pthread_cleanup_pop(0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - acx_pthread_ok=yes -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5 -$as_echo "$acx_pthread_ok" >&6; } - if test "x$acx_pthread_ok" = xyes; then - break; - fi - - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" -done -fi - -# Various other checks: -if test "x$acx_pthread_ok" = xyes; then - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 -$as_echo_n "checking for joinable pthread attribute... " >&6; } - attr_name=unknown - for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -int attr=$attr; return attr; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - attr_name=$attr; break -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $attr_name" >&5 -$as_echo "$attr_name" >&6; } - if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then - -cat >>confdefs.h <<_ACEOF -#define PTHREAD_CREATE_JOINABLE $attr_name -_ACEOF - - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5 -$as_echo_n "checking if more special flags are required for pthreads... " >&6; } - flag=no - case "${host_cpu}-${host_os}" in - *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; - *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5 -$as_echo "${flag}" >&6; } - if test "x$flag" != xno; then - PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" - fi - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac - # More AIX lossage: must compile with xlc_r or cc_r - if test x"$GCC" != xyes; then - for ac_prog in xlc_r cc_r -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$PTHREAD_CC"; then - ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_PTHREAD_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + $ac_path_SED_found && break 3 + done + done done IFS=$as_save_IFS - -fi -fi -PTHREAD_CC=$ac_cv_prog_PTHREAD_CC -if test -n "$PTHREAD_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5 -$as_echo "$PTHREAD_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$PTHREAD_CC" && break -done -test -n "$PTHREAD_CC" || PTHREAD_CC="${CC}" - - else - PTHREAD_CC=$CC - fi + if test -z "$ac_cv_path_SED"; then + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi else - PTHREAD_CC="$CC" + ac_cv_path_SED=$SED fi - - - - -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -if test x"$acx_pthread_ok" = xyes; then - -$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h - - : -else - acx_pthread_ok=no - fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed ac_ext=c @@ -7898,7 +7671,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the Microsoft C compiler" >&5 $as_echo_n "checking whether we are using the Microsoft C compiler... " >&6; } -if test "${ax_cv_c_compiler_ms+set}" = set; then : +if ${ax_cv_c_compiler_ms+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -7926,77 +7699,80 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_c_compiler_ms" >&5 $as_echo "$ax_cv_c_compiler_ms" >&6; } -if test X$ax_compiler_ms = Xno; then : - GL_CFLAGS="${PTHREAD_CFLAGS}"; GL_LIBS="${PTHREAD_LIBS} -lm" -fi # # Use x_includes and x_libraries if they have been set (presumably by # AC_PATH_X). # -if test "X$no_x" != "Xyes"; then : - if test -n "$x_includes"; then : - GL_CFLAGS="-I${x_includes} ${GL_CFLAGS}" -fi - if test -n "$x_libraries"; then : - GL_LIBS="-L${x_libraries} -lX11 ${GL_LIBS}" -fi +if test X$no_x != Xyes -a -n "$x_includes"; then : + GL_CFLAGS="-I$x_includes $GL_CFLAGS" fi -ax_save_CPPFLAGS="${CPPFLAGS}" -CPPFLAGS="${GL_CFLAGS} ${CPPFLAGS}" -for ac_header in GL/gl.h OpenGL/gl.h +for ac_header in windows.h do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + ac_fn_c_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default" +if test "x$ac_cv_header_windows_h" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_WINDOWS_H 1 _ACEOF fi done -CPPFLAGS="${ax_save_CPPFLAGS}" -for ac_header in windows.h +ax_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$GL_CFLAGS $CPPFLAGS" +for ac_header in GL/gl.h OpenGL/gl.h do : - ac_fn_c_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default" -if test "x$ac_cv_header_windows_h" = x""yes; then : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " +# if defined(HAVE_WINDOWS_H) && defined(_WIN32) +# include +# endif + +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define HAVE_WINDOWS_H 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi done +CPPFLAGS=$ax_save_CPPFLAGS + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL library" >&5 $as_echo_n "checking for OpenGL library... " >&6; } -if test "${ax_cv_check_gl_libgl+set}" = set; then : +if ${ax_cv_check_gl_libgl+:} false; then : $as_echo_n "(cached) " >&6 else - ax_cv_check_gl_libgl="no" + ax_cv_check_gl_libgl=no case $host_cpu in x86_64) ax_check_gl_libdir=lib64 ;; *) ax_check_gl_libdir=lib ;; esac -ax_save_CPPFLAGS="${CPPFLAGS}" -CPPFLAGS="${GL_CFLAGS} ${CPPFLAGS}" -ax_save_LIBS="${LIBS}" -LIBS="" +ax_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $GL_CFLAGS" +ax_save_LDFLAGS=$LDFLAGS +if test X$no_x != Xyes -a -n "$x_libraries"; then : + LDFLAGS="$LDFLAGS -L$x_libraries" +fi +ax_save_LIBS=$LIBS ax_check_libs="-lopengl32 -lGL" -for ax_lib in ${ax_check_libs}; do +for ax_lib in $ax_check_libs; do if test X$ax_compiler_ms = Xyes; then : - ax_try_lib=`echo $ax_lib | sed -e 's/^-l//' -e 's/$/.lib/'` + ax_try_lib=`echo $ax_lib | $SED -e 's/^-l//' -e 's/$/.lib/'` else - ax_try_lib="${ax_lib}" + ax_try_lib=$ax_lib fi - LIBS="${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}" + LDFLAGS="$ax_save_LDFLAGS $GL_LIBS" + LIBS="$ax_try_lib $ax_save_LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8019,10 +7795,11 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ax_cv_check_gl_libgl="${ax_try_lib}"; break + ax_cv_check_gl_libgl=$ax_try_lib; break else - ax_check_gl_nvidia_flags="-L/usr/${ax_check_gl_libdir}/nvidia" LIBS="${ax_try_lib} ${ax_check_gl_nvidia_flags} ${GL_LIBS} ${ax_save_LIBS}" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ax_check_gl_dylib_flag='-dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib' + LDFLAGS="$ax_save_LDFLAGS $GL_LIBS $ax_check_gl_dylib_flag" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ # if defined(HAVE_WINDOWS_H) && defined(_WIN32) @@ -8044,11 +7821,27 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ax_cv_check_gl_libgl="${ax_try_lib} ${ax_check_gl_nvidia_flags}"; break -else - ax_check_gl_dylib_flag='-dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib' LIBS="${ax_try_lib} ${ax_check_gl_dylib_flag} ${GL_LIBS} ${ax_save_LIBS}" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + ax_cv_check_gl_libgl="$ax_check_gl_dylib_flag $ax_try_lib"; break +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +done + +# +# If no_x is "yes", we don't want to wind up using a libGL that is +# linked with X11. Test to see if the found libGL includes GLX +# functions. If it does and no_x is "yes", we want to reset +# ax_cv_check_gl_libgl back to "no". +# +# Note that LDFLAGS and LIBS should still have whatever values they +# had when we broke out of the test loop above; use that. +# +if test "X$ax_cv_check_gl_libgl" != Xno; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ # if defined(HAVE_WINDOWS_H) && defined(_WIN32) # include @@ -8063,27 +7856,24 @@ int main () { -glBegin(0) +glXQueryVersion(0, 0, 0) ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ax_cv_check_gl_libgl="${ax_try_lib} ${ax_check_gl_dylib_flag}"; break + if test X$no_x = Xyes; then : + ax_cv_check_gl_libgl=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -done -if test "X$ax_cv_check_gl_libgl" = Xno -a "X$no_x" = Xyes; then : - LIBS='-framework OpenGL' -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +LIBS=$ax_save_LIBS +if test "X$ax_cv_check_gl_libgl" = Xno -a X$no_x = Xyes; then : + LDFLAGS="$ax_save_LDFLAGS -framework OpenGL" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ # if defined(HAVE_WINDOWS_H) && defined(_WIN32) @@ -8105,14 +7895,14 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ax_cv_check_gl_libgl="$LIBS" + ax_cv_check_gl_libgl='-framework OpenGL' fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -LIBS=${ax_save_LIBS} -CPPFLAGS=${ax_save_CPPFLAGS} +LDFLAGS=$ax_save_LDFLAGS +CPPFLAGS=$ax_save_CPPFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_gl_libgl" >&5 $as_echo "$ax_cv_check_gl_libgl" >&6; } @@ -8120,7 +7910,7 @@ if test "X$ax_cv_check_gl_libgl" = Xno; then : no_gl=yes; GL_CFLAGS=""; GL_LIBS="" else - GL_LIBS="${ax_cv_check_gl_libgl} ${GL_LIBS}" + GL_LIBS="$ax_cv_check_gl_libgl $GL_LIBS" fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -8132,14 +7922,20 @@ -GLU_CFLAGS="${GL_CFLAGS}" -ax_save_CPPFLAGS="${CPPFLAGS}" -CPPFLAGS="${GL_CFLAGS} ${CPPFLAGS}" +GLU_CFLAGS=$GL_CFLAGS + +ax_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$GL_CFLAGS $CPPFLAGS" for ac_header in GL/glu.h OpenGL/glu.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " +# if defined(HAVE_WINDOWS_H) && defined(_WIN32) +# include +# endif + +" if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -8149,25 +7945,26 @@ done -CPPFLAGS="${ax_save_CPPFLAGS}" +CPPFLAGS=$ax_save_CPPFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL Utility library" >&5 $as_echo_n "checking for OpenGL Utility library... " >&6; } -if test "${ax_cv_check_glu_libglu+set}" = set; then : +if ${ax_cv_check_glu_libglu+:} false; then : $as_echo_n "(cached) " >&6 else - ax_cv_check_glu_libglu="no" -ax_save_CPPFLAGS="${CPPFLAGS}" -CPPFLAGS="${GL_CFLAGS} ${CPPFLAGS}" -ax_save_LIBS="${LIBS}" + ax_cv_check_glu_libglu=no +ax_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$GL_CFLAGS $CPPFLAGS" +ax_save_LDFLAGS=$LDFLAGS +ax_save_LIBS=$LIBS # # First, check for the possibility that everything we need is already in # GL_LIBS. # -LIBS="${GL_LIBS} ${ax_save_LIBS}" +LDFLAGS="$ax_save_LDFLAGS $GL_LIBS" # # libGLU typically links with libstdc++ on POSIX platforms. # However, setting the language to C++ means that test program @@ -8213,15 +8010,15 @@ ax_cv_check_glu_libglu=yes else LIBS="" -ax_check_libs="-lglu32 -lGLU" -for ax_lib in ${ax_check_libs}; do - if test X$ax_compiler_ms = Xyes; then : - ax_try_lib=`echo $ax_lib | sed -e 's/^-l//' -e 's/$/.lib/'` + ax_check_libs="-lglu32 -lGLU" + for ax_lib in ${ax_check_libs}; do + if test X$ax_compiler_ms = Xyes; then : + ax_try_lib=`echo $ax_lib | $SED -e 's/^-l//' -e 's/$/.lib/'` else - ax_try_lib="${ax_lib}" + ax_try_lib=$ax_lib fi - LIBS="${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + LIBS="$ax_try_lib $ax_save_LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ # if defined(HAVE_WINDOWS_H) && defined(_WIN32) @@ -8243,12 +8040,11 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ax_cv_check_glu_libglu="${ax_try_lib}"; break + ax_cv_check_glu_libglu=$ax_try_lib; break fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -done - + done fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -8267,8 +8063,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -LIBS=${ax_save_LIBS} -CPPFLAGS=${ax_save_CPPFLAGS} +LIBS=$ax_save_LIBS +LDFLAGS=$ax_save_LDFLAGS +CPPFLAGS=$ax_save_CPPFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_glu_libglu" >&5 $as_echo "$ax_cv_check_glu_libglu" >&6; } @@ -8276,9 +8073,9 @@ no_glu=yes; GLU_CFLAGS=""; GLU_LIBS="" else if test "X$ax_cv_check_glu_libglu" = Xyes; then : - GLU_LIBS="$GL_LIBS" + GLU_LIBS="" else - GLU_LIBS="${ax_cv_check_glu_libglu} ${GL_LIBS}" + GLU_LIBS="$ax_cv_check_glu_libglu" fi fi @@ -8286,18 +8083,24 @@ # # Some versions of Mac OS X include a broken interpretation of the GLU -# tesselation callback function signature. +# tesselation callback function signature when using the C++ compiler. # if test "X$ax_cv_check_glu_libglu" != Xno; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for varargs GLU tesselator callback function type" >&5 $as_echo_n "checking for varargs GLU tesselator callback function type... " >&6; } -if test "${ax_cv_varargs_glu_tesscb+set}" = set; then : +if ${ax_cv_varargs_glu_tesscb+:} false; then : $as_echo_n "(cached) " >&6 else - ax_cv_varargs_glu_tesscb=no -ax_save_CFLAGS="$CFLAGS" -CFLAGS="$GL_CFLAGS $CFLAGS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + ax_cv_varargs_glu_tesscb=no + ax_save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$GL_CFLAGS $CXXFLAGS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ # ifdef HAVE_GL_GLU_H @@ -8313,15 +8116,21 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO"; then : ax_cv_varargs_glu_tesscb=yes fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -CFLAGS="$ax_save_CFLAGS" + CXXFLAGS=$ax_save_CXXFLAGS + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_varargs_glu_tesscb" >&5 $as_echo "$ax_cv_varargs_glu_tesscb" >&6; } -if test X$ax_cv_varargs_glu_tesscb = Xyes; then : + if test X$ax_cv_varargs_glu_tesscb = Xyes; then : $as_echo "#define HAVE_VARARGS_GLU_TESSCB 1" >>confdefs.h @@ -8345,7 +8154,7 @@ for ac_header in GL/glc.h do : ac_fn_c_check_header_mongrel "$LINENO" "GL/glc.h" "ac_cv_header_GL_glc_h" "$ac_includes_default" -if test "x$ac_cv_header_GL_glc_h" = x""yes; then : +if test "x$ac_cv_header_GL_glc_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_GL_GLC_H 1 _ACEOF @@ -8359,7 +8168,7 @@ for ac_header in QuesoGLC/glc.h do : ac_fn_c_check_header_mongrel "$LINENO" "QuesoGLC/glc.h" "ac_cv_header_QuesoGLC_glc_h" "$ac_includes_default" -if test "x$ac_cv_header_QuesoGLC_glc_h" = x""yes; then : +if test "x$ac_cv_header_QuesoGLC_glc_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_QUESOGLC_GLC_H 1 _ACEOF @@ -8372,7 +8181,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glcGenContext in -lGLC" >&5 $as_echo_n "checking for glcGenContext in -lGLC... " >&6; } -if test "${ac_cv_lib_GLC_glcGenContext+set}" = set; then : +if ${ac_cv_lib_GLC_glcGenContext+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -8406,7 +8215,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLC_glcGenContext" >&5 $as_echo "$ac_cv_lib_GLC_glcGenContext" >&6; } -if test "x$ac_cv_lib_GLC_glcGenContext" = x""yes; then : +if test "x$ac_cv_lib_GLC_glcGenContext" = xyes; then : HAVE_GLC_LIB=yes else HAVE_GLC_LIB=no @@ -8414,7 +8223,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glcGenContext in -lglc32" >&5 $as_echo_n "checking for glcGenContext in -lglc32... " >&6; } -if test "${ac_cv_lib_glc32_glcGenContext+set}" = set; then : +if ${ac_cv_lib_glc32_glcGenContext+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -8448,7 +8257,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_glc32_glcGenContext" >&5 $as_echo "$ac_cv_lib_glc32_glcGenContext" >&6; } -if test "x$ac_cv_lib_glc32_glcGenContext" = x""yes; then : +if test "x$ac_cv_lib_glc32_glcGenContext" = xyes; then : HAVE_GLC32_LIB=yes else HAVE_GLC32_LIB=no @@ -8472,6 +8281,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FTGL_CFLAGS=`$PKG_CONFIG --cflags "ftgl >= 2.1.3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -8488,6 +8298,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FTGL_LIBS=`$PKG_CONFIG --libs "ftgl >= 2.1.3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -8507,9 +8318,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - FTGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ftgl >= 2.1.3" 2>&1` + FTGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ftgl >= 2.1.3" 2>&1` else - FTGL_PKG_ERRORS=`$PKG_CONFIG --print-errors "ftgl >= 2.1.3" 2>&1` + FTGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ftgl >= 2.1.3" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$FTGL_PKG_ERRORS" >&5 @@ -8555,6 +8366,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FONTCONFIG_CFLAGS=`$PKG_CONFIG --cflags "fontconfig" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -8571,6 +8383,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FONTCONFIG_LIBS=`$PKG_CONFIG --libs "fontconfig" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -8590,9 +8403,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "fontconfig" 2>&1` + FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fontconfig" 2>&1` else - FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --print-errors "fontconfig" 2>&1` + FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fontconfig" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$FONTCONFIG_PKG_ERRORS" >&5 @@ -8649,6 +8462,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl >= 1.1.6" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -8665,6 +8479,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl >= 1.1.6" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -8684,9 +8499,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sdl >= 1.1.6" 2>&1` + SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl >= 1.1.6" 2>&1` else - SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors "sdl >= 1.1.6" 2>&1` + SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl >= 1.1.6" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$SDL_PKG_ERRORS" >&5 @@ -8806,7 +8621,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then : +if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -8840,14 +8655,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then : +if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then : +if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -8881,7 +8696,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then : +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi @@ -8900,14 +8715,14 @@ # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" -if test "x$ac_cv_func_gethostbyname" = x""yes; then : +if test "x$ac_cv_func_gethostbyname" = xyes; then : fi if test $ac_cv_func_gethostbyname = no; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then : +if ${ac_cv_lib_nsl_gethostbyname+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -8941,14 +8756,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } -if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then : +if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then : +if ${ac_cv_lib_bsd_gethostbyname+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -8982,7 +8797,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } -if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then : +if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi @@ -8997,14 +8812,14 @@ # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" -if test "x$ac_cv_func_connect" = x""yes; then : +if test "x$ac_cv_func_connect" = xyes; then : fi if test $ac_cv_func_connect = no; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 $as_echo_n "checking for connect in -lsocket... " >&6; } -if test "${ac_cv_lib_socket_connect+set}" = set; then : +if ${ac_cv_lib_socket_connect+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -9038,7 +8853,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 $as_echo "$ac_cv_lib_socket_connect" >&6; } -if test "x$ac_cv_lib_socket_connect" = x""yes; then : +if test "x$ac_cv_lib_socket_connect" = xyes; then : X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" fi @@ -9046,14 +8861,14 @@ # Guillermo Gomez says -lposix is necessary on A/UX. ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove" -if test "x$ac_cv_func_remove" = x""yes; then : +if test "x$ac_cv_func_remove" = xyes; then : fi if test $ac_cv_func_remove = no; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 $as_echo_n "checking for remove in -lposix... " >&6; } -if test "${ac_cv_lib_posix_remove+set}" = set; then : +if ${ac_cv_lib_posix_remove+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -9087,7 +8902,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 $as_echo "$ac_cv_lib_posix_remove" >&6; } -if test "x$ac_cv_lib_posix_remove" = x""yes; then : +if test "x$ac_cv_lib_posix_remove" = xyes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi @@ -9095,14 +8910,14 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat" -if test "x$ac_cv_func_shmat" = x""yes; then : +if test "x$ac_cv_func_shmat" = xyes; then : fi if test $ac_cv_func_shmat = no; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 $as_echo_n "checking for shmat in -lipc... " >&6; } -if test "${ac_cv_lib_ipc_shmat+set}" = set; then : +if ${ac_cv_lib_ipc_shmat+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -9136,7 +8951,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 $as_echo "$ac_cv_lib_ipc_shmat" >&6; } -if test "x$ac_cv_lib_ipc_shmat" = x""yes; then : +if test "x$ac_cv_lib_ipc_shmat" = xyes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi @@ -9154,7 +8969,7 @@ # John Interrante, Karl Berry { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then : +if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -9188,7 +9003,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then : +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then : X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi @@ -9197,8 +9012,106 @@ fi -ax_save_CPPFLAGS="${CPPFLAGS}" -CPPFLAGS="${GLU_CFLAGS} ${CPPFLAGS}" +# +# Kilgard's GLUT need's both Xmu and Xi, while freeglut just needs Xi. +# It's also probably a good idea to accommodate the possibility of a +# GLUT implementation that needs neither. +# +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmuScreenOfWindow in -lXmu" >&5 +$as_echo_n "checking for XmuScreenOfWindow in -lXmu... " >&6; } +if ${ac_cv_lib_Xmu_XmuScreenOfWindow+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXmu $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XmuScreenOfWindow (); +int +main () +{ +return XmuScreenOfWindow (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_Xmu_XmuScreenOfWindow=yes +else + ac_cv_lib_Xmu_XmuScreenOfWindow=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xmu_XmuScreenOfWindow" >&5 +$as_echo "$ac_cv_lib_Xmu_XmuScreenOfWindow" >&6; } +if test "x$ac_cv_lib_Xmu_XmuScreenOfWindow" = xyes; then : + ax_check_glut_xmu_libs=-lXmu +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XIQueryVersion in -lXi" >&5 +$as_echo_n "checking for XIQueryVersion in -lXi... " >&6; } +if ${ac_cv_lib_Xi_XIQueryVersion+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXi $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XIQueryVersion (); +int +main () +{ +return XIQueryVersion (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_Xi_XIQueryVersion=yes +else + ac_cv_lib_Xi_XIQueryVersion=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xi_XIQueryVersion" >&5 +$as_echo "$ac_cv_lib_Xi_XIQueryVersion" >&6; } +if test "x$ac_cv_lib_Xi_XIQueryVersion" = xyes; then : + ax_check_glut_xi_libs=-lXi +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +ax_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$GLU_CFLAGS $CPPFLAGS" for ac_header in GL/glut.h GLUT/glut.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -9212,44 +9125,43 @@ done -CPPFLAGS="${ax_save_CPPFLAGS}" +CPPFLAGS=$ax_save_CPPFLAGS -GLUT_CFLAGS=${GLU_CFLAGS} -GLUT_LIBS=${GLU_LIBS} +GLUT_CFLAGS=$GLU_CFLAGS -# -# If X is present, assume GLUT depends on it. -# -if test X$no_x != Xyes; then : - GLUT_LIBS="${X_PRE_LIBS} -lXmu -lXi ${X_EXTRA_LIBS} ${GLUT_LIBS}" -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLUT library" >&5 $as_echo_n "checking for GLUT library... " >&6; } -if test "${ax_cv_check_glut_libglut+set}" = set; then : +if ${ax_cv_check_glut_libglut+:} false; then : $as_echo_n "(cached) " >&6 else - ax_cv_check_glut_libglut="no" + ax_cv_check_glut_libglut=no +# +# If X is present, assume GLUT depends on it. +# ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ax_save_CPPFLAGS="${CPPFLAGS}" -CPPFLAGS="${GLUT_CFLAGS} ${CPPFLAGS}" -ax_save_LIBS="${LIBS}" +ax_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$GLUT_CFLAGS $CPPFLAGS" +ax_save_LDFLAGS=$LDFLAGS +ax_save_LIBS=$LIBS LIBS="" +if test X$no_x != Xyes; then : + ax_check_glut_x_libs="$ax_check_glut_xmu_libs $ax_check_glut_xi_libs $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS" +fi ax_check_libs="-lglut32 -lglut" -for ax_lib in ${ax_check_libs}; do +for ax_lib in $ax_check_libs; do if test X$ax_compiler_ms = Xyes; then : - ax_try_lib=`echo $ax_lib | sed -e 's/^-l//' -e 's/$/.lib/'` + ax_try_lib=`echo $ax_lib | $SED -e 's/^-l//' -e 's/$/.lib/'` else - ax_try_lib="${ax_lib}" + ax_try_lib=$ax_lib fi - LIBS="${ax_try_lib} ${GLUT_LIBS} ${ax_save_LIBS}" + LIBS="$ax_try_lib $ax_check_glut_x_libs $ax_save_LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9272,15 +9184,16 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ax_cv_check_glut_libglut="${ax_try_lib}"; break + ax_cv_check_glut_libglut=$ax_try_lib; break fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext done -if test "X$ax_cv_check_glut_libglut" = Xno -a "X$no_x" = Xyes; then : - LIBS='-framework GLUT' -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +LIBS=$ax_save_LIBS +if test "X$ax_cv_check_glut_libglut" = Xno -a X$no_x = Xyes; then : + LDFLAGS="$ax_save_LDFLAGS -framework GLUT" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ # if HAVE_WINDOWS_H && defined(_WIN32) @@ -9302,14 +9215,14 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ax_cv_check_glut_libglut="$LIBS" + ax_cv_check_glut_libglut='-framework GLUT' fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -CPPFLAGS="${ax_save_CPPFLAGS}" -LIBS="${ax_save_LIBS}" +LDFLAGS=$ax_save_LDFLAGS +CPPFLAGS=$ax_save_CPPFLAGS ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -9321,9 +9234,9 @@ $as_echo "$ax_cv_check_glut_libglut" >&6; } if test "X$ax_cv_check_glut_libglut" = Xno; then : - no_glut="yes"; GLUT_CFLAGS=""; GLUT_LIBS="" + no_glut=yes; GLUT_CFLAGS=""; GLUT_LIBS="" else - GLUT_LIBS="${ax_cv_check_glut_libglut} ${GLUT_LIBS}" + GLUT_LIBS="$ax_cv_check_glut_libglut" fi @@ -9359,6 +9272,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OPENAL_CFLAGS=`$PKG_CONFIG --cflags "openal" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -9375,6 +9289,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OPENAL_LIBS=`$PKG_CONFIG --libs "openal" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -9394,9 +9309,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - OPENAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "openal" 2>&1` + OPENAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openal" 2>&1` else - OPENAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "openal" 2>&1` + OPENAL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openal" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$OPENAL_PKG_ERRORS" >&5 @@ -9428,6 +9343,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FREEALUT_CFLAGS=`$PKG_CONFIG --cflags "freealut" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -9444,6 +9360,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FREEALUT_LIBS=`$PKG_CONFIG --libs "freealut" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -9463,9 +9380,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - FREEALUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "freealut" 2>&1` + FREEALUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "freealut" 2>&1` else - FREEALUT_PKG_ERRORS=`$PKG_CONFIG --print-errors "freealut" 2>&1` + FREEALUT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "freealut" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$FREEALUT_PKG_ERRORS" >&5 @@ -9485,48 +9402,77 @@ fi if test "x$enable_sdlmixer" != xno ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mix_OpenAudio in -lSDL_mixer" >&5 -$as_echo_n "checking for Mix_OpenAudio in -lSDL_mixer... " >&6; } -if test "${ac_cv_lib_SDL_mixer_Mix_OpenAudio+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lSDL_mixer $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char Mix_OpenAudio (); -int -main () -{ -return Mix_OpenAudio (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_SDL_mixer_Mix_OpenAudio=yes +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDLMIXER" >&5 +$as_echo_n "checking for SDLMIXER... " >&6; } + +if test -n "$SDLMIXER_CFLAGS"; then + pkg_cv_SDLMIXER_CFLAGS="$SDLMIXER_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"SDL_mixer\""; } >&5 + ($PKG_CONFIG --exists --print-errors "SDL_mixer") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SDLMIXER_CFLAGS=`$PKG_CONFIG --cflags "SDL_mixer" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - ac_cv_lib_SDL_mixer_Mix_OpenAudio=no + pkg_failed=yes fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + else + pkg_failed=untried fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SDL_mixer_Mix_OpenAudio" >&5 -$as_echo "$ac_cv_lib_SDL_mixer_Mix_OpenAudio" >&6; } -if test "x$ac_cv_lib_SDL_mixer_Mix_OpenAudio" = x""yes; then : - HAVE_SDLMIXER=yes +if test -n "$SDLMIXER_LIBS"; then + pkg_cv_SDLMIXER_LIBS="$SDLMIXER_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"SDL_mixer\""; } >&5 + ($PKG_CONFIG --exists --print-errors "SDL_mixer") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SDLMIXER_LIBS=`$PKG_CONFIG --libs "SDL_mixer" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - HAVE_SDLMIXER=no + pkg_failed=yes +fi + else + pkg_failed=untried fi + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + SDLMIXER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "SDL_mixer" 2>&1` + else + SDLMIXER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "SDL_mixer" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$SDLMIXER_PKG_ERRORS" >&5 + + HAVE_SDLMIXER=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + HAVE_SDLMIXER=no +else + SDLMIXER_CFLAGS=$pkg_cv_SDLMIXER_CFLAGS + SDLMIXER_LIBS=$pkg_cv_SDLMIXER_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + HAVE_SDLMIXER=yes +fi fi # Need glpng or SDL_image so we can display PNG images using OpenGL @@ -9542,55 +9488,84 @@ if test "x$enable_sdlimage" != xno ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMG_Load in -lSDL_image" >&5 -$as_echo_n "checking for IMG_Load in -lSDL_image... " >&6; } -if test "${ac_cv_lib_SDL_image_IMG_Load+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lSDL_image $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char IMG_Load (); -int -main () -{ -return IMG_Load (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_SDL_image_IMG_Load=yes +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDLIMAGE" >&5 +$as_echo_n "checking for SDLIMAGE... " >&6; } + +if test -n "$SDLIMAGE_CFLAGS"; then + pkg_cv_SDLIMAGE_CFLAGS="$SDLIMAGE_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"SDL_image\""; } >&5 + ($PKG_CONFIG --exists --print-errors "SDL_image") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SDLIMAGE_CFLAGS=`$PKG_CONFIG --cflags "SDL_image" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - ac_cv_lib_SDL_image_IMG_Load=no + pkg_failed=yes fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + else + pkg_failed=untried +fi +if test -n "$SDLIMAGE_LIBS"; then + pkg_cv_SDLIMAGE_LIBS="$SDLIMAGE_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"SDL_image\""; } >&5 + ($PKG_CONFIG --exists --print-errors "SDL_image") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SDLIMAGE_LIBS=`$PKG_CONFIG --libs "SDL_image" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SDL_image_IMG_Load" >&5 -$as_echo "$ac_cv_lib_SDL_image_IMG_Load" >&6; } -if test "x$ac_cv_lib_SDL_image_IMG_Load" = x""yes; then : - HAVE_SDLIMAGE=yes + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - HAVE_SDLIMAGE=no + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + SDLIMAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "SDL_image" 2>&1` + else + SDLIMAGE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "SDL_image" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$SDLIMAGE_PKG_ERRORS" >&5 + HAVE_SDLIMAGE=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + HAVE_SDLIMAGE=no +else + SDLIMAGE_CFLAGS=$pkg_cv_SDLIMAGE_CFLAGS + SDLIMAGE_LIBS=$pkg_cv_SDLIMAGE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + HAVE_SDLIMAGE=yes +fi fi if test "x$enable_glpng" != xno ; then for ac_header in GL/glpng.h do : ac_fn_c_check_header_mongrel "$LINENO" "GL/glpng.h" "ac_cv_header_GL_glpng_h" "$ac_includes_default" -if test "x$ac_cv_header_GL_glpng_h" = x""yes; then : +if test "x$ac_cv_header_GL_glpng_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_GL_GLPNG_H 1 _ACEOF @@ -9604,7 +9579,7 @@ for ac_header in glpng/glpng.h do : ac_fn_c_check_header_mongrel "$LINENO" "glpng/glpng.h" "ac_cv_header_glpng_glpng_h" "$ac_includes_default" -if test "x$ac_cv_header_glpng_glpng_h" = x""yes; then : +if test "x$ac_cv_header_glpng_glpng_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_GLPNG_GLPNG_H 1 _ACEOF @@ -9617,7 +9592,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pngBind in -lglpng" >&5 $as_echo_n "checking for pngBind in -lglpng... " >&6; } -if test "${ac_cv_lib_glpng_pngBind+set}" = set; then : +if ${ac_cv_lib_glpng_pngBind+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -9651,7 +9626,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_glpng_pngBind" >&5 $as_echo "$ac_cv_lib_glpng_pngBind" >&6; } -if test "x$ac_cv_lib_glpng_pngBind" = x""yes; then : +if test "x$ac_cv_lib_glpng_pngBind" = xyes; then : HAVE_GLPNG_LIB=yes else HAVE_GLPNG_LIB=no @@ -9795,9 +9770,9 @@ $as_echo "#define AUDIO_SDLMIXER 1" >>confdefs.h - AUDIO_CFLAGS="" + AUDIO_CFLAGS="$SDLMIXER_CFLAGS" - AUDIO_LIBS=-lSDL_mixer + AUDIO_LIBS="$SDLMIXER_LIBS" AUDIO_TYPE="SDL mixer" else @@ -9808,40 +9783,44 @@ $as_echo "#define IMAGE_GLPNG 1" >>confdefs.h - IMAGE_CFLAGS="" - - IMAGE_LIBS=-lglpng - IMAGE_TYPE=glpng - if test "x$WINDOW_TYPE" = xSDL -a "x$HAVE_SDLIMAGE" = xyes -a "x$enable_sdlimage" != no ; then - IMAGE_LIBS="$IMAGE_LIBS -lSDL_image" - - -$as_echo "#define ENABLE_WINDOW_ICON 1" >>confdefs.h - - WINDOW_ICON=yes - else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SDL_image is not usable, window icon will not be set" >&5 -$as_echo "$as_me: WARNING: SDL_image is not usable, window icon will not be set" >&2;} - WINDOW_ICON=no - fi + IMAGE_GLPNG=yes elif test "x$WINDOW_TYPE" = xSDL -a "x$HAVE_SDLIMAGE" = xyes -a "x$enable_sdlimage" != no ; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Using SDL_image to load images into textures, some rendering artifacts may be present" >&5 $as_echo "$as_me: WARNING: Using SDL_image to load images into textures, some rendering artifacts may be present" >&2;} $as_echo "#define IMAGE_SDL 1" >>confdefs.h - IMAGE_CFLAGS="" - - IMAGE_LIBS=-lSDL_image - IMAGE_TYPE=SDL_image + IMAGE_SDLIMAGE=yes +else + as_fn_error $? "cannot find glpng or SDL_image (image loader)" "$LINENO" 5 +fi + +if test "x$WINDOW_TYPE" = xSDL -a "x$HAVE_SDLIMAGE" = xyes -a "x$enable_sdlimage" != no ; then $as_echo "#define ENABLE_WINDOW_ICON 1" >>confdefs.h WINDOW_ICON=yes + IMAGE_SDLIMAGE=yes else - as_fn_error $? "cannot find glpng or SDL_image (image loader)" "$LINENO" 5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SDL_image is not usable, window icon will not be set" >&5 +$as_echo "$as_me: WARNING: SDL_image is not usable, window icon will not be set" >&2;} + WINDOW_ICON=no +fi + +if test "x$IMAGE_GLPNG" = xyes ; then + IMAGE_CFLAGS="$IMAGE_CFLAGS" + + IMAGE_LIBS="$IMAGE_LIBS -lglpng" + +fi + +if test "x$IMAGE_SDLIMAGE" = xyes ; then + IMAGE_CFLAGS="$IMAGE_CFLAGS $SDLIMAGE_CFLAGS" + + IMAGE_LIBS="$IMAGE_LIBS $SDLIMAGE_LIBS" + fi ac_config_files="$ac_config_files Makefile data/doc/Makefile data/doc/images/Makefile data/png/Makefile data/wav/Makefile data/Makefile misc/Makefile src/Makefile m4/Makefile po/Makefile.in" @@ -9911,10 +9890,21 @@ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + if test "x$cache_file" != "x/dev/null"; then { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -9945,6 +9935,14 @@ LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -9966,7 +9964,7 @@ Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -10067,6 +10065,7 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -10262,16 +10261,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -10331,28 +10330,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -10373,8 +10360,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Chromium B.S.U. $as_me 0.9.15, which was -generated by GNU Autoconf 2.67. Invocation command line was +This file was extended by Chromium B.S.U. $as_me 0.9.15.1, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -10439,11 +10426,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Chromium B.S.U. config.status 0.9.15 -configured by $0, generated by GNU Autoconf 2.67, +Chromium B.S.U. config.status 0.9.15.1 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -10534,7 +10521,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -10589,7 +10576,7 @@ "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -10612,9 +10599,10 @@ # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -10622,12 +10610,13 @@ { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -10649,7 +10638,7 @@ ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -10677,7 +10666,7 @@ rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -10725,7 +10714,7 @@ rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -10757,7 +10746,7 @@ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF @@ -10791,7 +10780,7 @@ # No need to generate them if there are no CONFIG_HEADERS. # This happens for instance with `./config.status Makefile'. if test -n "$CONFIG_HEADERS"; then -cat >"$tmp/defines.awk" <<\_ACAWK || +cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF @@ -10803,8 +10792,8 @@ # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do - ac_t=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_t"; then + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then break elif $ac_last_try; then as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 @@ -10905,7 +10894,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -10924,7 +10913,7 @@ for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -10933,7 +10922,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -10959,8 +10948,8 @@ esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -11096,21 +11085,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; @@ -11121,20 +11111,20 @@ if test x"$ac_file" != x-; then { $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" - } >"$tmp/config.h" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" - mv "$tmp/config.h" "$ac_file" \ + mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. @@ -11194,7 +11184,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -11228,21 +11218,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` test -z "am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || diff -Nru chromium-bsu-0.9.15/configure.ac chromium-bsu-0.9.15.1/configure.ac --- chromium-bsu-0.9.15/configure.ac 2011-02-14 03:54:04.000000000 +0000 +++ chromium-bsu-0.9.15.1/configure.ac 2013-05-25 05:39:02.000000000 +0000 @@ -3,7 +3,7 @@ AC_PREREQ([2.58]) -AC_INIT([Chromium B.S.U.], [0.9.15], [http://sf.net/projects/chromium-bsu/bugs], [chromium-bsu]) +AC_INIT([Chromium B.S.U.], [0.9.15.1], [http://sf.net/projects/chromium-bsu/bugs], [chromium-bsu]) AM_INIT_AUTOMAKE([foreign]) AC_CONFIG_SRCDIR([src/main.cpp]) @@ -101,7 +101,7 @@ fi if test "x$enable_sdlmixer" != xno ; then - AC_CHECK_LIB([SDL_mixer], [Mix_OpenAudio], [HAVE_SDLMIXER=yes], [HAVE_SDLMIXER=no]) + PKG_CHECK_MODULES([SDLMIXER], [SDL_mixer], [HAVE_SDLMIXER=yes], [HAVE_SDLMIXER=no]) fi # Need glpng or SDL_image so we can display PNG images using OpenGL @@ -109,7 +109,7 @@ AC_ARG_ENABLE(sdlimage, AS_HELP_STRING([--disable-sdlimage], [do not use SDL_image])) if test "x$enable_sdlimage" != xno ; then - AC_CHECK_LIB([SDL_image], [IMG_Load], [HAVE_SDLIMAGE=yes], [HAVE_SDLIMAGE=no]) + PKG_CHECK_MODULES([SDLIMAGE], [SDL_image], [HAVE_SDLIMAGE=yes], [HAVE_SDLIMAGE=no]) fi if test "x$enable_glpng" != xno ; then @@ -213,9 +213,9 @@ CFLAGS="${ac_save_CFLAGS}" elif test "x$HAVE_SDLMIXER" = xyes -a "x$enable_sdlmixer" != xno ; then AC_DEFINE(AUDIO_SDLMIXER, 1, [define to use SDL Mixer]) - AUDIO_CFLAGS="" + AUDIO_CFLAGS="$SDLMIXER_CFLAGS" AC_SUBST(AUDIO_CFLAGS) - AUDIO_LIBS=-lSDL_mixer + AUDIO_LIBS="$SDLMIXER_LIBS" AC_SUBST(AUDIO_LIBS) AUDIO_TYPE="SDL mixer" else @@ -224,32 +224,38 @@ if test \( "x$HAVE_GL_GLPNG_H" = xyes -o "x$HAVE_GLPNG_GLPNG_H" = xyes \) -a "x$HAVE_GLPNG_LIB" = xyes -a "x$enable_glpng" != no ; then AC_DEFINE(IMAGE_GLPNG, 1, [define to use glpng]) - IMAGE_CFLAGS="" - AC_SUBST(IMAGE_CFLAGS) - IMAGE_LIBS=-lglpng - AC_SUBST(IMAGE_LIBS) IMAGE_TYPE=glpng - if test "x$WINDOW_TYPE" = xSDL -a "x$HAVE_SDLIMAGE" = xyes -a "x$enable_sdlimage" != no ; then - IMAGE_LIBS="$IMAGE_LIBS -lSDL_image" - AC_SUBST(IMAGE_LIBS) - AC_DEFINE(ENABLE_WINDOW_ICON, 1, [define to enable the window icon (needs SDL_image)]) - WINDOW_ICON=yes - else - AC_MSG_WARN([SDL_image is not usable, window icon will not be set]) - WINDOW_ICON=no - fi + IMAGE_GLPNG=yes elif test "x$WINDOW_TYPE" = xSDL -a "x$HAVE_SDLIMAGE" = xyes -a "x$enable_sdlimage" != no ; then AC_MSG_WARN([Using SDL_image to load images into textures, some rendering artifacts may be present]) AC_DEFINE(IMAGE_SDL, 1, [define to use SDL_image]) - IMAGE_CFLAGS="" - AC_SUBST(IMAGE_CFLAGS) - IMAGE_LIBS=-lSDL_image - AC_SUBST(IMAGE_LIBS) IMAGE_TYPE=SDL_image + IMAGE_SDLIMAGE=yes +else + AC_MSG_ERROR([cannot find glpng or SDL_image (image loader)]) +fi + +if test "x$WINDOW_TYPE" = xSDL -a "x$HAVE_SDLIMAGE" = xyes -a "x$enable_sdlimage" != no ; then AC_DEFINE(ENABLE_WINDOW_ICON, 1, [define to enable the window icon (needs SDL_image)]) WINDOW_ICON=yes + IMAGE_SDLIMAGE=yes else - AC_MSG_ERROR([cannot find glpng or SDL_image (image loader)]) + AC_MSG_WARN([SDL_image is not usable, window icon will not be set]) + WINDOW_ICON=no +fi + +if test "x$IMAGE_GLPNG" = xyes ; then + IMAGE_CFLAGS="$IMAGE_CFLAGS" + AC_SUBST(IMAGE_CFLAGS) + IMAGE_LIBS="$IMAGE_LIBS -lglpng" + AC_SUBST(IMAGE_LIBS) +fi + +if test "x$IMAGE_SDLIMAGE" = xyes ; then + IMAGE_CFLAGS="$IMAGE_CFLAGS $SDLIMAGE_CFLAGS" + AC_SUBST(IMAGE_CFLAGS) + IMAGE_LIBS="$IMAGE_LIBS $SDLIMAGE_LIBS" + AC_SUBST(IMAGE_LIBS) fi AC_CONFIG_FILES([ diff -Nru chromium-bsu-0.9.15/data/Makefile.in chromium-bsu-0.9.15.1/data/Makefile.in --- chromium-bsu-0.9.15/data/Makefile.in 2011-02-14 03:55:04.000000000 +0000 +++ chromium-bsu-0.9.15.1/data/Makefile.in 2013-05-25 05:40:40.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -36,8 +52,7 @@ subdir = data DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/m4/ax_check_gl.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_gl.m4 \ $(top_srcdir)/m4/ax_check_glu.m4 \ $(top_srcdir)/m4/ax_check_glut.m4 \ $(top_srcdir)/m4/ax_lang_compiler_ms.m4 \ @@ -62,6 +77,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -173,11 +193,13 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ +SDLIMAGE_CFLAGS = @SDLIMAGE_CFLAGS@ +SDLIMAGE_LIBS = @SDLIMAGE_LIBS@ +SDLMIXER_CFLAGS = @SDLMIXER_CFLAGS@ +SDLMIXER_LIBS = @SDLMIXER_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_LIBS = @SDL_LIBS@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -201,7 +223,6 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -288,12 +309,12 @@ $(am__aclocal_m4_deps): # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -303,7 +324,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -317,37 +342,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -356,6 +350,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -419,6 +417,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -454,13 +466,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -495,10 +504,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -577,21 +591,22 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic ctags \ - ctags-recursive distclean distclean-generic distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ - tags-recursive uninstall uninstall-am + all all-am check check-am clean clean-generic cscopelist \ + cscopelist-recursive ctags ctags-recursive distclean \ + distclean-generic distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags tags-recursive uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru chromium-bsu-0.9.15/data/doc/Makefile.in chromium-bsu-0.9.15.1/data/doc/Makefile.in --- chromium-bsu-0.9.15/data/doc/Makefile.in 2011-02-14 03:55:04.000000000 +0000 +++ chromium-bsu-0.9.15.1/data/doc/Makefile.in 2013-05-25 05:40:40.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -38,8 +54,7 @@ DIST_COMMON = $(dist_doc_DATA) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/m4/ax_check_gl.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_gl.m4 \ $(top_srcdir)/m4/ax_check_glu.m4 \ $(top_srcdir)/m4/ax_check_glut.m4 \ $(top_srcdir)/m4/ax_lang_compiler_ms.m4 \ @@ -64,6 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -85,6 +105,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(docdir)" DATA = $(dist_doc_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ @@ -198,11 +224,13 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ +SDLIMAGE_CFLAGS = @SDLIMAGE_CFLAGS@ +SDLIMAGE_LIBS = @SDLIMAGE_LIBS@ +SDLMIXER_CFLAGS = @SDLMIXER_CFLAGS@ +SDLMIXER_LIBS = @SDLMIXER_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_LIBS = @SDL_LIBS@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -226,7 +254,6 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -313,8 +340,11 @@ $(am__aclocal_m4_deps): install-dist_docDATA: $(dist_doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -328,17 +358,15 @@ @$(NORMAL_UNINSTALL) @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(docdir)" && rm -f $$files + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -348,7 +376,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -362,37 +394,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -401,6 +402,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -464,6 +469,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -499,13 +518,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -543,10 +559,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -625,22 +646,23 @@ uninstall-am: uninstall-dist_docDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic ctags \ - ctags-recursive distclean distclean-generic distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dist_docDATA \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-dist_docDATA + all all-am check check-am clean clean-generic cscopelist \ + cscopelist-recursive ctags ctags-recursive distclean \ + distclean-generic distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dist_docDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ + tags-recursive uninstall uninstall-am uninstall-dist_docDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru chromium-bsu-0.9.15/data/doc/images/Makefile.in chromium-bsu-0.9.15.1/data/doc/images/Makefile.in --- chromium-bsu-0.9.15/data/doc/images/Makefile.in 2011-02-14 03:55:04.000000000 +0000 +++ chromium-bsu-0.9.15.1/data/doc/images/Makefile.in 2013-05-25 05:40:40.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -38,8 +54,7 @@ DIST_COMMON = $(dist_images_DATA) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/m4/ax_check_gl.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_gl.m4 \ $(top_srcdir)/m4/ax_check_glu.m4 \ $(top_srcdir)/m4/ax_check_glut.m4 \ $(top_srcdir)/m4/ax_lang_compiler_ms.m4 \ @@ -57,6 +72,11 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -78,6 +98,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(imagesdir)" DATA = $(dist_images_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -158,11 +184,13 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ +SDLIMAGE_CFLAGS = @SDLIMAGE_CFLAGS@ +SDLIMAGE_LIBS = @SDLIMAGE_LIBS@ +SDLMIXER_CFLAGS = @SDLMIXER_CFLAGS@ +SDLMIXER_LIBS = @SDLMIXER_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_LIBS = @SDL_LIBS@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -186,7 +214,6 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -278,8 +305,11 @@ $(am__aclocal_m4_deps): install-dist_imagesDATA: $(dist_images_DATA) @$(NORMAL_INSTALL) - test -z "$(imagesdir)" || $(MKDIR_P) "$(DESTDIR)$(imagesdir)" @list='$(dist_images_DATA)'; test -n "$(imagesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(imagesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(imagesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -293,15 +323,15 @@ @$(NORMAL_UNINSTALL) @list='$(dist_images_DATA)'; test -n "$(imagesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(imagesdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(imagesdir)" && rm -f $$files + dir='$(DESTDIR)$(imagesdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -350,10 +380,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru chromium-bsu-0.9.15/data/png/Makefile.am chromium-bsu-0.9.15.1/data/png/Makefile.am --- chromium-bsu-0.9.15/data/png/Makefile.am 2011-02-14 03:54:04.000000000 +0000 +++ chromium-bsu-0.9.15.1/data/png/Makefile.am 2013-05-25 05:35:49.000000000 +0000 @@ -52,7 +52,6 @@ heroShields.png \ heroSuper.png \ icon32.png \ - icon64.png \ life.png \ menu_back.png \ menu_updown.png \ diff -Nru chromium-bsu-0.9.15/data/png/Makefile.in chromium-bsu-0.9.15.1/data/png/Makefile.in --- chromium-bsu-0.9.15/data/png/Makefile.in 2011-02-14 03:55:04.000000000 +0000 +++ chromium-bsu-0.9.15.1/data/png/Makefile.in 2013-05-25 05:40:40.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -38,8 +54,7 @@ DIST_COMMON = $(dist_png_DATA) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/m4/ax_check_gl.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_gl.m4 \ $(top_srcdir)/m4/ax_check_glu.m4 \ $(top_srcdir)/m4/ax_check_glut.m4 \ $(top_srcdir)/m4/ax_lang_compiler_ms.m4 \ @@ -57,6 +72,11 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -78,6 +98,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(pngdir)" DATA = $(dist_png_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -158,11 +184,13 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ +SDLIMAGE_CFLAGS = @SDLIMAGE_CFLAGS@ +SDLIMAGE_LIBS = @SDLIMAGE_LIBS@ +SDLMIXER_CFLAGS = @SDLMIXER_CFLAGS@ +SDLMIXER_LIBS = @SDLMIXER_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_LIBS = @SDL_LIBS@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -186,7 +214,6 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -285,7 +312,6 @@ heroShields.png \ heroSuper.png \ icon32.png \ - icon64.png \ life.png \ menu_back.png \ menu_updown.png \ @@ -338,8 +364,11 @@ $(am__aclocal_m4_deps): install-dist_pngDATA: $(dist_png_DATA) @$(NORMAL_INSTALL) - test -z "$(pngdir)" || $(MKDIR_P) "$(DESTDIR)$(pngdir)" @list='$(dist_png_DATA)'; test -n "$(pngdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pngdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pngdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -353,15 +382,15 @@ @$(NORMAL_UNINSTALL) @list='$(dist_png_DATA)'; test -n "$(pngdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pngdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pngdir)" && rm -f $$files + dir='$(DESTDIR)$(pngdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -410,10 +439,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: Binary files /tmp/7K9nOp7Wb5/chromium-bsu-0.9.15/data/png/icon64.png and /tmp/9BF9Wy2VjB/chromium-bsu-0.9.15.1/data/png/icon64.png differ diff -Nru chromium-bsu-0.9.15/data/wav/Makefile.in chromium-bsu-0.9.15.1/data/wav/Makefile.in --- chromium-bsu-0.9.15/data/wav/Makefile.in 2011-02-14 03:55:04.000000000 +0000 +++ chromium-bsu-0.9.15.1/data/wav/Makefile.in 2013-05-25 05:40:40.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -38,8 +54,7 @@ DIST_COMMON = $(dist_wav_DATA) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/m4/ax_check_gl.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_gl.m4 \ $(top_srcdir)/m4/ax_check_glu.m4 \ $(top_srcdir)/m4/ax_check_glut.m4 \ $(top_srcdir)/m4/ax_lang_compiler_ms.m4 \ @@ -57,6 +72,11 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -78,6 +98,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(wavdir)" DATA = $(dist_wav_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -158,11 +184,13 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ +SDLIMAGE_CFLAGS = @SDLIMAGE_CFLAGS@ +SDLIMAGE_LIBS = @SDLIMAGE_LIBS@ +SDLMIXER_CFLAGS = @SDLMIXER_CFLAGS@ +SDLMIXER_LIBS = @SDLMIXER_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_LIBS = @SDL_LIBS@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -186,7 +214,6 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -285,8 +312,11 @@ $(am__aclocal_m4_deps): install-dist_wavDATA: $(dist_wav_DATA) @$(NORMAL_INSTALL) - test -z "$(wavdir)" || $(MKDIR_P) "$(DESTDIR)$(wavdir)" @list='$(dist_wav_DATA)'; test -n "$(wavdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(wavdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(wavdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -300,15 +330,15 @@ @$(NORMAL_UNINSTALL) @list='$(dist_wav_DATA)'; test -n "$(wavdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(wavdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(wavdir)" && rm -f $$files + dir='$(DESTDIR)$(wavdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -357,10 +387,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru chromium-bsu-0.9.15/debian/changelog chromium-bsu-0.9.15.1/debian/changelog --- chromium-bsu-0.9.15/debian/changelog 2011-02-14 04:28:39.000000000 +0000 +++ chromium-bsu-0.9.15.1/debian/changelog 2013-05-25 06:48:12.000000000 +0000 @@ -1,3 +1,18 @@ +chromium-bsu (0.9.15.1-1) unstable; urgency=low + + * New upstream release + * Change the font dep to fonts-uralic | ttf-uralic + * Update the watch file to be more flexible + * Add a file for upstream metadata + * wrap-and-sort -sa + * Switch to debhelper compat 9 + * Bump Standards-Version, no changes needed + * Fix the Vcs-* URLs + * Switch from autotools-dev to autoreconf + * Use full hardening + + -- Paul Wise Sat, 25 May 2013 14:48:05 +0800 + chromium-bsu (0.9.15-1) unstable; urgency=low * New upstream release diff -Nru chromium-bsu-0.9.15/debian/chromium-bsu-data.install chromium-bsu-0.9.15.1/debian/chromium-bsu-data.install --- chromium-bsu-0.9.15/debian/chromium-bsu-data.install 2009-03-31 05:25:06.000000000 +0000 +++ chromium-bsu-0.9.15.1/debian/chromium-bsu-data.install 2013-05-15 03:37:48.000000000 +0000 @@ -1,3 +1,3 @@ -usr/share/games/chromium-bsu usr/share/doc/chromium-bsu +usr/share/games/chromium-bsu usr/share/locale diff -Nru chromium-bsu-0.9.15/debian/chromium-bsu.install chromium-bsu-0.9.15.1/debian/chromium-bsu.install --- chromium-bsu-0.9.15/debian/chromium-bsu.install 2009-03-30 09:50:24.000000000 +0000 +++ chromium-bsu-0.9.15.1/debian/chromium-bsu.install 2013-05-25 06:11:34.000000000 +0000 @@ -1,5 +1,5 @@ +../../debian/chromium-bsu.xpm usr/share/pixmaps usr/games/chromium-bsu -usr/share/man usr/share/applications -usr/share/pixmaps -../../debian/chromium-bsu.xpm usr/share/pixmaps +usr/share/man +usr/share/icons diff -Nru chromium-bsu-0.9.15/debian/compat chromium-bsu-0.9.15.1/debian/compat --- chromium-bsu-0.9.15/debian/compat 2010-06-19 11:07:19.000000000 +0000 +++ chromium-bsu-0.9.15.1/debian/compat 2013-05-14 06:45:05.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru chromium-bsu-0.9.15/debian/control chromium-bsu-0.9.15.1/debian/control --- chromium-bsu-0.9.15/debian/control 2011-02-14 04:25:01.000000000 +0000 +++ chromium-bsu-0.9.15.1/debian/control 2013-05-15 03:39:41.000000000 +0000 @@ -2,28 +2,37 @@ Section: games Priority: optional Maintainer: Debian Games Team -Uploaders: Sam Hocevar , Paul Wise -Build-Depends: debhelper (>= 7.0.50~), - autotools-dev (>= 20100122.1~), - libsdl1.2-dev (>= 1.2.2-3.1~), - libsdl-image1.2-dev, - libopenal-dev (>= 0.2005080600), +Uploaders: + Sam Hocevar , + Paul Wise +Build-Depends: + autoconf-gl-macros | autoconf-archive (<< 20111221-1), + autopoint, + debhelper (>= 9), + dh-autoreconf, libalut-dev, + libglc-dev, libglu1-mesa-dev, - libglc-dev -Standards-Version: 3.9.1 + libopenal-dev (>= 0.2005080600), + libsdl-image1.2-dev, + libsdl1.2-dev (>= 1.2.2-3.1~), + pkg-config +Standards-Version: 3.9.4 Homepage: http://chromium-bsu.sourceforge.net/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/chromium-bsu/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/chromium-bsu/?op=log +Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/chromium-bsu/ +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/chromium-bsu/ Package: chromium-bsu Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, +Depends: chromium-bsu-data (>= 0.9.14), - ttf-uralic -Replaces: chromium (<< 0.9.14) -Breaks: chromium (<< 0.9.14) + fonts-uralic | ttf-uralic, + ${misc:Depends}, + ${shlibs:Depends} +Replaces: + chromium (<< 0.9.14) +Breaks: + chromium (<< 0.9.14) Description: fast paced, arcade-style, scrolling space shooter Chromium is a top down fast paced high action scrolling space shooter. . @@ -34,9 +43,12 @@ Package: chromium-bsu-data Architecture: all -Replaces: chromium-data (<< 0.9.14) -Breaks: chromium-data (<< 0.9.14) -Depends: ${misc:Depends} +Replaces: + chromium-data (<< 0.9.14) +Breaks: + chromium-data (<< 0.9.14) +Depends: + ${misc:Depends} Description: data pack for the Chromium B.S.U. game This package provides all the sounds, images, translations and documentation required for Chromium B.S.U., a fast paced high diff -Nru chromium-bsu-0.9.15/debian/copyright chromium-bsu-0.9.15.1/debian/copyright --- chromium-bsu-0.9.15/debian/copyright 2010-06-19 15:50:20.000000000 +0000 +++ chromium-bsu-0.9.15.1/debian/copyright 2013-05-15 03:37:48.000000000 +0000 @@ -1,14 +1,14 @@ This package was originally debianized by Peter Joseph on Thu, 12 Jul 2001 01:58:32 +0100. -It was then repackaged by Mike Furr on +It was then repackaged by Mike Furr on Tue, 4 Mar 2003 19:39:08 -0500. It was downloaded from http://sf.net/projects/chromium-bsu/files -Upstream Author: Mark B. Allan +Upstream Author: Mark B. Allan -Copyright 2000 Mark B. Allan +Copyright 2000 Mark B. Allan Copyright 2008-2009 Paul Wise Copyright 2008 Brian Redfern Copyright 2008 Tristan Heaven @@ -46,7 +46,7 @@ Package to another party. "Freely Available" means that no fee is charged for the right to use - the item, though there may be fees involved in handling the item. + the item, though there may be fees involved in handling the item. It also means that recipients of the item may redistribute it under the same conditions they received it. diff -Nru chromium-bsu-0.9.15/debian/rules chromium-bsu-0.9.15.1/debian/rules --- chromium-bsu-0.9.15/debian/rules 2011-02-10 11:56:52.000000000 +0000 +++ chromium-bsu-0.9.15.1/debian/rules 2013-05-25 06:26:45.000000000 +0000 @@ -1,9 +1,10 @@ #!/usr/bin/make -f #export DH_VERBOSE=1 +export DEB_BUILD_MAINT_OPTIONS=hardening=+all %: - dh --with autotools_dev $@ --parallel + dh $@ --with autoreconf --parallel override_dh_auto_configure: dh_auto_configure -- CXXFLAGS="$(CXXFLAGS) -Wall" --bindir=/usr/games --datadir=/usr/share/games --disable-glpng diff -Nru chromium-bsu-0.9.15/debian/upstream chromium-bsu-0.9.15.1/debian/upstream --- chromium-bsu-0.9.15/debian/upstream 1970-01-01 00:00:00.000000000 +0000 +++ chromium-bsu-0.9.15.1/debian/upstream 2013-05-12 09:17:52.000000000 +0000 @@ -0,0 +1,12 @@ +Bug-Database: http://sourceforge.net/p/chromium-bsu/bugs/ +Bug-Submit: https://sourceforge.net/p/chromium-bsu/bugs/new/ +Changelog: http://sourceforge.net/p/chromium-bsu/code/ci/master/log/ +Contact: chromium-bsu-devel@lists.sourceforge.net +FAQ: http://chromium-bsu.sourceforge.net/faq.htm +Name: Chromium B.S.U. +Homepage: http://chromium-bsu.sourceforge.net/ +Repository: git://git.code.sf.net/p/chromium-bsu/code +Repository-Browse: http://sourceforge.net/p/chromium-bsu/code/ +Screenshots: http://sourceforge.net/projects/chromium-bsu/ +Watch: http://sf.net/chromium-bsu/chromium-bsu-(\d[\d\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) + diff -Nru chromium-bsu-0.9.15/debian/watch chromium-bsu-0.9.15.1/debian/watch --- chromium-bsu-0.9.15/debian/watch 2010-06-19 14:21:02.000000000 +0000 +++ chromium-bsu-0.9.15.1/debian/watch 2013-05-12 09:17:31.000000000 +0000 @@ -1,3 +1,2 @@ version=3 -http://sf.net/chromium-bsu/chromium-bsu-([\d\.]+)\.tar\.gz - +http://sf.net/chromium-bsu/chromium-bsu-(\d[\d\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) diff -Nru chromium-bsu-0.9.15/depcomp chromium-bsu-0.9.15.1/depcomp --- chromium-bsu-0.9.15/depcomp 2010-01-18 06:28:57.000000000 +0000 +++ chromium-bsu-0.9.15.1/depcomp 2012-12-26 00:15:44.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-07-12.20; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,7 +27,7 @@ case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) @@ -40,11 +39,11 @@ Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -57,6 +56,12 @@ ;; esac +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -69,6 +74,9 @@ rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -90,10 +98,24 @@ # This is just like msvisualcpp but w/o cygpath translation. # Just convert the backslash-escaped backslashes to single forward # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" + cygpath_u='sed s,\\\\,/,g' depmode=msvisualcpp fi +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -123,13 +145,17 @@ ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -148,20 +174,21 @@ ## The second -e expression handles DOS-style file names with drive letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory + tr ' ' "$nl" < "$tmpdepfile" | +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -193,18 +220,15 @@ # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr "$nl" ' ' >> "$depfile" echo >> "$depfile" # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ >> "$depfile" else @@ -216,10 +240,17 @@ rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` @@ -249,12 +280,11 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. + # Each line is of the form 'foo.o: dependent.h'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. + # '$object: dependent.h' and one to simply 'dependent.h:'. sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -265,23 +295,26 @@ ;; icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. + # However on + # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c # ICC 7.0 will fill foo.d with something like # foo.o: sub/foo.c # foo.o: sub/foo.h - # which is wrong. We want: + # which is wrong. We want # sub/foo.o: sub/foo.c # sub/foo.o: sub/foo.h # sub/foo.c: # sub/foo.h: # ICC 7.1 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\': # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - + # tcc 0.9.26 (FIXME still under development at the moment of writing) + # will emit a similar output, but also prepend the continuation lines + # with horizontal tabulation characters. "$@" -MD -MF "$tmpdepfile" stat=$? if test $stat -eq 0; then : @@ -290,6 +323,85 @@ exit $stat fi rm -f "$depfile" + # Each line is of the form 'foo.o: dependent.h', + # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. + # Do two passes, one to just change these to + # '$object: dependent.h' and one to simply 'dependent.h:'. + sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ + < "$tmpdepfile" > "$depfile" + sed ' + s/[ '"$tab"'][ '"$tab"']*/ /g + s/^ *// + s/ *\\*$// + s/^[^:]*: *// + /^$/d + /:$/d + s/$/ :/ + ' < "$tmpdepfile" >> "$depfile" + rm -f "$tmpdepfile" + ;; + +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output + # foo.o: sub/foo.c sub/foo.h + # and will wrap long lines using '\' : + # foo.o: sub/foo.c ... \ + # sub/foo.h ... \ + # ... + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + base=`echo "$source" | sed -e 's|^.*/||' -e 's/\.[-_a-zA-Z0-9]*$//'` + tmpdepfile="$base.d" + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir="$base.d-lock" + trap "echo '$0: caught signal, cleaning up...' >&2; rm -rf $lockdir" 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0 ; do + # mkdir is a portable test-and-set. + if mkdir $lockdir 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rm -rf $lockdir + break + else + ## the lock is being held by a different process, + ## wait until the winning process is done or we timeout + while test -d $lockdir && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi + + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" # Each line is of the form `foo.o: dependent.h', # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. # Do two passes, one to just change these to @@ -334,7 +446,7 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + # Add 'dependent.h:' lines. sed -ne '2,${ s/^ *// s/ \\*$// @@ -349,9 +461,9 @@ tru64) # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. + # dependencies in 'foo.d' instead, so we check for that too. # Subdirectories are respected. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` test "x$dir" = "x$object" && dir= @@ -397,14 +509,59 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi rm -f "$tmpdepfile" ;; +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test "$stat" = 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/'"$tab"'\1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/'"$tab"'/ + G + p +}' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + #nosideeffect) # This comment above is used by automake to tell side-effect # dependency tracking mechanisms from slower ones. @@ -422,7 +579,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -442,15 +599,14 @@ done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ + tr ' ' "$nl" < "$tmpdepfile" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -503,9 +659,10 @@ touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" + sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -525,7 +682,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -594,8 +751,8 @@ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff -Nru chromium-bsu-0.9.15/install-sh chromium-bsu-0.9.15.1/install-sh --- chromium-bsu-0.9.15/install-sh 2010-01-18 06:28:57.000000000 +0000 +++ chromium-bsu-0.9.15.1/install-sh 2012-12-26 00:15:44.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,6 +156,10 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac shift;; -T) no_target_directory=true;; @@ -186,6 +190,10 @@ fi shift # arg dst_arg=$arg + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -194,13 +202,17 @@ echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -228,9 +240,9 @@ for src do - # Protect names starting with `-'. + # Protect names problematic for 'test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -252,12 +264,7 @@ echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -347,7 +354,7 @@ if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. + # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in @@ -385,7 +392,7 @@ case $dstdir in /*) prefix='/';; - -*) prefix='./';; + [-=\(\)!]*) prefix='./';; *) prefix='';; esac @@ -403,7 +410,7 @@ for d do - test -z "$d" && continue + test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then diff -Nru chromium-bsu-0.9.15/m4/Makefile.in chromium-bsu-0.9.15.1/m4/Makefile.in --- chromium-bsu-0.9.15/m4/Makefile.in 2011-02-14 03:55:04.000000000 +0000 +++ chromium-bsu-0.9.15.1/m4/Makefile.in 2013-05-25 05:40:40.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -36,8 +52,7 @@ subdir = m4 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/m4/ax_check_gl.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_gl.m4 \ $(top_srcdir)/m4/ax_check_glu.m4 \ $(top_srcdir)/m4/ax_check_glut.m4 \ $(top_srcdir)/m4/ax_lang_compiler_ms.m4 \ @@ -55,6 +70,11 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -133,11 +153,13 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ +SDLIMAGE_CFLAGS = @SDLIMAGE_CFLAGS@ +SDLIMAGE_LIBS = @SDLIMAGE_LIBS@ +SDLMIXER_CFLAGS = @SDLMIXER_CFLAGS@ +SDLMIXER_LIBS = @SDLMIXER_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_LIBS = @SDL_LIBS@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -161,7 +183,6 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -257,6 +278,8 @@ ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -302,10 +325,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru chromium-bsu-0.9.15/m4/acx_pthread.m4 chromium-bsu-0.9.15.1/m4/acx_pthread.m4 --- chromium-bsu-0.9.15/m4/acx_pthread.m4 2010-12-18 03:16:17.000000000 +0000 +++ chromium-bsu-0.9.15.1/m4/acx_pthread.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,271 +0,0 @@ -# =========================================================================== -# http://autoconf-archive.cryp.to/acx_pthread.html -# =========================================================================== -# -# SYNOPSIS -# -# ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) -# -# DESCRIPTION -# -# This macro figures out how to build C programs using POSIX threads. It -# sets the PTHREAD_LIBS output variable to the threads library and linker -# flags, and the PTHREAD_CFLAGS output variable to any special C compiler -# flags that are needed. (The user can also force certain compiler -# flags/libs to be tested by setting these environment variables.) -# -# Also sets PTHREAD_CC to any special C compiler that is needed for -# multi-threaded programs (defaults to the value of CC otherwise). (This -# is necessary on AIX to use the special cc_r compiler alias.) -# -# NOTE: You are assumed to not only compile your program with these flags, -# but also link it with them as well. e.g. you should link with -# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS -# -# If you are only building threads programs, you may wish to use these -# variables in your default LIBS, CFLAGS, and CC: -# -# LIBS="$PTHREAD_LIBS $LIBS" -# CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -# CC="$PTHREAD_CC" -# -# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant -# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name -# (e.g. PTHREAD_CREATE_UNDETACHED on AIX). -# -# ACTION-IF-FOUND is a list of shell commands to run if a threads library -# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it -# is not found. If ACTION-IF-FOUND is not specified, the default action -# will define HAVE_PTHREAD. -# -# Please let the authors know if this macro fails on any platform, or if -# you have any other suggestions or comments. This macro was based on work -# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help -# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by -# Alejandro Forero Cuervo to the autoconf macro repository. We are also -# grateful for the helpful feedback of numerous users. -# -# LICENSE -# -# Copyright (c) 2008 Steven G. Johnson -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -AC_DEFUN([ACX_PTHREAD], [ -AC_REQUIRE([AC_CANONICAL_HOST]) -AC_LANG_SAVE -AC_LANG_C -acx_pthread_ok=no - -# We used to check for pthread.h first, but this fails if pthread.h -# requires special compiler flags (e.g. on True64 or Sequent). -# It gets checked for in the link test anyway. - -# First of all, check if the user has set any of the PTHREAD_LIBS, -# etcetera environment variables, and if threads linking works using -# them: -if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) - AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes) - AC_MSG_RESULT($acx_pthread_ok) - if test x"$acx_pthread_ok" = xno; then - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" - fi - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" -fi - -# We must check for the threads library under a number of different -# names; the ordering is very important because some systems -# (e.g. DEC) have both -lpthread and -lpthreads, where one of the -# libraries is broken (non-POSIX). - -# Create a list of thread flags to try. Items starting with a "-" are -# C compiler flags, and other items are library names, except for "none" -# which indicates that we try without any flags at all, and "pthread-config" -# which is a program returning the flags for the Pth emulation library. - -acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" - -# The ordering *is* (sometimes) important. Some notes on the -# individual items follow: - -# pthreads: AIX (must check this before -lpthread) -# none: in case threads are in libc; should be tried before -Kthread and -# other compiler flags to prevent continual compiler warnings -# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) -# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) -# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) -# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) -# -pthreads: Solaris/gcc -# -mthreads: Mingw32/gcc, Lynx/gcc -# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it -# doesn't hurt to check since this sometimes defines pthreads too; -# also defines -D_REENTRANT) -# ... -mt is also the pthreads flag for HP/aCC -# pthread: Linux, etcetera -# --thread-safe: KAI C++ -# pthread-config: use pthread-config program (for GNU Pth library) - -case "${host_cpu}-${host_os}" in - *solaris*) - - # On Solaris (at least, for some versions), libc contains stubbed - # (non-functional) versions of the pthreads routines, so link-based - # tests will erroneously succeed. (We need to link with -pthreads/-mt/ - # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather - # a function called by this macro, so we could check for that, but - # who knows whether they'll stub that too in a future libc.) So, - # we'll just look for -pthreads and -lpthread first: - - acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags" - ;; -esac - -if test x"$acx_pthread_ok" = xno; then -for flag in $acx_pthread_flags; do - - case $flag in - none) - AC_MSG_CHECKING([whether pthreads work without any flags]) - ;; - - -*) - AC_MSG_CHECKING([whether pthreads work with $flag]) - PTHREAD_CFLAGS="$flag" - ;; - - pthread-config) - AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no) - if test x"$acx_pthread_config" = xno; then continue; fi - PTHREAD_CFLAGS="`pthread-config --cflags`" - PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" - ;; - - *) - AC_MSG_CHECKING([for the pthreads library -l$flag]) - PTHREAD_LIBS="-l$flag" - ;; - esac - - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Check for various functions. We must include pthread.h, - # since some functions may be macros. (On the Sequent, we - # need a special flag -Kthread to make this header compile.) - # We check for pthread_join because it is in -lpthread on IRIX - # while pthread_create is in libc. We check for pthread_attr_init - # due to DEC craziness with -lpthreads. We check for - # pthread_cleanup_push because it is one of the few pthread - # functions on Solaris that doesn't have a non-functional libc stub. - # We try pthread_create on general principles. - AC_TRY_LINK([#include ], - [pthread_t th; pthread_join(th, 0); - pthread_attr_init(0); pthread_cleanup_push(0, 0); - pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], - [acx_pthread_ok=yes]) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - AC_MSG_RESULT($acx_pthread_ok) - if test "x$acx_pthread_ok" = xyes; then - break; - fi - - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" -done -fi - -# Various other checks: -if test "x$acx_pthread_ok" = xyes; then - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. - AC_MSG_CHECKING([for joinable pthread attribute]) - attr_name=unknown - for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do - AC_TRY_LINK([#include ], [int attr=$attr; return attr;], - [attr_name=$attr; break]) - done - AC_MSG_RESULT($attr_name) - if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then - AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name, - [Define to necessary symbol if this constant - uses a non-standard name on your system.]) - fi - - AC_MSG_CHECKING([if more special flags are required for pthreads]) - flag=no - case "${host_cpu}-${host_os}" in - *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; - *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; - esac - AC_MSG_RESULT(${flag}) - if test "x$flag" != xno; then - PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" - fi - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - # More AIX lossage: must compile with xlc_r or cc_r - if test x"$GCC" != xyes; then - AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC}) - else - PTHREAD_CC=$CC - fi -else - PTHREAD_CC="$CC" -fi - -AC_SUBST(PTHREAD_LIBS) -AC_SUBST(PTHREAD_CFLAGS) -AC_SUBST(PTHREAD_CC) - -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -if test x"$acx_pthread_ok" = xyes; then - ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1]) - : -else - acx_pthread_ok=no - $2 -fi -AC_LANG_RESTORE -])dnl ACX_PTHREAD diff -Nru chromium-bsu-0.9.15/m4/ax_check_gl.m4 chromium-bsu-0.9.15.1/m4/ax_check_gl.m4 --- chromium-bsu-0.9.15/m4/ax_check_gl.m4 2010-12-18 03:16:17.000000000 +0000 +++ chromium-bsu-0.9.15.1/m4/ax_check_gl.m4 2013-05-25 05:13:09.000000000 +0000 @@ -1,79 +1,65 @@ -# =========================================================================== -# http://autoconf-archive.cryp.to/ax_check_gl.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_CHECK_GL -# -# DESCRIPTION -# -# Check for an OpenGL implementation. If GL is found, the required -# compiler and linker flags are included in the output variables -# "GL_CFLAGS" and "GL_LIBS", respectively. If no usable GL implementation -# is found, "no_gl" is set to "yes". -# -# If the header "GL/gl.h" is found, "HAVE_GL_GL_H" is defined. If the -# header "OpenGL/gl.h" is found, HAVE_OPENGL_GL_H is defined. These -# preprocessor definitions may not be mutually exclusive. -# -# LICENSE -# -# Copyright (c) 2009 Braden McDaniel -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - +# -*- mode: autoconf -*- +# +# AX_CHECK_GL +# +# Check for an OpenGL implementation. If GL is found, the required compiler +# and linker flags are included in the output variables "GL_CFLAGS" and +# "GL_LIBS", respectively. If no usable GL implementation is found, "no_gl" +# is set to "yes". +# +# If the header "GL/gl.h" is found, "HAVE_GL_GL_H" is defined. If the header +# "OpenGL/gl.h" is found, HAVE_OPENGL_GL_H is defined. These preprocessor +# definitions may not be mutually exclusive. +# +# version: 2.7 +# author: Braden McDaniel +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. +# +# As a special exception, the you may copy, distribute and modify the +# configure scripts that are the output of Autoconf when processing +# the Macro. You need not follow the terms of the GNU General Public +# License when using or distributing such scripts. +# AC_DEFUN([AX_CHECK_GL], -[AC_REQUIRE([AC_CANONICAL_HOST]) +[AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_PATH_X])dnl -AC_REQUIRE([ACX_PTHREAD])dnl +AC_REQUIRE([AC_PROG_SED])dnl AC_LANG_PUSH([C]) AX_LANG_COMPILER_MS -AS_IF([test X$ax_compiler_ms = Xno], - [GL_CFLAGS="${PTHREAD_CFLAGS}"; GL_LIBS="${PTHREAD_LIBS} -lm"]) # # Use x_includes and x_libraries if they have been set (presumably by # AC_PATH_X). # -AS_IF([test "X$no_x" != "Xyes"], - [AS_IF([test -n "$x_includes"], - [GL_CFLAGS="-I${x_includes} ${GL_CFLAGS}"])] - AS_IF([test -n "$x_libraries"], - [GL_LIBS="-L${x_libraries} -lX11 ${GL_LIBS}"])) - -ax_save_CPPFLAGS="${CPPFLAGS}" -CPPFLAGS="${GL_CFLAGS} ${CPPFLAGS}" -AC_CHECK_HEADERS([GL/gl.h OpenGL/gl.h]) -CPPFLAGS="${ax_save_CPPFLAGS}" +AS_IF([test X$no_x != Xyes -a -n "$x_includes"], + [GL_CFLAGS="-I$x_includes $GL_CFLAGS"]) AC_CHECK_HEADERS([windows.h]) +ax_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$GL_CFLAGS $CPPFLAGS" +AC_CHECK_HEADERS([GL/gl.h OpenGL/gl.h], , , [ +# if defined(HAVE_WINDOWS_H) && defined(_WIN32) +# include +# endif +]) +CPPFLAGS=$ax_save_CPPFLAGS + m4_define([AX_CHECK_GL_PROGRAM], [AC_LANG_PROGRAM([[ # if defined(HAVE_WINDOWS_H) && defined(_WIN32) @@ -88,43 +74,73 @@ # endif]], [[glBegin(0)]])]) +m4_define([AX_CHECK_GL_GLX_PROGRAM], + [AC_LANG_PROGRAM([[ +# if defined(HAVE_WINDOWS_H) && defined(_WIN32) +# include +# endif +# ifdef HAVE_GL_GL_H +# include +# elif defined(HAVE_OPENGL_GL_H) +# include +# else +# error no gl.h +# endif]], + [[glXQueryVersion(0, 0, 0)]])]) + AC_CACHE_CHECK([for OpenGL library], [ax_cv_check_gl_libgl], -[ax_cv_check_gl_libgl="no" +[ax_cv_check_gl_libgl=no case $host_cpu in x86_64) ax_check_gl_libdir=lib64 ;; *) ax_check_gl_libdir=lib ;; esac -ax_save_CPPFLAGS="${CPPFLAGS}" -CPPFLAGS="${GL_CFLAGS} ${CPPFLAGS}" -ax_save_LIBS="${LIBS}" -LIBS="" +ax_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $GL_CFLAGS" +ax_save_LDFLAGS=$LDFLAGS +AS_IF([test X$no_x != Xyes -a -n "$x_libraries"], + [LDFLAGS="$LDFLAGS -L$x_libraries"]) +ax_save_LIBS=$LIBS ax_check_libs="-lopengl32 -lGL" -for ax_lib in ${ax_check_libs}; do +for ax_lib in $ax_check_libs; do AS_IF([test X$ax_compiler_ms = Xyes], - [ax_try_lib=`echo $ax_lib | sed -e 's/^-l//' -e 's/$/.lib/'`], - [ax_try_lib="${ax_lib}"]) - LIBS="${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}" -AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM], - [ax_cv_check_gl_libgl="${ax_try_lib}"; break], - [ax_check_gl_nvidia_flags="-L/usr/${ax_check_gl_libdir}/nvidia" LIBS="${ax_try_lib} ${ax_check_gl_nvidia_flags} ${GL_LIBS} ${ax_save_LIBS}" + [ax_try_lib=`echo $ax_lib | $SED -e 's/^-l//' -e 's/$/.lib/'`], + [ax_try_lib=$ax_lib]) + LDFLAGS="$ax_save_LDFLAGS $GL_LIBS" + LIBS="$ax_try_lib $ax_save_LIBS" AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM], - [ax_cv_check_gl_libgl="${ax_try_lib} ${ax_check_gl_nvidia_flags}"; break], - [ax_check_gl_dylib_flag='-dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib' LIBS="${ax_try_lib} ${ax_check_gl_dylib_flag} ${GL_LIBS} ${ax_save_LIBS}" -AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM], - [ax_cv_check_gl_libgl="${ax_try_lib} ${ax_check_gl_dylib_flag}"; break])])]) + [ax_cv_check_gl_libgl=$ax_try_lib; break], + [ax_check_gl_dylib_flag='-dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib' + LDFLAGS="$ax_save_LDFLAGS $GL_LIBS $ax_check_gl_dylib_flag" + AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM], + [ax_cv_check_gl_libgl="$ax_check_gl_dylib_flag $ax_try_lib"; break])]) done -AS_IF([test "X$ax_cv_check_gl_libgl" = Xno -a "X$no_x" = Xyes], -[LIBS='-framework OpenGL' -AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM], - [ax_cv_check_gl_libgl="$LIBS"])]) +# +# If no_x is "yes", we don't want to wind up using a libGL that is +# linked with X11. Test to see if the found libGL includes GLX +# functions. If it does and no_x is "yes", we want to reset +# ax_cv_check_gl_libgl back to "no". +# +# Note that LDFLAGS and LIBS should still have whatever values they +# had when we broke out of the test loop above; use that. +# +AS_IF([test "X$ax_cv_check_gl_libgl" != Xno], + [AC_LINK_IFELSE([AX_CHECK_GL_GLX_PROGRAM], + [AS_IF([test X$no_x = Xyes], + [ax_cv_check_gl_libgl=no])])]) + +LIBS=$ax_save_LIBS +AS_IF([test "X$ax_cv_check_gl_libgl" = Xno -a X$no_x = Xyes], + [LDFLAGS="$ax_save_LDFLAGS -framework OpenGL" + AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM], + [ax_cv_check_gl_libgl='-framework OpenGL'])]) -LIBS=${ax_save_LIBS} -CPPFLAGS=${ax_save_CPPFLAGS}]) +LDFLAGS=$ax_save_LDFLAGS +CPPFLAGS=$ax_save_CPPFLAGS]) AS_IF([test "X$ax_cv_check_gl_libgl" = Xno], [no_gl=yes; GL_CFLAGS=""; GL_LIBS=""], - [GL_LIBS="${ax_cv_check_gl_libgl} ${GL_LIBS}"]) + [GL_LIBS="$ax_cv_check_gl_libgl $GL_LIBS"]) AC_LANG_POP([C]) AC_SUBST([GL_CFLAGS]) diff -Nru chromium-bsu-0.9.15/m4/ax_check_glu.m4 chromium-bsu-0.9.15.1/m4/ax_check_glu.m4 --- chromium-bsu-0.9.15/m4/ax_check_glu.m4 2010-12-18 03:16:17.000000000 +0000 +++ chromium-bsu-0.9.15.1/m4/ax_check_glu.m4 2013-05-25 05:13:09.000000000 +0000 @@ -1,66 +1,56 @@ -# =========================================================================== -# http://autoconf-archive.cryp.to/ax_check_glu.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_CHECK_GLU -# -# DESCRIPTION -# -# Check for GLU. If GLU is found, the required preprocessor and linker -# flags are included in the output variables "GLU_CFLAGS" and "GLU_LIBS", -# respectively. If no GLU implementation is found, "no_glu" is set to -# "yes". -# -# If the header "GL/glu.h" is found, "HAVE_GL_GLU_H" is defined. If the -# header "OpenGL/glu.h" is found, HAVE_OPENGL_GLU_H is defined. These -# preprocessor definitions may not be mutually exclusive. -# -# Some implementations (in particular, some versions of Mac OS X) are -# known to treat the GLU tesselator callback function type as "GLvoid -# (*)(...)" rather than the standard "GLvoid (*)()". If the former -# condition is detected, this macro defines "HAVE_VARARGS_GLU_TESSCB". -# -# LICENSE -# -# Copyright (c) 2009 Braden McDaniel -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - +# -*- mode: autoconf -*- +# +# AX_CHECK_GLU +# +# Check for GLU. If GLU is found, the required preprocessor and linker flags +# are included in the output variables "GLU_CFLAGS" and "GLU_LIBS", +# respectively. If no GLU implementation is found, "no_glu" is set to "yes". +# +# If the header "GL/glu.h" is found, "HAVE_GL_GLU_H" is defined. If the +# header "OpenGL/glu.h" is found, HAVE_OPENGL_GLU_H is defined. These +# preprocessor definitions may not be mutually exclusive. +# +# Some implementations (in particular, some versions of Mac OS X) are known +# to treat the GLU tesselator callback function type as "GLvoid (*)(...)" +# rather than the standard "GLvoid (*)()". If the former condition is +# detected, this macro defines "HAVE_VARARGS_GLU_TESSCB". +# +# version: 2.4 +# author: Braden McDaniel +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. +# +# As a special exception, the you may copy, distribute and modify the +# configure scripts that are the output of Autoconf when processing +# the Macro. You need not follow the terms of the GNU General Public +# License when using or distributing such scripts. +# AC_DEFUN([AX_CHECK_GLU], [AC_REQUIRE([AX_CHECK_GL])dnl AC_REQUIRE([AC_PROG_CXX])dnl -GLU_CFLAGS="${GL_CFLAGS}" +GLU_CFLAGS=$GL_CFLAGS -ax_save_CPPFLAGS="${CPPFLAGS}" -CPPFLAGS="${GL_CFLAGS} ${CPPFLAGS}" -AC_CHECK_HEADERS([GL/glu.h OpenGL/glu.h]) -CPPFLAGS="${ax_save_CPPFLAGS}" +ax_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$GL_CFLAGS $CPPFLAGS" +AC_CHECK_HEADERS([GL/glu.h OpenGL/glu.h], , , [ +# if defined(HAVE_WINDOWS_H) && defined(_WIN32) +# include +# endif +]) +CPPFLAGS=$ax_save_CPPFLAGS m4_define([AX_CHECK_GLU_PROGRAM], [AC_LANG_PROGRAM([[ @@ -77,16 +67,17 @@ [[gluBeginCurve(0)]])]) AC_CACHE_CHECK([for OpenGL Utility library], [ax_cv_check_glu_libglu], -[ax_cv_check_glu_libglu="no" -ax_save_CPPFLAGS="${CPPFLAGS}" -CPPFLAGS="${GL_CFLAGS} ${CPPFLAGS}" -ax_save_LIBS="${LIBS}" +[ax_cv_check_glu_libglu=no +ax_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$GL_CFLAGS $CPPFLAGS" +ax_save_LDFLAGS=$LDFLAGS +ax_save_LIBS=$LIBS # # First, check for the possibility that everything we need is already in # GL_LIBS. # -LIBS="${GL_LIBS} ${ax_save_LIBS}" +LDFLAGS="$ax_save_LDFLAGS $GL_LIBS" # # libGLU typically links with libstdc++ on POSIX platforms. # However, setting the language to C++ means that test program @@ -96,55 +87,55 @@ AC_LANG_PUSH([C++]) AS_IF([test X$ax_compiler_ms = Xyes], [AC_LANG_PUSH([C])]) -AC_LINK_IFELSE( -[AX_CHECK_GLU_PROGRAM], -[ax_cv_check_glu_libglu=yes], -[LIBS="" -ax_check_libs="-lglu32 -lGLU" -for ax_lib in ${ax_check_libs}; do - AS_IF([test X$ax_compiler_ms = Xyes], - [ax_try_lib=`echo $ax_lib | sed -e 's/^-l//' -e 's/$/.lib/'`], - [ax_try_lib="${ax_lib}"]) - LIBS="${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}" - AC_LINK_IFELSE([AX_CHECK_GLU_PROGRAM], - [ax_cv_check_glu_libglu="${ax_try_lib}"; break]) -done -]) +AC_LINK_IFELSE([AX_CHECK_GLU_PROGRAM], + [ax_cv_check_glu_libglu=yes], + [LIBS="" + ax_check_libs="-lglu32 -lGLU" + for ax_lib in ${ax_check_libs}; do + AS_IF([test X$ax_compiler_ms = Xyes], + [ax_try_lib=`echo $ax_lib | $SED -e 's/^-l//' -e 's/$/.lib/'`], + [ax_try_lib=$ax_lib]) + LIBS="$ax_try_lib $ax_save_LIBS" + AC_LINK_IFELSE([AX_CHECK_GLU_PROGRAM], + [ax_cv_check_glu_libglu=$ax_try_lib; break]) + done]) AS_IF([test X$ax_compiler_ms = Xyes], [AC_LANG_POP([C])]) AC_LANG_POP([C++]) -LIBS=${ax_save_LIBS} -CPPFLAGS=${ax_save_CPPFLAGS}]) +LIBS=$ax_save_LIBS +LDFLAGS=$ax_save_LDFLAGS +CPPFLAGS=$ax_save_CPPFLAGS]) AS_IF([test "X$ax_cv_check_glu_libglu" = Xno], [no_glu=yes; GLU_CFLAGS=""; GLU_LIBS=""], [AS_IF([test "X$ax_cv_check_glu_libglu" = Xyes], - [GLU_LIBS="$GL_LIBS"], - [GLU_LIBS="${ax_cv_check_glu_libglu} ${GL_LIBS}"])]) + [GLU_LIBS=""], + [GLU_LIBS="$ax_cv_check_glu_libglu"])]) AC_SUBST([GLU_CFLAGS]) AC_SUBST([GLU_LIBS]) # # Some versions of Mac OS X include a broken interpretation of the GLU -# tesselation callback function signature. +# tesselation callback function signature when using the C++ compiler. # AS_IF([test "X$ax_cv_check_glu_libglu" != Xno], -[AC_CACHE_CHECK([for varargs GLU tesselator callback function type], - [ax_cv_varargs_glu_tesscb], -[ax_cv_varargs_glu_tesscb=no -ax_save_CFLAGS="$CFLAGS" -CFLAGS="$GL_CFLAGS $CFLAGS" -AC_COMPILE_IFELSE( -[AC_LANG_PROGRAM([[ + [AC_CACHE_CHECK([for varargs GLU tesselator callback function type], + [ax_cv_varargs_glu_tesscb], + [AC_LANG_PUSH([C++]) + ax_cv_varargs_glu_tesscb=no + ax_save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$GL_CFLAGS $CXXFLAGS" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ # ifdef HAVE_GL_GLU_H # include # else # include # endif]], - [[GLvoid (*func)(...); gluTessCallback(0, 0, func)]])], -[ax_cv_varargs_glu_tesscb=yes]) -CFLAGS="$ax_save_CFLAGS"]) -AS_IF([test X$ax_cv_varargs_glu_tesscb = Xyes], - [AC_DEFINE([HAVE_VARARGS_GLU_TESSCB], [1], - [Use nonstandard varargs form for the GLU tesselator callback])])]) + [[GLvoid (*func)(...); gluTessCallback(0, 0, func)]])], + [ax_cv_varargs_glu_tesscb=yes]) + CXXFLAGS=$ax_save_CXXFLAGS + AC_LANG_POP([C++])]) + AS_IF([test X$ax_cv_varargs_glu_tesscb = Xyes], + [AC_DEFINE([HAVE_VARARGS_GLU_TESSCB], [1], + [Use nonstandard varargs form for the GLU tesselator callback])])]) ]) diff -Nru chromium-bsu-0.9.15/m4/ax_check_glut.m4 chromium-bsu-0.9.15.1/m4/ax_check_glut.m4 --- chromium-bsu-0.9.15/m4/ax_check_glut.m4 2010-12-18 03:16:17.000000000 +0000 +++ chromium-bsu-0.9.15.1/m4/ax_check_glut.m4 2013-05-25 05:13:09.000000000 +0000 @@ -1,62 +1,62 @@ -# =========================================================================== -# http://autoconf-archive.cryp.to/ax_check_glut.html -# =========================================================================== +# -*- mode: autoconf -*- # -# SYNOPSIS +# AX_CHECK_GLUT # -# AX_CHECK_GLUT +# Check for GLUT. If GLUT is found, the required compiler and linker flags +# are included in the output variables "GLUT_CFLAGS" and "GLUT_LIBS", +# respectively. If GLUT is not found, "no_glut" is set to "yes". +# +# If the header "GL/glut.h" is found, "HAVE_GL_GLUT_H" is defined. If the +# header "GLUT/glut.h" is found, HAVE_GLUT_GLUT_H is defined. These +# preprocessor definitions may not be mutually exclusive. +# +# version: 2.3 +# author: Braden McDaniel +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. +# +# As a special exception, the you may copy, distribute and modify the +# configure scripts that are the output of Autoconf when processing +# the Macro. You need not follow the terms of the GNU General Public +# License when using or distributing such scripts. # -# DESCRIPTION -# -# Check for GLUT. If GLUT is found, the required compiler and linker flags -# are included in the output variables "GLUT_CFLAGS" and "GLUT_LIBS", -# respectively. If GLUT is not found, "no_glut" is set to "yes". -# -# If the header "GL/glut.h" is found, "HAVE_GL_GLUT_H" is defined. If the -# header "GLUT/glut.h" is found, HAVE_GLUT_GLUT_H is defined. These -# preprocessor definitions may not be mutually exclusive. -# -# LICENSE -# -# Copyright (c) 2009 Braden McDaniel -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - AC_DEFUN([AX_CHECK_GLUT], [AC_REQUIRE([AX_CHECK_GLU])dnl AC_REQUIRE([AC_PATH_XTRA])dnl -ax_save_CPPFLAGS="${CPPFLAGS}" -CPPFLAGS="${GLU_CFLAGS} ${CPPFLAGS}" +# +# Kilgard's GLUT need's both Xmu and Xi, while freeglut just needs Xi. +# It's also probably a good idea to accommodate the possibility of a +# GLUT implementation that needs neither. +# +AC_LANG_PUSH([C]) +AC_CHECK_LIB([Xmu], [XmuScreenOfWindow], + [ax_check_glut_xmu_libs=-lXmu], , + [$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS]) +AC_CHECK_LIB([Xi], [XIQueryVersion], + [ax_check_glut_xi_libs=-lXi], , + [$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS]) +AC_LANG_POP([C]) + +ax_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$GLU_CFLAGS $CPPFLAGS" AC_CHECK_HEADERS([GL/glut.h GLUT/glut.h]) -CPPFLAGS="${ax_save_CPPFLAGS}" +CPPFLAGS=$ax_save_CPPFLAGS -GLUT_CFLAGS=${GLU_CFLAGS} -GLUT_LIBS=${GLU_LIBS} +GLUT_CFLAGS=$GLU_CFLAGS m4_define([AX_CHECK_GLUT_PROGRAM], [AC_LANG_PROGRAM([[ @@ -72,41 +72,42 @@ # endif]], [[glutMainLoop()]])]) +AC_CACHE_CHECK([for GLUT library], [ax_cv_check_glut_libglut], +[ax_cv_check_glut_libglut=no # # If X is present, assume GLUT depends on it. # -AS_IF([test X$no_x != Xyes], - [GLUT_LIBS="${X_PRE_LIBS} -lXmu -lXi ${X_EXTRA_LIBS} ${GLUT_LIBS}"]) - -AC_CACHE_CHECK([for GLUT library], [ax_cv_check_glut_libglut], -[ax_cv_check_glut_libglut="no" AC_LANG_PUSH(C) -ax_save_CPPFLAGS="${CPPFLAGS}" -CPPFLAGS="${GLUT_CFLAGS} ${CPPFLAGS}" -ax_save_LIBS="${LIBS}" +ax_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$GLUT_CFLAGS $CPPFLAGS" +ax_save_LDFLAGS=$LDFLAGS +ax_save_LIBS=$LIBS LIBS="" +AS_IF([test X$no_x != Xyes], + [ax_check_glut_x_libs="$ax_check_glut_xmu_libs $ax_check_glut_xi_libs $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"]) ax_check_libs="-lglut32 -lglut" -for ax_lib in ${ax_check_libs}; do +for ax_lib in $ax_check_libs; do AS_IF([test X$ax_compiler_ms = Xyes], - [ax_try_lib=`echo $ax_lib | sed -e 's/^-l//' -e 's/$/.lib/'`], - [ax_try_lib="${ax_lib}"]) - LIBS="${ax_try_lib} ${GLUT_LIBS} ${ax_save_LIBS}" + [ax_try_lib=`echo $ax_lib | $SED -e 's/^-l//' -e 's/$/.lib/'`], + [ax_try_lib=$ax_lib]) + LIBS="$ax_try_lib $ax_check_glut_x_libs $ax_save_LIBS" AC_LINK_IFELSE([AX_CHECK_GLUT_PROGRAM], - [ax_cv_check_glut_libglut="${ax_try_lib}"; break]) + [ax_cv_check_glut_libglut=$ax_try_lib; break]) done -AS_IF([test "X$ax_cv_check_glut_libglut" = Xno -a "X$no_x" = Xyes], -[LIBS='-framework GLUT' -AC_LINK_IFELSE([AX_CHECK_GLUT_PROGRAM], - [ax_cv_check_glut_libglut="$LIBS"])]) +LIBS=$ax_save_LIBS +AS_IF([test "X$ax_cv_check_glut_libglut" = Xno -a X$no_x = Xyes], + [LDFLAGS="$ax_save_LDFLAGS -framework GLUT" + AC_LINK_IFELSE([AX_CHECK_GLUT_PROGRAM], + [ax_cv_check_glut_libglut='-framework GLUT'])]) -CPPFLAGS="${ax_save_CPPFLAGS}" -LIBS="${ax_save_LIBS}" +LDFLAGS=$ax_save_LDFLAGS +CPPFLAGS=$ax_save_CPPFLAGS AC_LANG_POP(C)]) AS_IF([test "X$ax_cv_check_glut_libglut" = Xno], - [no_glut="yes"; GLUT_CFLAGS=""; GLUT_LIBS=""], - [GLUT_LIBS="${ax_cv_check_glut_libglut} ${GLUT_LIBS}"]) + [no_glut=yes; GLUT_CFLAGS=""; GLUT_LIBS=""], + [GLUT_LIBS="$ax_cv_check_glut_libglut"]) AC_SUBST([GLUT_CFLAGS]) AC_SUBST([GLUT_LIBS]) diff -Nru chromium-bsu-0.9.15/m4/ax_lang_compiler_ms.m4 chromium-bsu-0.9.15.1/m4/ax_lang_compiler_ms.m4 --- chromium-bsu-0.9.15/m4/ax_lang_compiler_ms.m4 2010-12-18 03:16:17.000000000 +0000 +++ chromium-bsu-0.9.15.1/m4/ax_lang_compiler_ms.m4 2013-05-25 05:13:09.000000000 +0000 @@ -1,26 +1,33 @@ -# =========================================================================== -# http://autoconf-archive.cryp.to/ax_lang_compiler_ms.html -# =========================================================================== +# -*- mode: autoconf -*- # -# SYNOPSIS +# Check whether the compiler for the current language is Microsoft. # -# AX_LANG_COMPILER_MS +# This macro is modeled after _AC_LANG_COMPILER_GNU in the GNU Autoconf +# implementation. # -# DESCRIPTION +# version: 1.0 +# author: Braden McDaniel +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. +# +# As a special exception, the you may copy, distribute and modify the +# configure scripts that are the output of Autoconf when processing +# the Macro. You need not follow the terms of the GNU General Public +# License when using or distributing such scripts. # -# Check whether the compiler for the current language is Microsoft. -# -# This macro is modeled after _AC_LANG_COMPILER_GNU in the GNU Autoconf -# implementation. -# -# LICENSE -# -# Copyright (c) 2009 Braden McDaniel -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. - AC_DEFUN([AX_LANG_COMPILER_MS], [AC_CACHE_CHECK([whether we are using the Microsoft _AC_LANG compiler], [ax_cv_[]_AC_LANG_ABBREV[]_compiler_ms], diff -Nru chromium-bsu-0.9.15/m4/pkg.m4 chromium-bsu-0.9.15.1/m4/pkg.m4 --- chromium-bsu-0.9.15/m4/pkg.m4 2010-12-18 03:16:17.000000000 +0000 +++ chromium-bsu-0.9.15.1/m4/pkg.m4 2013-05-25 05:13:09.000000000 +0000 @@ -26,7 +26,8 @@ # ---------------------------------- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) @@ -72,7 +73,8 @@ pkg_cv_[]$1="$$1" elif test -n "$PKG_CONFIG"; then PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes]) else pkg_failed=untried @@ -120,9 +122,9 @@ AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD diff -Nru chromium-bsu-0.9.15/misc/Makefile.am chromium-bsu-0.9.15.1/misc/Makefile.am --- chromium-bsu-0.9.15/misc/Makefile.am 2011-02-14 03:54:03.000000000 +0000 +++ chromium-bsu-0.9.15.1/misc/Makefile.am 2013-05-25 05:35:50.000000000 +0000 @@ -3,7 +3,7 @@ dist_man_MANS = chromium-bsu.6 dist_icon_DATA = chromium-bsu.png -icondir = $(datarootdir)/pixmaps +icondir = $(datarootdir)/icons/hicolor/64x64/apps dist_menu_DATA = chromium-bsu.desktop menudir = $(datarootdir)/applications diff -Nru chromium-bsu-0.9.15/misc/Makefile.in chromium-bsu-0.9.15.1/misc/Makefile.in --- chromium-bsu-0.9.15/misc/Makefile.in 2011-02-14 03:55:04.000000000 +0000 +++ chromium-bsu-0.9.15.1/misc/Makefile.in 2013-05-25 05:40:40.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -38,8 +54,7 @@ DIST_COMMON = $(dist_icon_DATA) $(dist_man_MANS) $(dist_menu_DATA) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/m4/ax_check_gl.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_gl.m4 \ $(top_srcdir)/m4/ax_check_glu.m4 \ $(top_srcdir)/m4/ax_check_glut.m4 \ $(top_srcdir)/m4/ax_lang_compiler_ms.m4 \ @@ -57,6 +72,11 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -78,6 +98,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man6dir = $(mandir)/man6 am__installdirs = "$(DESTDIR)$(man6dir)" "$(DESTDIR)$(icondir)" \ "$(DESTDIR)$(menudir)" @@ -162,11 +188,13 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ +SDLIMAGE_CFLAGS = @SDLIMAGE_CFLAGS@ +SDLIMAGE_LIBS = @SDLIMAGE_LIBS@ +SDLMIXER_CFLAGS = @SDLMIXER_CFLAGS@ +SDLMIXER_LIBS = @SDLMIXER_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_LIBS = @SDL_LIBS@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -190,7 +218,6 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -239,7 +266,7 @@ MAINTAINERCLEANFILES = Makefile.in dist_man_MANS = chromium-bsu.6 dist_icon_DATA = chromium-bsu.png -icondir = $(datarootdir)/pixmaps +icondir = $(datarootdir)/icons/hicolor/64x64/apps dist_menu_DATA = chromium-bsu.desktop menudir = $(datarootdir)/applications all: all-am @@ -277,11 +304,18 @@ $(am__aclocal_m4_deps): install-man6: $(dist_man_MANS) @$(NORMAL_INSTALL) - test -z "$(man6dir)" || $(MKDIR_P) "$(DESTDIR)$(man6dir)" - @list=''; test -n "$(man6dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.6[a-z]*$$/p'; \ + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man6dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man6dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man6dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.6[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -310,13 +344,14 @@ sed -n '/\.6[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^6][0-9a-z]*$$,6,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man6dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man6dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man6dir)'; $(am__uninstall_files_from_dir) install-dist_iconDATA: $(dist_icon_DATA) @$(NORMAL_INSTALL) - test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)" @list='$(dist_icon_DATA)'; test -n "$(icondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(icondir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -330,13 +365,14 @@ @$(NORMAL_UNINSTALL) @list='$(dist_icon_DATA)'; test -n "$(icondir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(icondir)" && rm -f $$files + dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) install-dist_menuDATA: $(dist_menu_DATA) @$(NORMAL_INSTALL) - test -z "$(menudir)" || $(MKDIR_P) "$(DESTDIR)$(menudir)" @list='$(dist_menu_DATA)'; test -n "$(menudir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(menudir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(menudir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -350,15 +386,15 @@ @$(NORMAL_UNINSTALL) @list='$(dist_menu_DATA)'; test -n "$(menudir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(menudir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(menudir)" && rm -f $$files + dir='$(DESTDIR)$(menudir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @list='$(MANS)'; if test -n "$$list"; then \ @@ -367,10 +403,10 @@ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ if test -n "$$list" && \ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ + echo " typically 'make maintainer-clean' will remove them" >&2; \ exit 1; \ else :; fi; \ else :; fi @@ -420,10 +456,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru chromium-bsu-0.9.15/misc/chromium-bsu.desktop chromium-bsu-0.9.15.1/misc/chromium-bsu.desktop --- chromium-bsu-0.9.15/misc/chromium-bsu.desktop 2009-03-28 13:10:28.000000000 +0000 +++ chromium-bsu-0.9.15.1/misc/chromium-bsu.desktop 2013-05-15 05:03:14.000000000 +0000 @@ -11,3 +11,4 @@ Type=Application Categories=Game;ArcadeGame; StartupNotify=false +Keywords=Shooter;Space; diff -Nru chromium-bsu-0.9.15/missing chromium-bsu-0.9.15.1/missing --- chromium-bsu-0.9.15/missing 2010-01-18 06:28:57.000000000 +0000 +++ chromium-bsu-0.9.15.1/missing 2012-12-26 00:15:44.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.18; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -26,7 +25,7 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi @@ -34,7 +33,7 @@ sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' sed_minuso='s/.* -o \([^ ]*\).*/\1/p' -# In the cases where this matters, `missing' is being run in the +# In the cases where this matters, 'missing' is being run in the # srcdir already. if test -f configure.ac; then configure_ac=configure.ac @@ -65,7 +64,7 @@ echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an error status if there is no known handling for PROGRAM. Options: @@ -74,21 +73,20 @@ --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' + aclocal touch file 'aclocal.m4' + autoconf touch file 'configure' + autoheader touch file 'config.h.in' autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c + automake touch all 'Makefile.in' files + bison create 'y.tab.[ch]', if possible, from existing .[ch] + flex create 'lex.yy.c', if possible, from existing .c help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c + lex create 'lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + yacc create 'y.tab.[ch]', if possible, from existing .[ch] -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -100,8 +98,8 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: Unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; @@ -122,22 +120,13 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 elif test "x$2" = "x--version" || test "x$2" = "x--help"; then # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether + # running '$TOOL --version' or '$TOOL --help' to check whether # $TOOL exists and not knowing $TOOL uses missing. exit 1 fi @@ -149,27 +138,27 @@ case $program in aclocal*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from +WARNING: '$1' is $msg. You should only need it if + you modified 'acinclude.m4' or '${configure_ac}'. You might want + to install the Automake and Perl packages. Grab them from any GNU archive site." touch aclocal.m4 ;; autoconf*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU +WARNING: '$1' is $msg. You should only need it if + you modified '${configure_ac}'. You might want to install the + Autoconf and GNU m4 packages. Grab them from any GNU archive site." touch configure ;; autoheader*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them +WARNING: '$1' is $msg. You should only need it if + you modified 'acconfig.h' or '${configure_ac}'. You might want + to install the Autoconf and GNU m4 packages. Grab them from any GNU archive site." files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` test -z "$files" && files="config.h" @@ -186,9 +175,9 @@ automake*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. +WARNING: '$1' is $msg. You should only need it if + you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. + You might want to install the Automake and Perl packages. Grab them from any GNU archive site." find . -type f -name Makefile.am -print | sed 's/\.am$/.in/' | @@ -197,10 +186,10 @@ autom4te*) echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. +WARNING: '$1' is needed, but is $msg. You might have modified some files without having the proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU + You can get '$1' as part of Autoconf from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` @@ -220,13 +209,13 @@ bison*|yacc*) echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package +WARNING: '$1' $msg. You should only need it if + you modified a '.y' file. You may need the Bison package in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." + Bison from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -250,13 +239,13 @@ lex*|flex*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package +WARNING: '$1' is $msg. You should only need it if + you modified a '.l' file. You may need the Flex package in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." + Flex from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -273,10 +262,10 @@ help2man*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if +WARNING: '$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." + Help2man package in order for those modifications to take + effect. You can get Help2man from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -291,12 +280,12 @@ makeinfo*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file +WARNING: '$1' is $msg. You should only need it if + you modified a '.texi' or '.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." + call might also be the consequence of using a buggy 'make' (AIX, + DU, IRIX). You might want to install the Texinfo package or + the GNU make package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -318,49 +307,14 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. +WARNING: '$1' is needed, and is $msg. You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, + proper tools for further handling them. Check the 'README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." + some other package would contain this missing '$1' program." exit 1 ;; esac diff -Nru chromium-bsu-0.9.15/po/LINGUAS chromium-bsu-0.9.15.1/po/LINGUAS --- chromium-bsu-0.9.15/po/LINGUAS 2011-02-07 03:59:50.000000000 +0000 +++ chromium-bsu-0.9.15.1/po/LINGUAS 2013-05-11 04:48:17.000000000 +0000 @@ -3,5 +3,8 @@ es fr it +ru sv +zh_CN zh_TW +tr Binary files /tmp/7K9nOp7Wb5/chromium-bsu-0.9.15/po/bg.gmo and /tmp/9BF9Wy2VjB/chromium-bsu-0.9.15.1/po/bg.gmo differ diff -Nru chromium-bsu-0.9.15/po/bg.po chromium-bsu-0.9.15.1/po/bg.po --- chromium-bsu-0.9.15/po/bg.po 2011-02-14 03:55:27.000000000 +0000 +++ chromium-bsu-0.9.15.1/po/bg.po 2013-05-25 05:43:49.000000000 +0000 @@ -1,21 +1,22 @@ -# SOME DESCRIPTIVE TITLE. +# Bulgarian translation for Chromium B.S.U. # This file is put in the public domain. -# Damyan Ivanov , 2009, 2011. # +# Translators: +# Damyan Ivanov , 2009, 2011. msgid "" msgstr "" "Project-Id-Version: Chromium B.S.U.\n" "Report-Msgid-Bugs-To: http://sf.net/projects/chromium-bsu/bugs\n" -"POT-Creation-Date: 2011-02-10 19:48+0800\n" -"PO-Revision-Date: 2011-02-07 15:20+0200\n" +"POT-Creation-Date: 2013-05-25 13:43+0800\n" +"PO-Revision-Date: 2011-03-22 15:18+0000\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" "Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" #: src/Audio.cpp:110 msgid "audio" @@ -89,12 +90,17 @@ msgid "CDROM status = %d\n" msgstr "Състояние на компактдисково устройство: %d\n" -#: src/Audio.cpp:298 +#: src/Audio.cpp:275 +#, c-format +msgid "Could not set CD volume, amixer returned status %d\n" +msgstr "" + +#: src/Audio.cpp:302 #, c-format msgid "Audio::setMusicIndex(%d)\n" msgstr "Audio::setMusicIndex(%d)\n" -#: src/Audio.cpp:315 +#: src/Audio.cpp:319 #, c-format msgid "track %d is data - trying next track...\n" msgstr "пътечка №%d съдържа данни, опит със следващата...\n" @@ -222,22 +228,22 @@ msgid "ERROR!! <%s> alutGetError() = %s\n" msgstr "ГРЕШКА!! <%s> alutGetError() = %s\n" -#: src/AudioOpenAL.cpp:732 +#: src/AudioOpenAL.cpp:730 #, c-format msgid "ERROR: filename too long: \"%s\", line %d\n" msgstr "ГРЕШКА: името на файла е твърде дълго: „%s“, ред %d\n" -#: src/AudioOpenAL.cpp:750 +#: src/AudioOpenAL.cpp:748 #, c-format msgid "WARNING: MP3 support not available: \"%s\", line %d\n" msgstr "ВНИМАНИЕ: не е налична поддръжка на MP3: „%s“, ред %d\n" -#: src/AudioOpenAL.cpp:761 +#: src/AudioOpenAL.cpp:759 #, c-format msgid "WARNING: Ogg/Vorbis support not available: \"%s\", line %d\n" msgstr "ВНИМАНИЕ: не е налична поддръжка на Ogg/Vorbis: „%s“, ред %d\n" -#: src/AudioOpenAL.cpp:765 +#: src/AudioOpenAL.cpp:763 #, c-format msgid "WARNING: file type not recognized: \"%s\": \"%s\", line %d\n" msgstr "ВНИМАНИЕ: типа на файла не е разпознат: „%s“: „%s“, ред %d\n" @@ -273,7 +279,7 @@ msgid "AudioOpenAL::setMusicIndex -- end" msgstr "AudioOpenAL::setMusicIndex -- край" -#: src/AudioOpenAL.cpp:909 src/AudioOpenAL.cpp:942 src/AudioOpenAL.cpp:986 +#: src/AudioOpenAL.cpp:909 src/AudioOpenAL.cpp:942 src/AudioOpenAL.cpp:992 #, c-format msgid "WARNING: PlayList support not compiled in (AudioOpenAL.cpp): %s\n" msgstr "ВНИМАНИЕ: не е включена поддръжка на списъци за изпълнение (AudioOpenAL.cpp): %s\n" @@ -288,22 +294,32 @@ msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadMP3\n" msgstr "ГРЕШКА: Не може да се отвори „%s“ в AudioOpenAL::loadMP3\n" -#: src/AudioOpenAL.cpp:973 +#: src/AudioOpenAL.cpp:971 +#, fuzzy, c-format +msgid "ERROR: Could not read from \"%s\" in AudioOpenAL::loadMP3\n" +msgstr "ГРЕШКА: Не може да се отвори „%s“ в AudioOpenAL::loadMP3\n" + +#: src/AudioOpenAL.cpp:979 #, c-format msgid "ERROR: alutLoadMP3() failed in AudioOpenAL::loadMP3\n" msgstr "ГРЕШКА: alutLoadMP3() пропадна в AudioOpenAL::loadMP3\n" -#: src/AudioOpenAL.cpp:1005 +#: src/AudioOpenAL.cpp:1011 #, c-format msgid "ERROR: Could not allocate memory in AudioOpenAL::loadVorbis\n" msgstr "ГРЕШКА: Не може да се задели памет в AudioOpenAL::loadVorbis\n" -#: src/AudioOpenAL.cpp:1011 +#: src/AudioOpenAL.cpp:1017 #, c-format msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadVorbis\n" msgstr "ГРЕШКА: Не може да се отвори „%s“ в AudioOpenAL::loadVorbis\n" -#: src/AudioOpenAL.cpp:1019 +#: src/AudioOpenAL.cpp:1023 +#, fuzzy, c-format +msgid "ERROR: Could not read from \"%s\" in AudioOpenAL::loadVorbis\n" +msgstr "ГРЕШКА: Не може да се отвори „%s“ в AudioOpenAL::loadVorbis\n" + +#: src/AudioOpenAL.cpp:1031 #, c-format msgid "ERROR: alutLoadVorbis() failed in AudioOpenAL::loadVorbis\n" msgstr "ГРЕШКА: alutLoadVorbis() пропадна в AudioOpenAL::loadVorbis\n" @@ -338,7 +354,7 @@ msgid "%d EnemyAircraft allocated\n" msgstr "заделени %d EnemyAircraft\n" -#: src/EnemyAircraft_Straight.cpp:103 +#: src/EnemyAircraft_Straight.cpp:98 #, c-format msgid "EnemyAircraft_Straight %p ... pos[1] = %g, vel[1] = %g\n" msgstr "EnemyAircraft_Straight %p ... pos[1] = %g, vel[1] = %g\n" @@ -413,27 +429,38 @@ msgid "WARNING: could not write score file (%s)\n" msgstr "ВНИМАНИЕ: неуспех при запазване на файла с постижения (%s)\n" -#: src/HiScore.cpp:328 +#: src/HiScore.cpp:276 +#, fuzzy, c-format +msgid "WARNING: error reading score file (%s)\n" +msgstr "ВНИМАНИЕ: неуспех при четене на файла с постижения (%s)\n" + +#: src/HiScore.cpp:319 src/HiScore.cpp:321 src/HiScore.cpp:323 +#: src/HiScore.cpp:343 src/HiScore.cpp:345 src/HiScore.cpp:347 +#, fuzzy, c-format +msgid "WARNING: error reading old score file (%s)\n" +msgstr "ВНИМАНИЕ: неуспех при четене на файла с постижения (%s)\n" + +#: src/HiScore.cpp:332 #, c-format msgid "WARNING: empty score file (%s)\n" msgstr "ВНИМАНИЕ: празен файл с постижения (%s)\n" -#: src/HiScore.cpp:350 +#: src/HiScore.cpp:357 #, c-format msgid "WARNING: could not read score file (%s)\n" msgstr "ВНИМАНИЕ: неуспех при четене на файла с постижения (%s)\n" -#: src/HiScore.cpp:442 +#: src/HiScore.cpp:449 #, c-format msgid "high scores:\n" msgstr "постижения:\n" -#: src/HiScore.cpp:448 +#: src/HiScore.cpp:455 #, c-format msgid "%02d/%02d/%04d %16s %d\n" msgstr "%02d/%02d/%04d %16s %d\n" -#: src/main.cpp:118 +#: src/main.cpp:119 #, c-format msgid "" "\n" @@ -470,12 +497,12 @@ "--------------------------------------------------\n" "\n" -#: src/main.cpp:230 +#: src/main.cpp:231 #, c-format msgid "!! ERROR !! - " msgstr "!! ГРЕШКА !! — " -#: src/main.cpp:254 +#: src/main.cpp:255 #, c-format msgid "Extensions :" msgstr "Разширения :" @@ -550,7 +577,7 @@ msgid "MainGLUT::run()\n" msgstr "MainGLUT::run()\n" -#: src/MainGLUT.cpp:93 src/MainSDL.cpp:288 +#: src/MainGLUT.cpp:93 src/MainSDL.cpp:286 #, c-format msgid "ERROR!!! OpenGL error: %s\n" msgstr "ГРЕШКА!!! грешка в OpenGL: %s\n" @@ -585,7 +612,7 @@ msgid "no joysticks found\n" msgstr "не са открити джойстици\n" -#: src/MainSDL.cpp:116 src/MainSDL.cpp:349 +#: src/MainSDL.cpp:116 src/MainSDL.cpp:347 #, c-format msgid "Couldn't set video mode: %s\n" msgstr "Неуспех при установяване на видео-режима: %s\n" @@ -603,22 +630,22 @@ "Превръщане : %s\n" "Версия : %s\n" -#: src/MainSDL.cpp:217 +#: src/MainSDL.cpp:215 #, c-format msgid "init----> %3.2ffps gameSpeed = %g\n" msgstr "init----> %3.2ffps gameSpeed = %g\n" -#: src/MainSDL.cpp:224 +#: src/MainSDL.cpp:222 #, c-format msgid "init----> %3.2ffps targetAdj = %g, tmp = %g\n" msgstr "init----> %3.2ffps targetAdj = %g, tmp = %g\n" -#: src/MainSDL.cpp:237 +#: src/MainSDL.cpp:235 #, c-format msgid "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" msgstr "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" -#: src/MainSDL.cpp:259 +#: src/MainSDL.cpp:257 #, c-format msgid "" "%d speed adjustments required.\n" @@ -640,22 +667,22 @@ " Понякога те могат да попречат на достигането на стабилна\n" " скорост на видеото.\n" -#: src/MainSDL.cpp:271 +#: src/MainSDL.cpp:269 #, c-format msgid "exit.\n" msgstr "изход.\n" -#: src/MainSDL.cpp:296 +#: src/MainSDL.cpp:294 #, c-format msgid "ERROR!!! SDL error '%s'\n" msgstr "ГРЕШКА!!! грешка в SDL: %s\n" -#: src/MainSDL.cpp:354 +#: src/MainSDL.cpp:352 #, c-format msgid "video mode set " msgstr "видео-режимът е установен" -#: src/MainSDL.cpp:361 +#: src/MainSDL.cpp:359 #, c-format msgid "(bpp=%d RGB=%d%d%d depth=%d)\n" msgstr "(bpp=%d RGB=%d%d%d depth=%d)\n" @@ -734,7 +761,7 @@ msgid "game->gameFrame = %d\n" msgstr "game->gameFrame = %d\n" -#: src/MainSDL_Event.cpp:534 +#: src/MainSDL_Event.cpp:538 #, c-format msgid "MainSDL::grabMouse(%d)\n" msgstr "MainSDL::grabMouse(%d)\n" @@ -807,7 +834,7 @@ msgid "q u i t" msgstr "и з х о д" -#: src/MenuGL.cpp:143 src/MenuGL.cpp:418 +#: src/MenuGL.cpp:143 src/MenuGL.cpp:417 #, c-format msgid "ATTENTION: Using 'thin' text to improve framerate...\n" msgstr "ВНИМАНИЕ: Използва се „тънък“ текст за подобряване на скоростта…\n" @@ -853,77 +880,77 @@ msgid "-" msgstr "-" -#: src/MenuGL.cpp:292 src/MenuGL.cpp:321 +#: src/MenuGL.cpp:292 src/MenuGL.cpp:320 msgid "high scores" msgstr "рекорди" -#: src/MenuGL.cpp:350 +#: src/MenuGL.cpp:349 msgid "the" msgstr "проектът" -#: src/MenuGL.cpp:354 +#: src/MenuGL.cpp:353 msgid "reptile" msgstr "за интегриране" -#: src/MenuGL.cpp:358 +#: src/MenuGL.cpp:357 msgid "labour" msgstr "на" -#: src/MenuGL.cpp:362 +#: src/MenuGL.cpp:361 msgid "project" msgstr "влечугите" -#: src/MenuGL.cpp:423 +#: src/MenuGL.cpp:422 #, c-format msgid "ATTENTION: Reverting to 'thick' text...\n" msgstr "ВНИМАНИЕ: Връщане към „дебел“ текст…\n" -#: src/MenuGL.cpp:474 +#: src/MenuGL.cpp:473 #, c-format msgid "low" msgstr "ниска" -#: src/MenuGL.cpp:475 +#: src/MenuGL.cpp:474 #, c-format msgid "med" msgstr "средна" -#: src/MenuGL.cpp:476 +#: src/MenuGL.cpp:475 #, c-format msgid "high" msgstr "висока" -#: src/MenuGL.cpp:481 +#: src/MenuGL.cpp:480 #, c-format msgid "%dx%d" msgstr "%dx%d" -#: src/MenuGL.cpp:485 +#: src/MenuGL.cpp:484 #, c-format msgid "true" msgstr "да" -#: src/MenuGL.cpp:486 +#: src/MenuGL.cpp:485 #, c-format msgid "false" msgstr "не" -#: src/MenuGL.cpp:792 src/MenuGL.cpp:865 src/MenuGL.cpp:936 +#: src/MenuGL.cpp:791 src/MenuGL.cpp:864 src/MenuGL.cpp:935 #, c-format msgid "---- error setting full screen mode ----" msgstr "---- грешка при установяване на режим „цял екран“ ----" -#: src/MenuGL.cpp:794 +#: src/MenuGL.cpp:793 #, c-format msgid "---- error setting window mode ----" msgstr "---- грешка при установяване на режим „прозорец“ ----" -#: src/MenuGL.cpp:835 +#: src/MenuGL.cpp:834 #, c-format msgid "---- you must complete level %d before you can select level %d ----" msgstr "---- трябва да преминете ниво %d преди да можете да изберете ниво %d ----" -#: src/MenuGL.cpp:851 src/MenuGL.cpp:922 +#: src/MenuGL.cpp:850 src/MenuGL.cpp:921 #, c-format msgid "---- error setting screen size ----" msgstr "---- грешка при настройване на размера на екрана ----" @@ -943,15 +970,15 @@ msgid "ScreenItemAdd::putScreenItems() Hero??? HUH???\n" msgstr "ScreenItemAdd::putScreenItems() Герой??? Ъ???\n" -#: src/StatusDisplay.cpp:651 src/StatusDisplay.cpp:655 +#: src/StatusDisplay.cpp:653 src/StatusDisplay.cpp:657 msgid "p a u s e d" msgstr "п а у з а" -#: src/StatusDisplay.cpp:675 +#: src/StatusDisplay.cpp:677 msgid "do not let -any- ships past you! each one costs you a life!" msgstr "не позволявайте на НИКАКВИ кораби да преминат! всеки преминал кораб струва един живот!" -#: src/StatusDisplay.cpp:686 +#: src/StatusDisplay.cpp:688 msgid "let super shields pass by for an extra life!" msgstr "пропуснатите супер щитове носят по един живот!" diff -Nru chromium-bsu-0.9.15/po/chromium-bsu.pot chromium-bsu-0.9.15.1/po/chromium-bsu.pot --- chromium-bsu-0.9.15/po/chromium-bsu.pot 2011-02-10 11:48:04.000000000 +0000 +++ chromium-bsu-0.9.15.1/po/chromium-bsu.pot 2013-05-25 05:43:49.000000000 +0000 @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: chromium-bsu 0.9.15\n" +"Project-Id-Version: chromium-bsu 0.9.15.1\n" "Report-Msgid-Bugs-To: http://sf.net/projects/chromium-bsu/bugs\n" -"POT-Creation-Date: 2011-02-10 19:48+0800\n" +"POT-Creation-Date: 2013-05-25 13:43+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -81,12 +81,17 @@ msgid "CDROM status = %d\n" msgstr "" -#: src/Audio.cpp:298 +#: src/Audio.cpp:275 +#, c-format +msgid "Could not set CD volume, amixer returned status %d\n" +msgstr "" + +#: src/Audio.cpp:302 #, c-format msgid "Audio::setMusicIndex(%d)\n" msgstr "" -#: src/Audio.cpp:315 +#: src/Audio.cpp:319 #, c-format msgid "track %d is data - trying next track...\n" msgstr "" @@ -204,22 +209,22 @@ msgid "ERROR!! <%s> alutGetError() = %s\n" msgstr "" -#: src/AudioOpenAL.cpp:732 +#: src/AudioOpenAL.cpp:730 #, c-format msgid "ERROR: filename too long: \"%s\", line %d\n" msgstr "" -#: src/AudioOpenAL.cpp:750 +#: src/AudioOpenAL.cpp:748 #, c-format msgid "WARNING: MP3 support not available: \"%s\", line %d\n" msgstr "" -#: src/AudioOpenAL.cpp:761 +#: src/AudioOpenAL.cpp:759 #, c-format msgid "WARNING: Ogg/Vorbis support not available: \"%s\", line %d\n" msgstr "" -#: src/AudioOpenAL.cpp:765 +#: src/AudioOpenAL.cpp:763 #, c-format msgid "WARNING: file type not recognized: \"%s\": \"%s\", line %d\n" msgstr "" @@ -255,7 +260,7 @@ msgid "AudioOpenAL::setMusicIndex -- end" msgstr "" -#: src/AudioOpenAL.cpp:909 src/AudioOpenAL.cpp:942 src/AudioOpenAL.cpp:986 +#: src/AudioOpenAL.cpp:909 src/AudioOpenAL.cpp:942 src/AudioOpenAL.cpp:992 #, c-format msgid "WARNING: PlayList support not compiled in (AudioOpenAL.cpp): %s\n" msgstr "" @@ -270,22 +275,32 @@ msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadMP3\n" msgstr "" -#: src/AudioOpenAL.cpp:973 +#: src/AudioOpenAL.cpp:971 +#, c-format +msgid "ERROR: Could not read from \"%s\" in AudioOpenAL::loadMP3\n" +msgstr "" + +#: src/AudioOpenAL.cpp:979 #, c-format msgid "ERROR: alutLoadMP3() failed in AudioOpenAL::loadMP3\n" msgstr "" -#: src/AudioOpenAL.cpp:1005 +#: src/AudioOpenAL.cpp:1011 #, c-format msgid "ERROR: Could not allocate memory in AudioOpenAL::loadVorbis\n" msgstr "" -#: src/AudioOpenAL.cpp:1011 +#: src/AudioOpenAL.cpp:1017 #, c-format msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadVorbis\n" msgstr "" -#: src/AudioOpenAL.cpp:1019 +#: src/AudioOpenAL.cpp:1023 +#, c-format +msgid "ERROR: Could not read from \"%s\" in AudioOpenAL::loadVorbis\n" +msgstr "" + +#: src/AudioOpenAL.cpp:1031 #, c-format msgid "ERROR: alutLoadVorbis() failed in AudioOpenAL::loadVorbis\n" msgstr "" @@ -320,7 +335,7 @@ msgid "%d EnemyAircraft allocated\n" msgstr "" -#: src/EnemyAircraft_Straight.cpp:103 +#: src/EnemyAircraft_Straight.cpp:98 #, c-format msgid "EnemyAircraft_Straight %p ... pos[1] = %g, vel[1] = %g\n" msgstr "" @@ -395,27 +410,38 @@ msgid "WARNING: could not write score file (%s)\n" msgstr "" -#: src/HiScore.cpp:328 +#: src/HiScore.cpp:276 +#, c-format +msgid "WARNING: error reading score file (%s)\n" +msgstr "" + +#: src/HiScore.cpp:319 src/HiScore.cpp:321 src/HiScore.cpp:323 +#: src/HiScore.cpp:343 src/HiScore.cpp:345 src/HiScore.cpp:347 +#, c-format +msgid "WARNING: error reading old score file (%s)\n" +msgstr "" + +#: src/HiScore.cpp:332 #, c-format msgid "WARNING: empty score file (%s)\n" msgstr "" -#: src/HiScore.cpp:350 +#: src/HiScore.cpp:357 #, c-format msgid "WARNING: could not read score file (%s)\n" msgstr "" -#: src/HiScore.cpp:442 +#: src/HiScore.cpp:449 #, c-format msgid "high scores:\n" msgstr "" -#: src/HiScore.cpp:448 +#: src/HiScore.cpp:455 #, c-format msgid "%02d/%02d/%04d %16s %d\n" msgstr "" -#: src/main.cpp:118 +#: src/main.cpp:119 #, c-format msgid "" "\n" @@ -436,12 +462,12 @@ "\n" msgstr "" -#: src/main.cpp:230 +#: src/main.cpp:231 #, c-format msgid "!! ERROR !! - " msgstr "" -#: src/main.cpp:254 +#: src/main.cpp:255 #, c-format msgid "Extensions :" msgstr "" @@ -503,7 +529,7 @@ msgid "MainGLUT::run()\n" msgstr "" -#: src/MainGLUT.cpp:93 src/MainSDL.cpp:288 +#: src/MainGLUT.cpp:93 src/MainSDL.cpp:286 #, c-format msgid "ERROR!!! OpenGL error: %s\n" msgstr "" @@ -538,7 +564,7 @@ msgid "no joysticks found\n" msgstr "" -#: src/MainSDL.cpp:116 src/MainSDL.cpp:349 +#: src/MainSDL.cpp:116 src/MainSDL.cpp:347 #, c-format msgid "Couldn't set video mode: %s\n" msgstr "" @@ -552,22 +578,22 @@ "Version : %s\n" msgstr "" -#: src/MainSDL.cpp:217 +#: src/MainSDL.cpp:215 #, c-format msgid "init----> %3.2ffps gameSpeed = %g\n" msgstr "" -#: src/MainSDL.cpp:224 +#: src/MainSDL.cpp:222 #, c-format msgid "init----> %3.2ffps targetAdj = %g, tmp = %g\n" msgstr "" -#: src/MainSDL.cpp:237 +#: src/MainSDL.cpp:235 #, c-format msgid "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" msgstr "" -#: src/MainSDL.cpp:259 +#: src/MainSDL.cpp:257 #, c-format msgid "" "%d speed adjustments required.\n" @@ -580,22 +606,22 @@ " can make it difficult to maintain a steady frame rate.\n" msgstr "" -#: src/MainSDL.cpp:271 +#: src/MainSDL.cpp:269 #, c-format msgid "exit.\n" msgstr "" -#: src/MainSDL.cpp:296 +#: src/MainSDL.cpp:294 #, c-format msgid "ERROR!!! SDL error '%s'\n" msgstr "" -#: src/MainSDL.cpp:354 +#: src/MainSDL.cpp:352 #, c-format msgid "video mode set " msgstr "" -#: src/MainSDL.cpp:361 +#: src/MainSDL.cpp:359 #, c-format msgid "(bpp=%d RGB=%d%d%d depth=%d)\n" msgstr "" @@ -672,7 +698,7 @@ msgid "game->gameFrame = %d\n" msgstr "" -#: src/MainSDL_Event.cpp:534 +#: src/MainSDL_Event.cpp:538 #, c-format msgid "MainSDL::grabMouse(%d)\n" msgstr "" @@ -755,7 +781,7 @@ msgid "q u i t" msgstr "" -#: src/MenuGL.cpp:143 src/MenuGL.cpp:418 +#: src/MenuGL.cpp:143 src/MenuGL.cpp:417 #, c-format msgid "ATTENTION: Using 'thin' text to improve framerate...\n" msgstr "" @@ -801,77 +827,77 @@ msgid "-" msgstr "" -#: src/MenuGL.cpp:292 src/MenuGL.cpp:321 +#: src/MenuGL.cpp:292 src/MenuGL.cpp:320 msgid "high scores" msgstr "" -#: src/MenuGL.cpp:350 +#: src/MenuGL.cpp:349 msgid "the" msgstr "" -#: src/MenuGL.cpp:354 +#: src/MenuGL.cpp:353 msgid "reptile" msgstr "" -#: src/MenuGL.cpp:358 +#: src/MenuGL.cpp:357 msgid "labour" msgstr "" -#: src/MenuGL.cpp:362 +#: src/MenuGL.cpp:361 msgid "project" msgstr "" -#: src/MenuGL.cpp:423 +#: src/MenuGL.cpp:422 #, c-format msgid "ATTENTION: Reverting to 'thick' text...\n" msgstr "" -#: src/MenuGL.cpp:474 +#: src/MenuGL.cpp:473 #, c-format msgid "low" msgstr "" -#: src/MenuGL.cpp:475 +#: src/MenuGL.cpp:474 #, c-format msgid "med" msgstr "" -#: src/MenuGL.cpp:476 +#: src/MenuGL.cpp:475 #, c-format msgid "high" msgstr "" -#: src/MenuGL.cpp:481 +#: src/MenuGL.cpp:480 #, c-format msgid "%dx%d" msgstr "" -#: src/MenuGL.cpp:485 +#: src/MenuGL.cpp:484 #, c-format msgid "true" msgstr "" -#: src/MenuGL.cpp:486 +#: src/MenuGL.cpp:485 #, c-format msgid "false" msgstr "" -#: src/MenuGL.cpp:792 src/MenuGL.cpp:865 src/MenuGL.cpp:936 +#: src/MenuGL.cpp:791 src/MenuGL.cpp:864 src/MenuGL.cpp:935 #, c-format msgid "---- error setting full screen mode ----" msgstr "" -#: src/MenuGL.cpp:794 +#: src/MenuGL.cpp:793 #, c-format msgid "---- error setting window mode ----" msgstr "" -#: src/MenuGL.cpp:835 +#: src/MenuGL.cpp:834 #, c-format msgid "---- you must complete level %d before you can select level %d ----" msgstr "" -#: src/MenuGL.cpp:851 src/MenuGL.cpp:922 +#: src/MenuGL.cpp:850 src/MenuGL.cpp:921 #, c-format msgid "---- error setting screen size ----" msgstr "" @@ -891,15 +917,15 @@ msgid "ScreenItemAdd::putScreenItems() Hero??? HUH???\n" msgstr "" -#: src/StatusDisplay.cpp:651 src/StatusDisplay.cpp:655 +#: src/StatusDisplay.cpp:653 src/StatusDisplay.cpp:657 msgid "p a u s e d" msgstr "" -#: src/StatusDisplay.cpp:675 +#: src/StatusDisplay.cpp:677 msgid "do not let -any- ships past you! each one costs you a life!" msgstr "" -#: src/StatusDisplay.cpp:686 +#: src/StatusDisplay.cpp:688 msgid "let super shields pass by for an extra life!" msgstr "" Binary files /tmp/7K9nOp7Wb5/chromium-bsu-0.9.15/po/de.gmo and /tmp/9BF9Wy2VjB/chromium-bsu-0.9.15.1/po/de.gmo differ diff -Nru chromium-bsu-0.9.15/po/de.po chromium-bsu-0.9.15.1/po/de.po --- chromium-bsu-0.9.15/po/de.po 2011-02-14 03:55:27.000000000 +0000 +++ chromium-bsu-0.9.15.1/po/de.po 2013-05-25 05:43:49.000000000 +0000 @@ -1,15 +1,21 @@ +# German translation for Chromium B.S.U. +# This file is put in the public domain. +# +# Translators: +# Evgeni Golov , 2011 msgid "" msgstr "" "Project-Id-Version: Chromium B.S.U.\n" "Report-Msgid-Bugs-To: http://sf.net/projects/chromium-bsu/bugs\n" -"POT-Creation-Date: 2011-02-10 19:48+0800\n" -"PO-Revision-Date: \n" +"POT-Creation-Date: 2013-05-25 13:43+0800\n" +"PO-Revision-Date: 2011-03-22 15:18+0000\n" "Last-Translator: Evgeni Golov \n" "Language-Team: \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/Audio.cpp:110 msgid "audio" @@ -83,12 +89,17 @@ msgid "CDROM status = %d\n" msgstr "CDROM Status = %d\n" -#: src/Audio.cpp:298 +#: src/Audio.cpp:275 +#, c-format +msgid "Could not set CD volume, amixer returned status %d\n" +msgstr "" + +#: src/Audio.cpp:302 #, c-format msgid "Audio::setMusicIndex(%d)\n" msgstr "Audio::setMusicIndex(%d)\n" -#: src/Audio.cpp:315 +#: src/Audio.cpp:319 #, c-format msgid "track %d is data - trying next track...\n" msgstr "Track %d ist ein Daten-Track, versuche den nächsten...\n" @@ -216,22 +227,22 @@ msgid "ERROR!! <%s> alutGetError() = %s\n" msgstr "FEHLER!! <%s> alutGetError() = %s\n" -#: src/AudioOpenAL.cpp:732 +#: src/AudioOpenAL.cpp:730 #, c-format msgid "ERROR: filename too long: \"%s\", line %d\n" msgstr "FEHLER: Dateiname zu lang: \"%s\", Zeile %d\n" -#: src/AudioOpenAL.cpp:750 +#: src/AudioOpenAL.cpp:748 #, c-format msgid "WARNING: MP3 support not available: \"%s\", line %d\n" msgstr "WARNUNG: MP3 Unterstützung nicht verfügbar: \"%s\", Zeile %d\n" -#: src/AudioOpenAL.cpp:761 +#: src/AudioOpenAL.cpp:759 #, c-format msgid "WARNING: Ogg/Vorbis support not available: \"%s\", line %d\n" msgstr "WARNUNG: Ogg/Vorbis Unterstützung nicht verfügbar: \"%s\", Zeile %d\n" -#: src/AudioOpenAL.cpp:765 +#: src/AudioOpenAL.cpp:763 #, c-format msgid "WARNING: file type not recognized: \"%s\": \"%s\", line %d\n" msgstr "WARNUNG: Dateityp nicht erkannt: \"%s\": \"%s\", Zeile %d\n" @@ -267,7 +278,7 @@ msgid "AudioOpenAL::setMusicIndex -- end" msgstr "AudioOpenAL::setMusicIndex -- end" -#: src/AudioOpenAL.cpp:909 src/AudioOpenAL.cpp:942 src/AudioOpenAL.cpp:986 +#: src/AudioOpenAL.cpp:909 src/AudioOpenAL.cpp:942 src/AudioOpenAL.cpp:992 #, c-format msgid "WARNING: PlayList support not compiled in (AudioOpenAL.cpp): %s\n" msgstr "WARNUNG: Wiedergabelisten Unterstützung ist nicht einkompiliert (AudioOpenAL.cpp): %s\n" @@ -282,22 +293,32 @@ msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadMP3\n" msgstr "FEHLER: Konnte \"%s\" nicht öffnen in AudioOpenAL::loadMP3\n" -#: src/AudioOpenAL.cpp:973 +#: src/AudioOpenAL.cpp:971 +#, fuzzy, c-format +msgid "ERROR: Could not read from \"%s\" in AudioOpenAL::loadMP3\n" +msgstr "FEHLER: Konnte \"%s\" nicht öffnen in AudioOpenAL::loadMP3\n" + +#: src/AudioOpenAL.cpp:979 #, c-format msgid "ERROR: alutLoadMP3() failed in AudioOpenAL::loadMP3\n" msgstr "FEHLER: alutLoadMP3() fehlgeschlagen in AudioOpenAL::loadMP3\n" -#: src/AudioOpenAL.cpp:1005 +#: src/AudioOpenAL.cpp:1011 #, c-format msgid "ERROR: Could not allocate memory in AudioOpenAL::loadVorbis\n" msgstr "FEHLER: Konnte Speicher in AudioOpenAL::loadVorbis nicht reservieren\n" -#: src/AudioOpenAL.cpp:1011 +#: src/AudioOpenAL.cpp:1017 #, c-format msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadVorbis\n" msgstr "FEHLER: Konnte \"%s\" nicht öffnen in AudioOpenAL::loadVorbis\n" -#: src/AudioOpenAL.cpp:1019 +#: src/AudioOpenAL.cpp:1023 +#, fuzzy, c-format +msgid "ERROR: Could not read from \"%s\" in AudioOpenAL::loadVorbis\n" +msgstr "FEHLER: Konnte \"%s\" nicht öffnen in AudioOpenAL::loadVorbis\n" + +#: src/AudioOpenAL.cpp:1031 #, c-format msgid "ERROR: alutLoadVorbis() failed in AudioOpenAL::loadVorbis\n" msgstr "FEHLER: alutLoadVorbis() fehlgeschlagen in AudioOpenAL::loadVorbis\n" @@ -332,7 +353,7 @@ msgid "%d EnemyAircraft allocated\n" msgstr "%d EnemyAircraft reserviert\n" -#: src/EnemyAircraft_Straight.cpp:103 +#: src/EnemyAircraft_Straight.cpp:98 #, c-format msgid "EnemyAircraft_Straight %p ... pos[1] = %g, vel[1] = %g\n" msgstr "EnemyAircraft_Straight %p ... pos[1] = %g, vel[1] = %g\n" @@ -407,27 +428,38 @@ msgid "WARNING: could not write score file (%s)\n" msgstr "WARNUNG: konnte Punktzahldatei nicht schreiben (%s)\n" -#: src/HiScore.cpp:328 +#: src/HiScore.cpp:276 +#, fuzzy, c-format +msgid "WARNING: error reading score file (%s)\n" +msgstr "WARNUNG: konnte Punktzahldatei nicht lesen (%s)\n" + +#: src/HiScore.cpp:319 src/HiScore.cpp:321 src/HiScore.cpp:323 +#: src/HiScore.cpp:343 src/HiScore.cpp:345 src/HiScore.cpp:347 +#, fuzzy, c-format +msgid "WARNING: error reading old score file (%s)\n" +msgstr "WARNUNG: konnte Punktzahldatei nicht lesen (%s)\n" + +#: src/HiScore.cpp:332 #, c-format msgid "WARNING: empty score file (%s)\n" msgstr "WARNUNG: leere Punktzahldatei (%s)\n" -#: src/HiScore.cpp:350 +#: src/HiScore.cpp:357 #, c-format msgid "WARNING: could not read score file (%s)\n" msgstr "WARNUNG: konnte Punktzahldatei nicht lesen (%s)\n" -#: src/HiScore.cpp:442 +#: src/HiScore.cpp:449 #, c-format msgid "high scores:\n" msgstr "Bestenliste:\n" -#: src/HiScore.cpp:448 +#: src/HiScore.cpp:455 #, c-format msgid "%02d/%02d/%04d %16s %d\n" msgstr "%02d/%02d/%04d %16s %d\n" -#: src/main.cpp:118 +#: src/main.cpp:119 #, c-format msgid "" "\n" @@ -464,12 +496,12 @@ "--------------------------------------------------\n" "\n" -#: src/main.cpp:230 +#: src/main.cpp:231 #, c-format msgid "!! ERROR !! - " msgstr "!! FEHLER !! - " -#: src/main.cpp:254 +#: src/main.cpp:255 #, c-format msgid "Extensions :" msgstr "Erweiterungen:" @@ -544,7 +576,7 @@ msgid "MainGLUT::run()\n" msgstr "MainGLUT::run()\n" -#: src/MainGLUT.cpp:93 src/MainSDL.cpp:288 +#: src/MainGLUT.cpp:93 src/MainSDL.cpp:286 #, c-format msgid "ERROR!!! OpenGL error: %s\n" msgstr "FEHLER!!! OpenGL Fehler: %s\n" @@ -579,7 +611,7 @@ msgid "no joysticks found\n" msgstr "Keine Joysticks gefunden\n" -#: src/MainSDL.cpp:116 src/MainSDL.cpp:349 +#: src/MainSDL.cpp:116 src/MainSDL.cpp:347 #, c-format msgid "Couldn't set video mode: %s\n" msgstr "Konnte Video Modus nicht setzen: %s\n" @@ -597,22 +629,22 @@ "Renderer : %s\n" "Version : %s\n" -#: src/MainSDL.cpp:217 +#: src/MainSDL.cpp:215 #, c-format msgid "init----> %3.2ffps gameSpeed = %g\n" msgstr "init----> %3.2ffps gameSpeed = %g\n" -#: src/MainSDL.cpp:224 +#: src/MainSDL.cpp:222 #, c-format msgid "init----> %3.2ffps targetAdj = %g, tmp = %g\n" msgstr "init----> %3.2ffps targetAdj = %g, tmp = %g\n" -#: src/MainSDL.cpp:237 +#: src/MainSDL.cpp:235 #, c-format msgid "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" msgstr "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" -#: src/MainSDL.cpp:259 +#: src/MainSDL.cpp:257 #, c-format msgid "" "%d speed adjustments required.\n" @@ -634,22 +666,22 @@ " Programme (wie 'top', 'xosview', etc.) laufen. Solche\n" " Programme verhindern oft eine stabile Frame Rate.\n" -#: src/MainSDL.cpp:271 +#: src/MainSDL.cpp:269 #, c-format msgid "exit.\n" msgstr "beendet.\n" -#: src/MainSDL.cpp:296 +#: src/MainSDL.cpp:294 #, c-format msgid "ERROR!!! SDL error '%s'\n" msgstr "FEHLER!!! SDL Fehler '%s'\n" -#: src/MainSDL.cpp:354 +#: src/MainSDL.cpp:352 #, c-format msgid "video mode set " msgstr "Video Modus gesetzt" -#: src/MainSDL.cpp:361 +#: src/MainSDL.cpp:359 #, c-format msgid "(bpp=%d RGB=%d%d%d depth=%d)\n" msgstr "(bpp=%d RGB=%d%d%d depth=%d)\n" @@ -728,7 +760,7 @@ msgid "game->gameFrame = %d\n" msgstr "game->gameFrame = %d\n" -#: src/MainSDL_Event.cpp:534 +#: src/MainSDL_Event.cpp:538 #, c-format msgid "MainSDL::grabMouse(%d)\n" msgstr "MainSDL::grabMouse(%d)\n" @@ -801,7 +833,7 @@ msgid "q u i t" msgstr "B e e n d e n" -#: src/MenuGL.cpp:143 src/MenuGL.cpp:418 +#: src/MenuGL.cpp:143 src/MenuGL.cpp:417 #, c-format msgid "ATTENTION: Using 'thin' text to improve framerate...\n" msgstr "ACHTUNG: Benutze 'dünne' Schrift um die Framerate zu verbessern...\n" @@ -847,77 +879,77 @@ msgid "-" msgstr "-" -#: src/MenuGL.cpp:292 src/MenuGL.cpp:321 +#: src/MenuGL.cpp:292 src/MenuGL.cpp:320 msgid "high scores" msgstr "Bestenliste" -#: src/MenuGL.cpp:350 +#: src/MenuGL.cpp:349 msgid "the" msgstr "the" -#: src/MenuGL.cpp:354 +#: src/MenuGL.cpp:353 msgid "reptile" msgstr "reptile" -#: src/MenuGL.cpp:358 +#: src/MenuGL.cpp:357 msgid "labour" msgstr "labour" -#: src/MenuGL.cpp:362 +#: src/MenuGL.cpp:361 msgid "project" msgstr "project" -#: src/MenuGL.cpp:423 +#: src/MenuGL.cpp:422 #, c-format msgid "ATTENTION: Reverting to 'thick' text...\n" msgstr "ACHTUNG: Kehre zurück zu 'dicker' Schrift...\n" -#: src/MenuGL.cpp:474 +#: src/MenuGL.cpp:473 #, c-format msgid "low" msgstr "niedrig" -#: src/MenuGL.cpp:475 +#: src/MenuGL.cpp:474 #, c-format msgid "med" msgstr "mittel" -#: src/MenuGL.cpp:476 +#: src/MenuGL.cpp:475 #, c-format msgid "high" msgstr "hoch" -#: src/MenuGL.cpp:481 +#: src/MenuGL.cpp:480 #, c-format msgid "%dx%d" msgstr "%dx%d" -#: src/MenuGL.cpp:485 +#: src/MenuGL.cpp:484 #, c-format msgid "true" msgstr "wahr" -#: src/MenuGL.cpp:486 +#: src/MenuGL.cpp:485 #, c-format msgid "false" msgstr "falsch" -#: src/MenuGL.cpp:792 src/MenuGL.cpp:865 src/MenuGL.cpp:936 +#: src/MenuGL.cpp:791 src/MenuGL.cpp:864 src/MenuGL.cpp:935 #, c-format msgid "---- error setting full screen mode ----" msgstr "---- Fehler bei Nutzung des Vollbildmodus ----" -#: src/MenuGL.cpp:794 +#: src/MenuGL.cpp:793 #, c-format msgid "---- error setting window mode ----" msgstr "---- Fehler bei Nutzung des Fenstermodus ----" -#: src/MenuGL.cpp:835 +#: src/MenuGL.cpp:834 #, c-format msgid "---- you must complete level %d before you can select level %d ----" msgstr "---- du musst Level %d fertig haben um Level %d auszuwählen ----" -#: src/MenuGL.cpp:851 src/MenuGL.cpp:922 +#: src/MenuGL.cpp:850 src/MenuGL.cpp:921 #, c-format msgid "---- error setting screen size ----" msgstr "---- Fehler beim setzen der Auflösung ----" @@ -937,15 +969,15 @@ msgid "ScreenItemAdd::putScreenItems() Hero??? HUH???\n" msgstr "ScreenItemAdd::putScreenItems() Hero??? HUH???\n" -#: src/StatusDisplay.cpp:651 src/StatusDisplay.cpp:655 +#: src/StatusDisplay.cpp:653 src/StatusDisplay.cpp:657 msgid "p a u s e d" msgstr "p a u s i e r t" -#: src/StatusDisplay.cpp:675 +#: src/StatusDisplay.cpp:677 msgid "do not let -any- ships past you! each one costs you a life!" msgstr "Lass -keine- Schiffe an dir vorbei! Jedes kostet dich ein Leben!" -#: src/StatusDisplay.cpp:686 +#: src/StatusDisplay.cpp:688 msgid "let super shields pass by for an extra life!" msgstr "Lasse Super Schutzschilde an dir vorbei, um ein extra Leben zu erhalten!" Binary files /tmp/7K9nOp7Wb5/chromium-bsu-0.9.15/po/es.gmo and /tmp/9BF9Wy2VjB/chromium-bsu-0.9.15.1/po/es.gmo differ diff -Nru chromium-bsu-0.9.15/po/es.po chromium-bsu-0.9.15.1/po/es.po --- chromium-bsu-0.9.15/po/es.po 2011-02-14 03:55:27.000000000 +0000 +++ chromium-bsu-0.9.15.1/po/es.po 2013-05-25 05:43:49.000000000 +0000 @@ -1,13 +1,15 @@ -# CHROMIUM BSU TRANSLATION TO SPANISH. +# Spanish translation for Chromium B.S.U. # This file is put in the public domain. +# +# Translators: # Alwyn Malachi Berkeley , 2009. -# Jordi Ferré Nos , 2010. +# Jordi Ferré Nos , 2010, 2011. msgid "" msgstr "" "Project-Id-Version: Chromium B.S.U.\n" "Report-Msgid-Bugs-To: http://sf.net/projects/chromium-bsu/bugs\n" -"POT-Creation-Date: 2011-02-10 19:48+0800\n" -"PO-Revision-Date: 2010-05-31 10:21+0200\n" +"POT-Creation-Date: 2013-05-25 13:43+0800\n" +"PO-Revision-Date: 2011-03-22 15:18+0000\n" "Last-Translator: Jordi Ferré Nos \n" "Language-Team: \n" "Language: es\n" @@ -89,12 +91,17 @@ msgid "CDROM status = %d\n" msgstr "Estado del CDROM = %d\n" -#: src/Audio.cpp:298 +#: src/Audio.cpp:275 +#, c-format +msgid "Could not set CD volume, amixer returned status %d\n" +msgstr "" + +#: src/Audio.cpp:302 #, c-format msgid "Audio::setMusicIndex(%d)\n" msgstr "Audio::setMusicIndex(%d)\n" -#: src/Audio.cpp:315 +#: src/Audio.cpp:319 #, c-format msgid "track %d is data - trying next track...\n" msgstr "Pista %d de datos - probando con la pista siguiente...\n" @@ -223,22 +230,22 @@ msgid "ERROR!! <%s> alutGetError() = %s\n" msgstr "ERROR!! <%s> alutGetError() = %s\n" -#: src/AudioOpenAL.cpp:732 +#: src/AudioOpenAL.cpp:730 #, c-format msgid "ERROR: filename too long: \"%s\", line %d\n" msgstr "ERROR: nombre de archivo demasíado largo: \"%s\", línea %d\n" -#: src/AudioOpenAL.cpp:750 +#: src/AudioOpenAL.cpp:748 #, c-format msgid "WARNING: MP3 support not available: \"%s\", line %d\n" msgstr "ADVERTENCIA: soporte MP3 no disponible: \"%s\", línea %d\n" -#: src/AudioOpenAL.cpp:761 +#: src/AudioOpenAL.cpp:759 #, c-format msgid "WARNING: Ogg/Vorbis support not available: \"%s\", line %d\n" msgstr "ADVERTENCIA: Ogg/Vorbis no disponible: \"%s\", línea %d\n" -#: src/AudioOpenAL.cpp:765 +#: src/AudioOpenAL.cpp:763 #, c-format msgid "WARNING: file type not recognized: \"%s\": \"%s\", line %d\n" msgstr "ADVERTENCIA: tipo de archivo no reconocido: \"%s\": \"%s\", línea %d\n" @@ -274,7 +281,7 @@ msgid "AudioOpenAL::setMusicIndex -- end" msgstr "AudioOpenAL::setMusicIndex -- fin" -#: src/AudioOpenAL.cpp:909 src/AudioOpenAL.cpp:942 src/AudioOpenAL.cpp:986 +#: src/AudioOpenAL.cpp:909 src/AudioOpenAL.cpp:942 src/AudioOpenAL.cpp:992 #, c-format msgid "WARNING: PlayList support not compiled in (AudioOpenAL.cpp): %s\n" msgstr "ADVERTENCIA: El soporte de la lista de reproducción no esta compilada en (AudioOpenAL.cpp): %s\n" @@ -289,22 +296,32 @@ msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadMP3\n" msgstr "ERROR: No se pudo abrir \"%s\" en AudioOpenAL::loadMP3\n" -#: src/AudioOpenAL.cpp:973 +#: src/AudioOpenAL.cpp:971 +#, fuzzy, c-format +msgid "ERROR: Could not read from \"%s\" in AudioOpenAL::loadMP3\n" +msgstr "ERROR: No se pudo abrir \"%s\" en AudioOpenAL::loadMP3\n" + +#: src/AudioOpenAL.cpp:979 #, c-format msgid "ERROR: alutLoadMP3() failed in AudioOpenAL::loadMP3\n" msgstr "ERROR: alutLoadMP3() fallo en AudioOpenAL::loadMP3\n" -#: src/AudioOpenAL.cpp:1005 +#: src/AudioOpenAL.cpp:1011 #, c-format msgid "ERROR: Could not allocate memory in AudioOpenAL::loadVorbis\n" msgstr "ERROR: no se pudo asignar memoria en AudioOpenAL::loadVorbis\n" -#: src/AudioOpenAL.cpp:1011 +#: src/AudioOpenAL.cpp:1017 #, c-format msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadVorbis\n" msgstr "ERROR: No se pudo abrir \"%s\" en AudioOpenAL::loadVorbis\n" -#: src/AudioOpenAL.cpp:1019 +#: src/AudioOpenAL.cpp:1023 +#, fuzzy, c-format +msgid "ERROR: Could not read from \"%s\" in AudioOpenAL::loadVorbis\n" +msgstr "ERROR: No se pudo abrir \"%s\" en AudioOpenAL::loadVorbis\n" + +#: src/AudioOpenAL.cpp:1031 #, c-format msgid "ERROR: alutLoadVorbis() failed in AudioOpenAL::loadVorbis\n" msgstr "ERROR: alutLoadVorbis() fallo en AudioOpenAL::loadVorbis\n" @@ -339,7 +356,7 @@ msgid "%d EnemyAircraft allocated\n" msgstr "%d EnemyAircraft asignados\n" -#: src/EnemyAircraft_Straight.cpp:103 +#: src/EnemyAircraft_Straight.cpp:98 #, c-format msgid "EnemyAircraft_Straight %p ... pos[1] = %g, vel[1] = %g\n" msgstr "EnemyAircraft_Straight %p ... pos[1] = %g, vel[1] = %g\n" @@ -414,27 +431,38 @@ msgid "WARNING: could not write score file (%s)\n" msgstr "ADVERTENCIA: no se pudo escribir el archivo de puntuacion(%s)\n" -#: src/HiScore.cpp:328 +#: src/HiScore.cpp:276 +#, fuzzy, c-format +msgid "WARNING: error reading score file (%s)\n" +msgstr "ADVERTENCIA: no se pudo leer el archivo del resultado(%s)\n" + +#: src/HiScore.cpp:319 src/HiScore.cpp:321 src/HiScore.cpp:323 +#: src/HiScore.cpp:343 src/HiScore.cpp:345 src/HiScore.cpp:347 +#, fuzzy, c-format +msgid "WARNING: error reading old score file (%s)\n" +msgstr "ADVERTENCIA: no se pudo leer el archivo del resultado(%s)\n" + +#: src/HiScore.cpp:332 #, c-format msgid "WARNING: empty score file (%s)\n" msgstr "ADVERTENCIA: archivo de resultados vacío (%s)\n" -#: src/HiScore.cpp:350 +#: src/HiScore.cpp:357 #, c-format msgid "WARNING: could not read score file (%s)\n" msgstr "ADVERTENCIA: no se pudo leer el archivo del resultado(%s)\n" -#: src/HiScore.cpp:442 +#: src/HiScore.cpp:449 #, c-format msgid "high scores:\n" msgstr "mejores puntuaciones:\n" -#: src/HiScore.cpp:448 +#: src/HiScore.cpp:455 #, c-format msgid "%02d/%02d/%04d %16s %d\n" msgstr "%02d/%02d/%04d %16s %d\n" -#: src/main.cpp:118 +#: src/main.cpp:119 #, c-format msgid "" "\n" @@ -471,12 +499,12 @@ "--------------------------------------------------\n" "\n" -#: src/main.cpp:230 +#: src/main.cpp:231 #, c-format msgid "!! ERROR !! - " msgstr "!! ERROR !! - " -#: src/main.cpp:254 +#: src/main.cpp:255 #, c-format msgid "Extensions :" msgstr "Extensiones:" @@ -551,7 +579,7 @@ msgid "MainGLUT::run()\n" msgstr "MainGLUT::run()\n" -#: src/MainGLUT.cpp:93 src/MainSDL.cpp:288 +#: src/MainGLUT.cpp:93 src/MainSDL.cpp:286 #, c-format msgid "ERROR!!! OpenGL error: %s\n" msgstr "ERROR!!! OpenGL error: %s\n" @@ -586,7 +614,7 @@ msgid "no joysticks found\n" msgstr "joysticks no encontrados\n" -#: src/MainSDL.cpp:116 src/MainSDL.cpp:349 +#: src/MainSDL.cpp:116 src/MainSDL.cpp:347 #, c-format msgid "Couldn't set video mode: %s\n" msgstr "No pudo establecer el modo video: %s\n" @@ -604,22 +632,22 @@ "Renderizado : %s\n" "Versión : %s\n" -#: src/MainSDL.cpp:217 +#: src/MainSDL.cpp:215 #, c-format msgid "init----> %3.2ffps gameSpeed = %g\n" msgstr "init----> %3.2ffps gameSpeed = %g\n" -#: src/MainSDL.cpp:224 +#: src/MainSDL.cpp:222 #, c-format msgid "init----> %3.2ffps targetAdj = %g, tmp = %g\n" msgstr "init----> %3.2ffps targetAdj = %g, tmp = %g\n" -#: src/MainSDL.cpp:237 +#: src/MainSDL.cpp:235 #, c-format msgid "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" msgstr "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" -#: src/MainSDL.cpp:259 +#: src/MainSDL.cpp:257 #, c-format msgid "" "%d speed adjustments required.\n" @@ -639,22 +667,22 @@ " herramientas (como 'top', 'xosview', etc.) Este tipo de herramientas\n" " pueden complicar que se mantenga un ratio de velocidad estable.\n" -#: src/MainSDL.cpp:271 +#: src/MainSDL.cpp:269 #, c-format msgid "exit.\n" msgstr "salida.\n" -#: src/MainSDL.cpp:296 +#: src/MainSDL.cpp:294 #, c-format msgid "ERROR!!! SDL error '%s'\n" msgstr "ERROR!!! SDL error '%s'\n" -#: src/MainSDL.cpp:354 +#: src/MainSDL.cpp:352 #, c-format msgid "video mode set " msgstr "modo de video establecido" -#: src/MainSDL.cpp:361 +#: src/MainSDL.cpp:359 #, c-format msgid "(bpp=%d RGB=%d%d%d depth=%d)\n" msgstr "(bpp=%d RGB=%d%d%d profundidad=%d)\n" @@ -733,7 +761,7 @@ msgid "game->gameFrame = %d\n" msgstr "game->gameFrame = %d\n" -#: src/MainSDL_Event.cpp:534 +#: src/MainSDL_Event.cpp:538 #, c-format msgid "MainSDL::grabMouse(%d)\n" msgstr "MainSDL::grabMouse(%d)\n" @@ -806,7 +834,7 @@ msgid "q u i t" msgstr "s a l i r" -#: src/MenuGL.cpp:143 src/MenuGL.cpp:418 +#: src/MenuGL.cpp:143 src/MenuGL.cpp:417 #, c-format msgid "ATTENTION: Using 'thin' text to improve framerate...\n" msgstr "ATTENTION: Usando texto 'thin' para mejorar el ratio de frames.\n" @@ -852,77 +880,77 @@ msgid "-" msgstr "-" -#: src/MenuGL.cpp:292 src/MenuGL.cpp:321 +#: src/MenuGL.cpp:292 src/MenuGL.cpp:320 msgid "high scores" msgstr "mejores puntuaciones" -#: src/MenuGL.cpp:350 +#: src/MenuGL.cpp:349 msgid "the" msgstr "the" -#: src/MenuGL.cpp:354 +#: src/MenuGL.cpp:353 msgid "reptile" msgstr "reptile" -#: src/MenuGL.cpp:358 +#: src/MenuGL.cpp:357 msgid "labour" msgstr "labour" -#: src/MenuGL.cpp:362 +#: src/MenuGL.cpp:361 msgid "project" msgstr "project" -#: src/MenuGL.cpp:423 +#: src/MenuGL.cpp:422 #, c-format msgid "ATTENTION: Reverting to 'thick' text...\n" msgstr "ATTENTION: Reverting to 'thick' text...\n" -#: src/MenuGL.cpp:474 +#: src/MenuGL.cpp:473 #, c-format msgid "low" msgstr "bajo" -#: src/MenuGL.cpp:475 +#: src/MenuGL.cpp:474 #, c-format msgid "med" msgstr "medio" -#: src/MenuGL.cpp:476 +#: src/MenuGL.cpp:475 #, c-format msgid "high" msgstr "alto" -#: src/MenuGL.cpp:481 +#: src/MenuGL.cpp:480 #, c-format msgid "%dx%d" msgstr "%dx%d" -#: src/MenuGL.cpp:485 +#: src/MenuGL.cpp:484 #, c-format msgid "true" msgstr "cierto" -#: src/MenuGL.cpp:486 +#: src/MenuGL.cpp:485 #, c-format msgid "false" msgstr "falso" -#: src/MenuGL.cpp:792 src/MenuGL.cpp:865 src/MenuGL.cpp:936 +#: src/MenuGL.cpp:791 src/MenuGL.cpp:864 src/MenuGL.cpp:935 #, c-format msgid "---- error setting full screen mode ----" msgstr "---- error cambiando a pantalla completa ----" -#: src/MenuGL.cpp:794 +#: src/MenuGL.cpp:793 #, c-format msgid "---- error setting window mode ----" msgstr "---- error cambiando a modo ventana ----" -#: src/MenuGL.cpp:835 +#: src/MenuGL.cpp:834 #, c-format msgid "---- you must complete level %d before you can select level %d ----" msgstr "---- debes completar el nivel %d antes de que pueda seleccionar el nivel %d ----" -#: src/MenuGL.cpp:851 src/MenuGL.cpp:922 +#: src/MenuGL.cpp:850 src/MenuGL.cpp:921 #, c-format msgid "---- error setting screen size ----" msgstr "---- error cambiando el tamaño de pantalla ----" @@ -942,15 +970,15 @@ msgid "ScreenItemAdd::putScreenItems() Hero??? HUH???\n" msgstr "ScreenItemAdd::putScreenItems() Héroe??? HUH???\n" -#: src/StatusDisplay.cpp:651 src/StatusDisplay.cpp:655 +#: src/StatusDisplay.cpp:653 src/StatusDisplay.cpp:657 msgid "p a u s e d" msgstr "p a u s a d o" -#: src/StatusDisplay.cpp:675 +#: src/StatusDisplay.cpp:677 msgid "do not let -any- ships past you! each one costs you a life!" msgstr "no dejes que pase ninguna nave! cada una te cuesta una vida!" -#: src/StatusDisplay.cpp:686 +#: src/StatusDisplay.cpp:688 msgid "let super shields pass by for an extra life!" msgstr "deja pasar los escudos y consigue una vida adicional!" Binary files /tmp/7K9nOp7Wb5/chromium-bsu-0.9.15/po/fr.gmo and /tmp/9BF9Wy2VjB/chromium-bsu-0.9.15.1/po/fr.gmo differ diff -Nru chromium-bsu-0.9.15/po/fr.po chromium-bsu-0.9.15.1/po/fr.po --- chromium-bsu-0.9.15/po/fr.po 2011-02-14 03:55:27.000000000 +0000 +++ chromium-bsu-0.9.15.1/po/fr.po 2013-05-25 05:43:49.000000000 +0000 @@ -1,21 +1,21 @@ -# French translation of the Chromium BSU package +# French translation for Chromium B.S.U. # This file is put in the public domain. -# Maintainer: -# Emmanuel Trillaud , 2010 # +# Translators: +# Emmanuel Trillaud , 2011. msgid "" msgstr "" "Project-Id-Version: Chromium B.S.U.\n" "Report-Msgid-Bugs-To: http://sf.net/projects/chromium-bsu/bugs\n" -"POT-Creation-Date: 2011-02-10 19:48+0800\n" -"PO-Revision-Date: 2010-04-13 16:56+0200\n" +"POT-Creation-Date: 2013-05-25 13:43+0800\n" +"PO-Revision-Date: 2011-09-24 15:47+0000\n" "Last-Translator: Emmanuel Trillaud \n" -"Language-Team: \n" +"Language-Team: French (http://www.transifex.com/projects/p/chromium-bsu/language/fr/)\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n>1\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: src/Audio.cpp:110 msgid "audio" @@ -89,12 +89,17 @@ msgid "CDROM status = %d\n" msgstr "Statut CDROM = %d\n" -#: src/Audio.cpp:298 +#: src/Audio.cpp:275 +#, c-format +msgid "Could not set CD volume, amixer returned status %d\n" +msgstr "" + +#: src/Audio.cpp:302 #, c-format msgid "Audio::setMusicIndex(%d)\n" msgstr "Audio::setMusicIndex(%d)\n" -#: src/Audio.cpp:315 +#: src/Audio.cpp:319 #, c-format msgid "track %d is data - trying next track...\n" msgstr "La piste %d contient des données - lecture de la prochaine piste ...\n" @@ -222,22 +227,22 @@ msgid "ERROR!! <%s> alutGetError() = %s\n" msgstr "ERREUR!! <%s> alutGetError() = %s\n" -#: src/AudioOpenAL.cpp:732 +#: src/AudioOpenAL.cpp:730 #, c-format msgid "ERROR: filename too long: \"%s\", line %d\n" msgstr "ERREUR: nom de fichier trop long: \"%s\", ligne %d\n" -#: src/AudioOpenAL.cpp:750 +#: src/AudioOpenAL.cpp:748 #, c-format msgid "WARNING: MP3 support not available: \"%s\", line %d\n" msgstr "AVERTISSEMENT: MP3 non pris en charge: \"%s\", ligne %d\n" -#: src/AudioOpenAL.cpp:761 +#: src/AudioOpenAL.cpp:759 #, c-format msgid "WARNING: Ogg/Vorbis support not available: \"%s\", line %d\n" msgstr "AVERTISSEMENT: Ogg/Vorbis non pris en charge: \"%s\", ligne %d\n" -#: src/AudioOpenAL.cpp:765 +#: src/AudioOpenAL.cpp:763 #, c-format msgid "WARNING: file type not recognized: \"%s\": \"%s\", line %d\n" msgstr "AVERTISSEMENT: type de fichier on reconnu: \"%s\": \"%s\", ligne %d\n" @@ -273,7 +278,7 @@ msgid "AudioOpenAL::setMusicIndex -- end" msgstr "AudioOpenAL::setMusicIndex -- fin" -#: src/AudioOpenAL.cpp:909 src/AudioOpenAL.cpp:942 src/AudioOpenAL.cpp:986 +#: src/AudioOpenAL.cpp:909 src/AudioOpenAL.cpp:942 src/AudioOpenAL.cpp:992 #, c-format msgid "WARNING: PlayList support not compiled in (AudioOpenAL.cpp): %s\n" msgstr "AVERTISSEMENT : PlayList support not compiled in (AudioOpenAL.cpp): %s\n" @@ -288,22 +293,32 @@ msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadMP3\n" msgstr "ERREUR: Impossible d'ouvir \"%s\" dans AudioOpenAL::loadMP3\n" -#: src/AudioOpenAL.cpp:973 +#: src/AudioOpenAL.cpp:971 +#, fuzzy, c-format +msgid "ERROR: Could not read from \"%s\" in AudioOpenAL::loadMP3\n" +msgstr "ERREUR: Impossible d'ouvir \"%s\" dans AudioOpenAL::loadMP3\n" + +#: src/AudioOpenAL.cpp:979 #, c-format msgid "ERROR: alutLoadMP3() failed in AudioOpenAL::loadMP3\n" msgstr "ERREUR: échec de alutLoadMP3() dans AudioOpenAL::loadMP3\n" -#: src/AudioOpenAL.cpp:1005 +#: src/AudioOpenAL.cpp:1011 #, c-format msgid "ERROR: Could not allocate memory in AudioOpenAL::loadVorbis\n" msgstr "ERREUR: Impossible d'allouer de la mémoire dans AudioOpenAL::loadVorbis\n" -#: src/AudioOpenAL.cpp:1011 +#: src/AudioOpenAL.cpp:1017 #, c-format msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadVorbis\n" msgstr "ERREUR: Impossible d'ouvrir \"%s\" dans AudioOpenAL::loadVorbis\n" -#: src/AudioOpenAL.cpp:1019 +#: src/AudioOpenAL.cpp:1023 +#, fuzzy, c-format +msgid "ERROR: Could not read from \"%s\" in AudioOpenAL::loadVorbis\n" +msgstr "ERREUR: Impossible d'ouvrir \"%s\" dans AudioOpenAL::loadVorbis\n" + +#: src/AudioOpenAL.cpp:1031 #, c-format msgid "ERROR: alutLoadVorbis() failed in AudioOpenAL::loadVorbis\n" msgstr "ERREUR: echec de alutLoadVorbis() dans AudioOpenAL::loadVorbis\n" @@ -338,7 +353,7 @@ msgid "%d EnemyAircraft allocated\n" msgstr "%d EnemyAircraft alloué\n" -#: src/EnemyAircraft_Straight.cpp:103 +#: src/EnemyAircraft_Straight.cpp:98 #, c-format msgid "EnemyAircraft_Straight %p ... pos[1] = %g, vel[1] = %g\n" msgstr "EnemyAircraft_Straight %p ... pos[1] = %g, vel[1] = %g\n" @@ -413,27 +428,38 @@ msgid "WARNING: could not write score file (%s)\n" msgstr "AVERTISSEMENT : impossible d'écrire sur le fichier des scores (%s)\n" -#: src/HiScore.cpp:328 +#: src/HiScore.cpp:276 #, fuzzy, c-format -msgid "WARNING: empty score file (%s)\n" +msgid "WARNING: error reading score file (%s)\n" msgstr "AVERISSEMENT : impossible de lire de fichier des scores (%s)\n" -#: src/HiScore.cpp:350 +#: src/HiScore.cpp:319 src/HiScore.cpp:321 src/HiScore.cpp:323 +#: src/HiScore.cpp:343 src/HiScore.cpp:345 src/HiScore.cpp:347 +#, fuzzy, c-format +msgid "WARNING: error reading old score file (%s)\n" +msgstr "AVERISSEMENT : impossible de lire de fichier des scores (%s)\n" + +#: src/HiScore.cpp:332 +#, c-format +msgid "WARNING: empty score file (%s)\n" +msgstr "AVERTISSEMENT : fichier(%s) de score vide\n" + +#: src/HiScore.cpp:357 #, c-format msgid "WARNING: could not read score file (%s)\n" msgstr "AVERISSEMENT : impossible de lire de fichier des scores (%s)\n" -#: src/HiScore.cpp:442 +#: src/HiScore.cpp:449 #, c-format msgid "high scores:\n" msgstr "meilleurs scores :\n" -#: src/HiScore.cpp:448 +#: src/HiScore.cpp:455 #, c-format msgid "%02d/%02d/%04d %16s %d\n" msgstr "%02d/%02d/%04d %16s %d\n" -#: src/main.cpp:118 +#: src/main.cpp:119 #, c-format msgid "" "\n" @@ -470,12 +496,12 @@ "--------------------------------------------------\n" "\n" -#: src/main.cpp:230 +#: src/main.cpp:231 #, c-format msgid "!! ERROR !! - " msgstr "!! ERREUR !! - " -#: src/main.cpp:254 +#: src/main.cpp:255 #, c-format msgid "Extensions :" msgstr "Extensions :" @@ -550,7 +576,7 @@ msgid "MainGLUT::run()\n" msgstr "MainGLUT::run()\n" -#: src/MainGLUT.cpp:93 src/MainSDL.cpp:288 +#: src/MainGLUT.cpp:93 src/MainSDL.cpp:286 #, c-format msgid "ERROR!!! OpenGL error: %s\n" msgstr "ERREUR!!! Erreur OpenGL : %s\n" @@ -585,7 +611,7 @@ msgid "no joysticks found\n" msgstr "aucun joysticks trouvé\n" -#: src/MainSDL.cpp:116 src/MainSDL.cpp:349 +#: src/MainSDL.cpp:116 src/MainSDL.cpp:347 #, c-format msgid "Couldn't set video mode: %s\n" msgstr "Impossible n'initialiser le mode vidéo : %s\n" @@ -603,22 +629,22 @@ "Rendu : %s\n" "Version : %s\n" -#: src/MainSDL.cpp:217 +#: src/MainSDL.cpp:215 #, c-format msgid "init----> %3.2ffps gameSpeed = %g\n" msgstr "init----> %3.2ffps gameSpeed = %g\n" -#: src/MainSDL.cpp:224 +#: src/MainSDL.cpp:222 #, c-format msgid "init----> %3.2ffps targetAdj = %g, tmp = %g\n" msgstr "init----> %3.2ffps targetAdj = %g, tmp = %g\n" -#: src/MainSDL.cpp:237 +#: src/MainSDL.cpp:235 #, c-format msgid "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" msgstr "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" -#: src/MainSDL.cpp:259 +#: src/MainSDL.cpp:257 #, c-format msgid "" "%d speed adjustments required.\n" @@ -639,22 +665,22 @@ " (comme 'top', 'xosview', etc.) n'est en cours d'exécution.\n" " Elles rendent difficile de maintenir un bon taux de frames.\n" -#: src/MainSDL.cpp:271 +#: src/MainSDL.cpp:269 #, c-format msgid "exit.\n" msgstr "exit.\n" -#: src/MainSDL.cpp:296 +#: src/MainSDL.cpp:294 #, c-format msgid "ERROR!!! SDL error '%s'\n" msgstr "ERREUR!!! SDL erreur '%s'\n" -#: src/MainSDL.cpp:354 +#: src/MainSDL.cpp:352 #, c-format msgid "video mode set " msgstr "mode vidéo initialisé " -#: src/MainSDL.cpp:361 +#: src/MainSDL.cpp:359 #, c-format msgid "(bpp=%d RGB=%d%d%d depth=%d)\n" msgstr "(bpp=%d RGB=%d%d%d profondeur=%d)\n" @@ -733,7 +759,7 @@ msgid "game->gameFrame = %d\n" msgstr "game->gameFrame = %d\n" -#: src/MainSDL_Event.cpp:534 +#: src/MainSDL_Event.cpp:538 #, c-format msgid "MainSDL::grabMouse(%d)\n" msgstr "MainSDL::grabMouse(%d)\n" @@ -799,15 +825,14 @@ msgstr "v o l u m e m u s i q u e" #: src/MenuGL.cpp:78 -#, fuzzy msgid "m o v e m e n t s p e e d" -msgstr "v i t e s s e s o u r i s" +msgstr "r a p i d i t é d e m o u v e m e n t" #: src/MenuGL.cpp:79 msgid "q u i t" msgstr "q u i t t e r" -#: src/MenuGL.cpp:143 src/MenuGL.cpp:418 +#: src/MenuGL.cpp:143 src/MenuGL.cpp:417 #, c-format msgid "ATTENTION: Using 'thin' text to improve framerate...\n" msgstr "ATTENTION : utilisé du texte 'thin' pour améliorer le taux de frame...\n" @@ -853,77 +878,77 @@ msgid "-" msgstr "-" -#: src/MenuGL.cpp:292 src/MenuGL.cpp:321 +#: src/MenuGL.cpp:292 src/MenuGL.cpp:320 msgid "high scores" msgstr "meilleurs scores" -#: src/MenuGL.cpp:350 +#: src/MenuGL.cpp:349 msgid "the" msgstr "the" -#: src/MenuGL.cpp:354 +#: src/MenuGL.cpp:353 msgid "reptile" msgstr "reptile" -#: src/MenuGL.cpp:358 +#: src/MenuGL.cpp:357 msgid "labour" msgstr "labour" -#: src/MenuGL.cpp:362 +#: src/MenuGL.cpp:361 msgid "project" msgstr "project" -#: src/MenuGL.cpp:423 +#: src/MenuGL.cpp:422 #, c-format msgid "ATTENTION: Reverting to 'thick' text...\n" msgstr "ATTENTION : Retour à du texte 'thick'...\n" -#: src/MenuGL.cpp:474 +#: src/MenuGL.cpp:473 #, c-format msgid "low" msgstr "bas" -#: src/MenuGL.cpp:475 +#: src/MenuGL.cpp:474 #, c-format msgid "med" msgstr "med" -#: src/MenuGL.cpp:476 +#: src/MenuGL.cpp:475 #, c-format msgid "high" msgstr "haut" -#: src/MenuGL.cpp:481 +#: src/MenuGL.cpp:480 #, c-format msgid "%dx%d" -msgstr "" +msgstr "%dx%d" -#: src/MenuGL.cpp:485 +#: src/MenuGL.cpp:484 #, c-format msgid "true" msgstr "vrai" -#: src/MenuGL.cpp:486 +#: src/MenuGL.cpp:485 #, c-format msgid "false" msgstr "faux" -#: src/MenuGL.cpp:792 src/MenuGL.cpp:865 src/MenuGL.cpp:936 +#: src/MenuGL.cpp:791 src/MenuGL.cpp:864 src/MenuGL.cpp:935 #, c-format msgid "---- error setting full screen mode ----" msgstr "---- erreur au passage en mode plein écran ----" -#: src/MenuGL.cpp:794 +#: src/MenuGL.cpp:793 #, c-format msgid "---- error setting window mode ----" msgstr "---- erreur à l'initialisation du mode de fenêtrage ----" -#: src/MenuGL.cpp:835 +#: src/MenuGL.cpp:834 #, c-format msgid "---- you must complete level %d before you can select level %d ----" msgstr "---- vous devez finir le niveau %d avant de pouvoir sélectionner %d ----" -#: src/MenuGL.cpp:851 src/MenuGL.cpp:922 +#: src/MenuGL.cpp:850 src/MenuGL.cpp:921 #, c-format msgid "---- error setting screen size ----" msgstr "---- erreur à l'initialisation de la taille de l'écran ----" @@ -943,15 +968,15 @@ msgid "ScreenItemAdd::putScreenItems() Hero??? HUH???\n" msgstr "ScreenItemAdd::putScreenItems() Héros??? HEIN???\n" -#: src/StatusDisplay.cpp:651 src/StatusDisplay.cpp:655 +#: src/StatusDisplay.cpp:653 src/StatusDisplay.cpp:657 msgid "p a u s e d" msgstr "e n p a u s e" -#: src/StatusDisplay.cpp:675 +#: src/StatusDisplay.cpp:677 msgid "do not let -any- ships past you! each one costs you a life!" msgstr "ne laissez passer -aucun- vaisseau! chacun vous coutera une vie !" -#: src/StatusDisplay.cpp:686 +#: src/StatusDisplay.cpp:688 msgid "let super shields pass by for an extra life!" msgstr "laissez les super armures passer pour gagner une vie supplémentaire" Binary files /tmp/7K9nOp7Wb5/chromium-bsu-0.9.15/po/it.gmo and /tmp/9BF9Wy2VjB/chromium-bsu-0.9.15.1/po/it.gmo differ diff -Nru chromium-bsu-0.9.15/po/it.po chromium-bsu-0.9.15.1/po/it.po --- chromium-bsu-0.9.15/po/it.po 2011-02-14 03:55:27.000000000 +0000 +++ chromium-bsu-0.9.15.1/po/it.po 2013-05-25 05:43:49.000000000 +0000 @@ -1,12 +1,14 @@ +# Italian translation for Chromium B.S.U. # This file is put in the public domain. # +# Translators: # Valter Mura , 2010. msgid "" msgstr "" "Project-Id-Version: Chromium B.S.U.\n" "Report-Msgid-Bugs-To: http://sf.net/projects/chromium-bsu/bugs\n" -"POT-Creation-Date: 2011-02-10 19:48+0800\n" -"PO-Revision-Date: 2010-10-08 17:02+0200\n" +"POT-Creation-Date: 2013-05-25 13:43+0800\n" +"PO-Revision-Date: 2011-03-22 15:18+0000\n" "Last-Translator: Valter Mura \n" "Language-Team: Italian \n" "Language: it\n" @@ -88,12 +90,17 @@ msgid "CDROM status = %d\n" msgstr "Stato CDROM = %d\n" -#: src/Audio.cpp:298 +#: src/Audio.cpp:275 +#, c-format +msgid "Could not set CD volume, amixer returned status %d\n" +msgstr "" + +#: src/Audio.cpp:302 #, c-format msgid "Audio::setMusicIndex(%d)\n" msgstr "Audio::setMusicIndex(%d)\n" -#: src/Audio.cpp:315 +#: src/Audio.cpp:319 #, c-format msgid "track %d is data - trying next track...\n" msgstr "la traccia %d sono dati - tento la prossima traccia...\n" @@ -221,22 +228,22 @@ msgid "ERROR!! <%s> alutGetError() = %s\n" msgstr "ERRORE!! <%s> alutGetError() = %s\n" -#: src/AudioOpenAL.cpp:732 +#: src/AudioOpenAL.cpp:730 #, c-format msgid "ERROR: filename too long: \"%s\", line %d\n" msgstr "ERRORE: nome del file troppo lungo: \"%s\", riga %d\n" -#: src/AudioOpenAL.cpp:750 +#: src/AudioOpenAL.cpp:748 #, c-format msgid "WARNING: MP3 support not available: \"%s\", line %d\n" msgstr "ATTENZIONE: supporto MP3 non disponibile: \"%s\", riga %d\n" -#: src/AudioOpenAL.cpp:761 +#: src/AudioOpenAL.cpp:759 #, c-format msgid "WARNING: Ogg/Vorbis support not available: \"%s\", line %d\n" msgstr "ATTENZIONE: supporto Ogg/Vorbis non disponibile: \"%s\", riga %d\n" -#: src/AudioOpenAL.cpp:765 +#: src/AudioOpenAL.cpp:763 #, c-format msgid "WARNING: file type not recognized: \"%s\": \"%s\", line %d\n" msgstr "ATTENZIONE: tipo di file non riconosciuto: \"%s\": \"%s\", riga %d\n" @@ -272,7 +279,7 @@ msgid "AudioOpenAL::setMusicIndex -- end" msgstr "AudioOpenAL::setMusicIndex -- fine" -#: src/AudioOpenAL.cpp:909 src/AudioOpenAL.cpp:942 src/AudioOpenAL.cpp:986 +#: src/AudioOpenAL.cpp:909 src/AudioOpenAL.cpp:942 src/AudioOpenAL.cpp:992 #, c-format msgid "WARNING: PlayList support not compiled in (AudioOpenAL.cpp): %s\n" msgstr "ATTENZIONE: supporto PlayList non compilato in (AudioOpenAL.cpp): %s\n" @@ -287,22 +294,32 @@ msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadMP3\n" msgstr "ERRORE: impossibile aprire \"%s\" in AudioOpenAL::loadMP3\n" -#: src/AudioOpenAL.cpp:973 +#: src/AudioOpenAL.cpp:971 +#, fuzzy, c-format +msgid "ERROR: Could not read from \"%s\" in AudioOpenAL::loadMP3\n" +msgstr "ERRORE: impossibile aprire \"%s\" in AudioOpenAL::loadMP3\n" + +#: src/AudioOpenAL.cpp:979 #, c-format msgid "ERROR: alutLoadMP3() failed in AudioOpenAL::loadMP3\n" msgstr "ERRORE: alutLoadMP3() in AudioOpenAL::loadMP3 non riuscito\n" -#: src/AudioOpenAL.cpp:1005 +#: src/AudioOpenAL.cpp:1011 #, c-format msgid "ERROR: Could not allocate memory in AudioOpenAL::loadVorbis\n" msgstr "ERRORE: impossibile allocare la memoria in AudioOpenAL::loadVorbis\n" -#: src/AudioOpenAL.cpp:1011 +#: src/AudioOpenAL.cpp:1017 #, c-format msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadVorbis\n" msgstr "ERRORE: impossibile aprire \"%s\" in AudioOpenAL::loadVorbis\n" -#: src/AudioOpenAL.cpp:1019 +#: src/AudioOpenAL.cpp:1023 +#, fuzzy, c-format +msgid "ERROR: Could not read from \"%s\" in AudioOpenAL::loadVorbis\n" +msgstr "ERRORE: impossibile aprire \"%s\" in AudioOpenAL::loadVorbis\n" + +#: src/AudioOpenAL.cpp:1031 #, c-format msgid "ERROR: alutLoadVorbis() failed in AudioOpenAL::loadVorbis\n" msgstr "ERRORE: alutLoadVorbis() in AudioOpenAL::loadVorbis non riuscito\n" @@ -337,10 +354,10 @@ msgid "%d EnemyAircraft allocated\n" msgstr "%d EnemyAircraft allocati\n" -#: src/EnemyAircraft_Straight.cpp:103 -#, fuzzy, c-format +#: src/EnemyAircraft_Straight.cpp:98 +#, c-format msgid "EnemyAircraft_Straight %p ... pos[1] = %g, vel[1] = %g\n" -msgstr "EnemyAircraft_Straight %p ... pos[1] = %g, vel[1] = %g\n" +msgstr "" #: src/EnemyFleet.cpp:243 #, c-format @@ -412,27 +429,38 @@ msgid "WARNING: could not write score file (%s)\n" msgstr "ATTENZIONE: impossibile scrivere il file del punteggio (%s)\n" -#: src/HiScore.cpp:328 +#: src/HiScore.cpp:276 +#, fuzzy, c-format +msgid "WARNING: error reading score file (%s)\n" +msgstr "ATTENZIONE: impossibile leggere il file del punteggio (%s)\n" + +#: src/HiScore.cpp:319 src/HiScore.cpp:321 src/HiScore.cpp:323 +#: src/HiScore.cpp:343 src/HiScore.cpp:345 src/HiScore.cpp:347 +#, fuzzy, c-format +msgid "WARNING: error reading old score file (%s)\n" +msgstr "ATTENZIONE: impossibile leggere il file del punteggio (%s)\n" + +#: src/HiScore.cpp:332 #, c-format msgid "WARNING: empty score file (%s)\n" msgstr "ATTENZIONE: file del punteggio vuoto (%s)\n" -#: src/HiScore.cpp:350 +#: src/HiScore.cpp:357 #, c-format msgid "WARNING: could not read score file (%s)\n" msgstr "ATTENZIONE: impossibile leggere il file del punteggio (%s)\n" -#: src/HiScore.cpp:442 +#: src/HiScore.cpp:449 #, c-format msgid "high scores:\n" msgstr "Punteggi migliori:\n" -#: src/HiScore.cpp:448 +#: src/HiScore.cpp:455 #, c-format msgid "%02d/%02d/%04d %16s %d\n" msgstr "%02d/%02d/%04d %16s %d\n" -#: src/main.cpp:118 +#: src/main.cpp:119 #, c-format msgid "" "\n" @@ -469,12 +497,12 @@ "--------------------------------------------------\n" "\n" -#: src/main.cpp:230 +#: src/main.cpp:231 #, c-format msgid "!! ERROR !! - " msgstr "!! ERRORE !! - " -#: src/main.cpp:254 +#: src/main.cpp:255 #, c-format msgid "Extensions :" msgstr "Estensioni:" @@ -549,7 +577,7 @@ msgid "MainGLUT::run()\n" msgstr "MainGLUT::run()\n" -#: src/MainGLUT.cpp:93 src/MainSDL.cpp:288 +#: src/MainGLUT.cpp:93 src/MainSDL.cpp:286 #, c-format msgid "ERROR!!! OpenGL error: %s\n" msgstr "ERRORE!!! Errore OpenGL: %s\n" @@ -584,7 +612,7 @@ msgid "no joysticks found\n" msgstr "nessun joystick trovato\n" -#: src/MainSDL.cpp:116 src/MainSDL.cpp:349 +#: src/MainSDL.cpp:116 src/MainSDL.cpp:347 #, c-format msgid "Couldn't set video mode: %s\n" msgstr "Impossibile impostare la modalità video: %s\n" @@ -602,22 +630,22 @@ "Renderer : %s\n" "Versione : %s\n" -#: src/MainSDL.cpp:217 -#, fuzzy, c-format +#: src/MainSDL.cpp:215 +#, c-format msgid "init----> %3.2ffps gameSpeed = %g\n" -msgstr "init----> %3.2ffps gameSpeed = %g\n" +msgstr "" -#: src/MainSDL.cpp:224 -#, fuzzy, c-format +#: src/MainSDL.cpp:222 +#, c-format msgid "init----> %3.2ffps targetAdj = %g, tmp = %g\n" -msgstr "init----> %3.2ffps targetAdj = %g, tmp = %g\n" +msgstr "" -#: src/MainSDL.cpp:237 -#, fuzzy, c-format +#: src/MainSDL.cpp:235 +#, c-format msgid "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" -msgstr "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" +msgstr "" -#: src/MainSDL.cpp:259 +#: src/MainSDL.cpp:257 #, c-format msgid "" "%d speed adjustments required.\n" @@ -638,25 +666,25 @@ " (come 'top', 'xosview', etc.) Questo genere di strumenti\n" " può rendere difficile mantenere una velocità di aggiornamento costante.\n" -#: src/MainSDL.cpp:271 +#: src/MainSDL.cpp:269 #, c-format msgid "exit.\n" msgstr "uscita.\n" -#: src/MainSDL.cpp:296 +#: src/MainSDL.cpp:294 #, c-format msgid "ERROR!!! SDL error '%s'\n" msgstr "ERRORE!!! Errore SDL '%s'\n" -#: src/MainSDL.cpp:354 +#: src/MainSDL.cpp:352 #, c-format msgid "video mode set " msgstr "modalità video impostata" -#: src/MainSDL.cpp:361 -#, fuzzy, c-format +#: src/MainSDL.cpp:359 +#, c-format msgid "(bpp=%d RGB=%d%d%d depth=%d)\n" -msgstr "(bpp=%d RGB=%d%d%d depth=%d)\n" +msgstr "" #: src/MainSDL_Event.cpp:40 #, c-format @@ -732,7 +760,7 @@ msgid "game->gameFrame = %d\n" msgstr "game->gameFrame = %d\n" -#: src/MainSDL_Event.cpp:534 +#: src/MainSDL_Event.cpp:538 #, c-format msgid "MainSDL::grabMouse(%d)\n" msgstr "MainSDL::grabMouse(%d)\n" @@ -798,15 +826,14 @@ msgstr "v o l u m e m u s i c a" #: src/MenuGL.cpp:78 -#, fuzzy msgid "m o v e m e n t s p e e d" -msgstr "v e l o c i t à m o u s e" +msgstr "" #: src/MenuGL.cpp:79 msgid "q u i t" msgstr "e s c i" -#: src/MenuGL.cpp:143 src/MenuGL.cpp:418 +#: src/MenuGL.cpp:143 src/MenuGL.cpp:417 #, c-format msgid "ATTENTION: Using 'thin' text to improve framerate...\n" msgstr "ATTENZIONE: In uso il testo 'sottile' per migliorare la velocità di aggiornamento...\n" @@ -852,77 +879,77 @@ msgid "-" msgstr "-" -#: src/MenuGL.cpp:292 src/MenuGL.cpp:321 +#: src/MenuGL.cpp:292 src/MenuGL.cpp:320 msgid "high scores" msgstr "classifiche" -#: src/MenuGL.cpp:350 +#: src/MenuGL.cpp:349 msgid "the" msgstr "il" -#: src/MenuGL.cpp:354 +#: src/MenuGL.cpp:353 msgid "reptile" msgstr "rettile" -#: src/MenuGL.cpp:358 +#: src/MenuGL.cpp:357 msgid "labour" msgstr "" -#: src/MenuGL.cpp:362 +#: src/MenuGL.cpp:361 msgid "project" msgstr "progetto" -#: src/MenuGL.cpp:423 +#: src/MenuGL.cpp:422 #, c-format msgid "ATTENTION: Reverting to 'thick' text...\n" msgstr "ATTENZIONE: Sto riportando il testo a 'sottile'...\n" -#: src/MenuGL.cpp:474 +#: src/MenuGL.cpp:473 #, c-format msgid "low" msgstr "basso" -#: src/MenuGL.cpp:475 +#: src/MenuGL.cpp:474 #, c-format msgid "med" msgstr "medio" -#: src/MenuGL.cpp:476 +#: src/MenuGL.cpp:475 #, c-format msgid "high" msgstr "alto" -#: src/MenuGL.cpp:481 +#: src/MenuGL.cpp:480 #, c-format msgid "%dx%d" msgstr "" -#: src/MenuGL.cpp:485 -#, fuzzy, c-format +#: src/MenuGL.cpp:484 +#, c-format msgid "true" -msgstr "vero" +msgstr "" -#: src/MenuGL.cpp:486 -#, fuzzy, c-format +#: src/MenuGL.cpp:485 +#, c-format msgid "false" -msgstr "falso" +msgstr "" -#: src/MenuGL.cpp:792 src/MenuGL.cpp:865 src/MenuGL.cpp:936 +#: src/MenuGL.cpp:791 src/MenuGL.cpp:864 src/MenuGL.cpp:935 #, c-format msgid "---- error setting full screen mode ----" msgstr "---- errore impostando la modalità a schermo intero ----" -#: src/MenuGL.cpp:794 +#: src/MenuGL.cpp:793 #, c-format msgid "---- error setting window mode ----" msgstr "---- errore impostando la modalità finestra ----" -#: src/MenuGL.cpp:835 +#: src/MenuGL.cpp:834 #, c-format msgid "---- you must complete level %d before you can select level %d ----" msgstr "---- devi completare %d livelli prima di poter scegliere il livello %d ----" -#: src/MenuGL.cpp:851 src/MenuGL.cpp:922 +#: src/MenuGL.cpp:850 src/MenuGL.cpp:921 #, c-format msgid "---- error setting screen size ----" msgstr "---- errore impostando la dimensione dello schermo ----" @@ -933,24 +960,24 @@ msgstr "power up attivi = %d\n" #: src/PowerUps.cpp:368 -#, fuzzy, c-format +#, c-format msgid "?? PowerUp::seal()" -msgstr "?? PowerUp::seal()" +msgstr "" #: src/ScreenItemAdd.cpp:107 -#, fuzzy, c-format +#, c-format msgid "ScreenItemAdd::putScreenItems() Hero??? HUH???\n" -msgstr "ScreenItemAdd::putScreenItems() Eroe??? HUH???\n" +msgstr "" -#: src/StatusDisplay.cpp:651 src/StatusDisplay.cpp:655 +#: src/StatusDisplay.cpp:653 src/StatusDisplay.cpp:657 msgid "p a u s e d" msgstr "i n p a u s a" -#: src/StatusDisplay.cpp:675 +#: src/StatusDisplay.cpp:677 msgid "do not let -any- ships past you! each one costs you a life!" msgstr "non permettere a -NESSUNA- nave di superarti! ciascuna ti costerà una vita!" -#: src/StatusDisplay.cpp:686 +#: src/StatusDisplay.cpp:688 msgid "let super shields pass by for an extra life!" msgstr "permetti ai super scudi di superarti per ottenere una vita extra!" @@ -982,36 +1009,32 @@ #. If the font is available in Debian it should be the Debian path. #. #: src/TextFTGL.cpp:135 -#, fuzzy msgid "/usr/share/fonts/truetype/uralic/gothub__.ttf" -msgstr "/usr/share/fonts/truetype/uralic/gothub__.ttf" +msgstr "" #. TRANSLATORS: If using the FTGL backend, this should be the path of a #. font that contains all the Unicode characters in use in your translation. #. If the font is available in Debian it should be the Debian path. #. #: src/TextFTGL.cpp:141 -#, fuzzy msgid "/usr/share/fonts/truetype/uralic/gothu___.ttf" -msgstr "/usr/share/fonts/truetype/uralic/gothu___.ttf" +msgstr "" #. TRANSLATORS: If using the FTGL backend, this should be the path of a bold #. font that contains all the Unicode characters in use in your translation. #. If the font is available in Mandrake it should be the Mandrake path. #. #: src/TextFTGL.cpp:148 -#, fuzzy msgid "/usr/share/fonts/TTF/uralic/GOTHUB__.TTF" -msgstr "/usr/share/fonts/TTF/uralic/GOTHUB__.TTF" +msgstr "" #. TRANSLATORS: If using the FTGL backend, this should be the path of a #. font that contains all the Unicode characters in use in your translation. #. If the font is available in Mandrake it should be the Mandrake path. #. #: src/TextFTGL.cpp:154 -#, fuzzy msgid "/usr/share/fonts/TTF/uralic/GOTHU___.TTF" -msgstr "/usr/share/fonts/TTF/uralic/GOTHU___.TTF" +msgstr "" #: src/TextGLC.cpp:30 msgid "GLC: couldn't set context" Binary files /tmp/7K9nOp7Wb5/chromium-bsu-0.9.15/po/ru.gmo and /tmp/9BF9Wy2VjB/chromium-bsu-0.9.15.1/po/ru.gmo differ diff -Nru chromium-bsu-0.9.15/po/ru.po chromium-bsu-0.9.15.1/po/ru.po --- chromium-bsu-0.9.15/po/ru.po 1970-01-01 00:00:00.000000000 +0000 +++ chromium-bsu-0.9.15.1/po/ru.po 2013-05-25 05:43:49.000000000 +0000 @@ -0,0 +1,1038 @@ +# Russian translation for Chromium B.S.U. +# This file is put in the public domain. +# +# Translators: +# Евгений Лежнин , 2011. +msgid "" +msgstr "" +"Project-Id-Version: Chromium B.S.U.\n" +"Report-Msgid-Bugs-To: http://sf.net/projects/chromium-bsu/bugs\n" +"POT-Creation-Date: 2013-05-25 13:43+0800\n" +"PO-Revision-Date: 2011-08-16 12:04+0000\n" +"Last-Translator: Евгений Лежнин \n" +"Language-Team: LANGUAGE \n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: src/Audio.cpp:110 +msgid "audio" +msgstr "звук" + +#: src/Audio.cpp:111 +msgid "data" +msgstr "данные" + +#: src/Audio.cpp:113 +#, c-format +msgid "UNKNOWN(type=%d)" +msgstr "НЕИЗВЕСТНО(тип=%d)" + +#: src/Audio.cpp:124 +#, c-format +msgid "%d CDROM drive(s).\n" +msgstr "%d CD-привод(ов).\n" + +#: src/Audio.cpp:135 +#, c-format +msgid "Tracks: %d\n" +msgstr "Композиций: %d\n" + +#: src/Audio.cpp:139 +#, c-format +msgid "track %2d: %s\n" +msgstr "композиция %2d: %s\n" + +#: src/Audio.cpp:148 +#, c-format +msgid "" +"\n" +" Data track(s) only. CD audio not available.\n" +"\n" +msgstr "" +"\n" +" Только музыка с жёсткого диска. Музыкальный CD недоступен.\n" +"\n" + +#: src/Audio.cpp:154 +#, c-format +msgid "" +"\n" +" use_cdrom enabled. Set to '0' in the configuration file to disable.\n" +msgstr "" +"\n" +" use_cdrom позволяет использовать компакт-диск с музыкой. Чтобы запретить, установите use_cdrom в \"0\".\n" + +#: src/Audio.cpp:155 +#, c-format +msgid "" +" Press the 'N' key to skip to next CD track during a game.\n" +"\n" +msgstr "" +" Нажмите клавишу \"N\" во время игры, чтобы проиграть следующую композицию.\n" +"\n" + +#: src/Audio.cpp:166 +#, c-format +msgid "ERROR! Could not access CDROM device %d : %s\n" +msgstr "ОШИБКА! Нет доступа к CD-приводу %d : %s\n" + +#: src/Audio.cpp:209 +#, c-format +msgid "CDROM error in AudioOpenAL::pauseGameMusic(%d)\n" +msgstr "Ошибка CD-привода в AudioOpenAL::pauseGameMusic(%d)\n" + +#: src/Audio.cpp:210 +#, c-format +msgid "CDROM status = %d\n" +msgstr "Статус CD-привода = %d\n" + +#: src/Audio.cpp:275 +#, c-format +msgid "Could not set CD volume, amixer returned status %d\n" +msgstr "" + +#: src/Audio.cpp:302 +#, c-format +msgid "Audio::setMusicIndex(%d)\n" +msgstr "" + +#: src/Audio.cpp:319 +#, c-format +msgid "track %d is data - trying next track...\n" +msgstr "дорожка %d не является композицией, попытка воспроизвести следующую дорожку...\n" + +#: src/AudioOpenAL.cpp:149 +#, c-format +msgid "alAttenuationScale == 0. Kludge it.\n" +msgstr "alAttenuationScale == 0. Попытка обойти.\n" + +#: src/AudioOpenAL.cpp:162 +#, c-format +msgid "AudioOpenAL::Audio done\n" +msgstr "AudioOpenAL::Audio готово\n" + +#: src/AudioOpenAL.cpp:170 +#, c-format +msgid "stopping OpenAL..." +msgstr "завершение OpenAL..." + +#: src/AudioOpenAL.cpp:182 +msgid "AudioOpenAL::~Audio()" +msgstr "" + +#: src/AudioOpenAL.cpp:203 +#, c-format +msgid "done.\n" +msgstr "готово.\n" + +#: src/AudioOpenAL.cpp:249 +#, c-format +msgid "" +"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" +"!! ATTENTION !! - one or more errors were encountered during audio check.\n" +"!! Audio will be disabled.\n" +"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" +msgstr "" +"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" +"!! ВНИМАНИЕ !! - произошла одна или несколько ошибок во время проверки, поэтому\n" +"!! звук не будет работать.\n" +"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" + +#: src/AudioOpenAL.cpp:269 +#, c-format +msgid "AudioOpenAL::initSound() begin...\n" +msgstr "AudioOpenAL::initSound() запуск...\n" + +#: src/AudioOpenAL.cpp:273 +#, c-format +msgid "" +"-OpenAL-----------------------------------------------------\n" +"Vendor : %s\n" +"Renderer : %s\n" +"Version : %s\n" +msgstr "" +"-OpenAL-----------------------------------------------------\n" +"Разработчик : %s\n" +"Рендерер : %s\n" +"Версия : %s\n" + +#: src/AudioOpenAL.cpp:279 src/MainSDL.cpp:130 +#, c-format +msgid "------------------------------------------------------------\n" +msgstr "" + +#: src/AudioOpenAL.cpp:311 +#, c-format +msgid "Audio.cpp - init %s" +msgstr "Audio.cpp - инициализация %s" + +#: src/AudioOpenAL.cpp:324 +#, c-format +msgid "Audio.cpp - init explosion %d" +msgstr "Audio.cpp - инициализация звука взрыва %d" + +#: src/AudioOpenAL.cpp:337 +#, c-format +msgid "Audio.cpp - init exploPop %d" +msgstr "Audio.cpp - инициализация звука *пух* %d" + +#: src/AudioOpenAL.cpp:350 +msgid "Audio.cpp - initSound complete." +msgstr "Audio.cpp - initSound инициализация звука завершена." + +#: src/AudioOpenAL.cpp:430 +#, c-format +msgid "AudioOpenAL::setMusicMode(SoundType mode)\n" +msgstr "" + +#: src/AudioOpenAL.cpp:465 +#, c-format +msgid "AudioOpenAL::setSoundVolume(%f)\n" +msgstr "" + +#: src/AudioOpenAL.cpp:508 +#, c-format +msgid "Music volume = %f\n" +msgstr "Громкость звука = %f\n" + +#: src/AudioOpenAL.cpp:524 +#, c-format +msgid "" +"\n" +"ERROR! - sound enumerant index %d does not have valid filename!\n" +msgstr "" + +#: src/AudioOpenAL.cpp:547 +#, c-format +msgid "alutLoadWAVFile(\"%s\",...);\n" +msgstr "" + +#: src/AudioOpenAL.cpp:563 +#, c-format +msgid "ERROR!! <%s> alGetError() = %s\n" +msgstr "ОШИБКА!! <%s> alGetError() = %s\n" + +#: src/AudioOpenAL.cpp:568 +#, c-format +msgid "ERROR!! <%s> alcGetError() = %s\n" +msgstr "ОШИБКА!! <%s> alcGetError() = %s\n" + +#: src/AudioOpenAL.cpp:573 +#, c-format +msgid "ERROR!! <%s> alutGetError() = %s\n" +msgstr "ОШИБКА!! <%s> alutGetError() = %s\n" + +#: src/AudioOpenAL.cpp:730 +#, c-format +msgid "ERROR: filename too long: \"%s\", line %d\n" +msgstr "ОШИБКА: слишком длинное имя файла: \"%s\", строка %d\n" + +#: src/AudioOpenAL.cpp:748 +#, c-format +msgid "WARNING: MP3 support not available: \"%s\", line %d\n" +msgstr "ПРЕДУПРЕЖДЕНИЕ: отсутствует поддержка MP3: \"%s\", строка %d\n" + +#: src/AudioOpenAL.cpp:759 +#, c-format +msgid "WARNING: Ogg/Vorbis support not available: \"%s\", line %d\n" +msgstr "ПРЕДУПРЕЖДЕНИЕ: отсутствует поддержка Ogg/Vorbis: \"%s\", строка %d\n" + +#: src/AudioOpenAL.cpp:763 +#, c-format +msgid "WARNING: file type not recognized: \"%s\": \"%s\", line %d\n" +msgstr "ПРЕДУПРЕЖДЕНИЕ: не могу распознать тип файла: \"%s\": \"%s\", строка %d\n" + +#: src/AudioOpenAL.cpp:778 +#, c-format +msgid "music playlist:\n" +msgstr "список воспроизведения:\n" + +#: src/AudioOpenAL.cpp:781 +#, c-format +msgid " %2d : %s\n" +msgstr "" + +#: src/AudioOpenAL.cpp:783 +#, c-format +msgid "loaded %s\n" +msgstr "загружено %s\n" + +#: src/AudioOpenAL.cpp:808 +msgid "AudioOpenAL::setMusicIndex -- begin" +msgstr "AudioOpenAL::setMusicIndex -- начало" + +#: src/AudioOpenAL.cpp:821 +msgid "AudioOpenAL::setMusicIndex -- before setting source buffer to 0" +msgstr "AudioOpenAL::setMusicIndex -- до установки буфера источника в 0" + +#: src/AudioOpenAL.cpp:824 +msgid "AudioOpenAL::setMusicIndex -- after setting source buffer to 0" +msgstr "AudioOpenAL::setMusicIndex -- после установки буфера источника в 0" + +#: src/AudioOpenAL.cpp:859 +msgid "AudioOpenAL::setMusicIndex -- end" +msgstr "AudioOpenAL::setMusicIndex -- конец" + +#: src/AudioOpenAL.cpp:909 src/AudioOpenAL.cpp:942 src/AudioOpenAL.cpp:992 +#, c-format +msgid "WARNING: PlayList support not compiled in (AudioOpenAL.cpp): %s\n" +msgstr "ПРЕДУПРЕЖДЕНИЕ: нет поддержки списков воспроизведения, не скомпилировано (AudioOpenAL.cpp): %s\n" + +#: src/AudioOpenAL.cpp:959 +#, c-format +msgid "ERROR: Could not allocate memory in AudioOpenAL::loadMP3\n" +msgstr "ОШИБКА: невозможно выделить память в AudioOpenAL::loadMP3\n" + +#: src/AudioOpenAL.cpp:965 +#, c-format +msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadMP3\n" +msgstr "ОШИБКА: не могу открыть \"%s\" в AudioOpenAL::loadMP3\n" + +#: src/AudioOpenAL.cpp:971 +#, fuzzy, c-format +msgid "ERROR: Could not read from \"%s\" in AudioOpenAL::loadMP3\n" +msgstr "ОШИБКА: не могу открыть \"%s\" в AudioOpenAL::loadMP3\n" + +#: src/AudioOpenAL.cpp:979 +#, c-format +msgid "ERROR: alutLoadMP3() failed in AudioOpenAL::loadMP3\n" +msgstr "ОШИБКА: alutLoadMP3() ошибка в AudioOpenAL::loadMP3\n" + +#: src/AudioOpenAL.cpp:1011 +#, c-format +msgid "ERROR: Could not allocate memory in AudioOpenAL::loadVorbis\n" +msgstr "ОШИБКА: невозможно выделить память в AudioOpenAL::loadVorbis\n" + +#: src/AudioOpenAL.cpp:1017 +#, c-format +msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadVorbis\n" +msgstr "ОШИБКА: не могу открыть \"%s\" в AudioOpenAL::loadVorbis\n" + +#: src/AudioOpenAL.cpp:1023 +#, fuzzy, c-format +msgid "ERROR: Could not read from \"%s\" in AudioOpenAL::loadVorbis\n" +msgstr "ОШИБКА: не могу открыть \"%s\" в AudioOpenAL::loadVorbis\n" + +#: src/AudioOpenAL.cpp:1031 +#, c-format +msgid "ERROR: alutLoadVorbis() failed in AudioOpenAL::loadVorbis\n" +msgstr "ОШИБКА: alutLoadVorbis() ошибка в AudioOpenAL::loadVorbis\n" + +#: src/AudioSDLMixer.cpp:65 +#, c-format +msgid "ERROR initializing audio - AudioSDLMixer::initSound()\n" +msgstr "ОШИБКА инициализации звука - AudioSDLMixer::initSound()\n" + +#: src/Config.cpp:114 +#, c-format +msgid "WARNING: Config::init() has already been called.\n" +msgstr "ПРЕДУПРЕЖДЕНИЕ: Config::init() уже вызывалась.\n" + +#: src/Config.cpp:243 +#, c-format +msgid "WARNING: could not read config file (%s)\n" +msgstr "ПРЕДУПРЕЖДЕНИЕ: невозможно прочитать файл конфигурации (%s)\n" + +#: src/Config.cpp:302 +#, c-format +msgid "wrote config file (%s)\n" +msgstr "записан файл конфигурации (%s)\n" + +#: src/Config.cpp:307 +#, c-format +msgid "WARNING: could not write config file (%s)\n" +msgstr "ПРЕДУПРЕЖДЕНИЕ: невозможно записать файл конфигурации (%s)\n" + +#: src/EnemyAircraft.cpp:111 +#, c-format +msgid "%d EnemyAircraft allocated\n" +msgstr "%d EnemyAircraft создан\n" + +#: src/EnemyAircraft_Straight.cpp:98 +#, c-format +msgid "EnemyAircraft_Straight %p ... pos[1] = %g, vel[1] = %g\n" +msgstr "" + +#: src/EnemyFleet.cpp:243 +#, c-format +msgid "num enemies on screen = %d\n" +msgstr "количество врагов на экране = %d\n" + +#: src/Global.cpp:114 +#, c-format +msgid "WARNING: Global::init() has already been called.\n" +msgstr "ПРЕДУПРЕЖДЕНИЕ: Global::init() уже вызывалась.\n" + +#: src/Global.cpp:211 +#, c-format +msgid "Starting up..." +msgstr "Начинаем..." + +#: src/Global.cpp:242 +#, c-format +msgid "...startup complete.\n" +msgstr "...начали.\n" + +#: src/Global.cpp:249 +#, c-format +msgid "Shutting down...\n" +msgstr "Выходим...\n" + +#: src/Global.cpp:262 +#, c-format +msgid "...shutdown complete.\n" +msgstr "...вышли.\n" + +#: src/Global.cpp:269 +#, c-format +msgid "deleteTextures()\n" +msgstr "" + +#: src/Global.cpp:289 +#, c-format +msgid "Global::loadTextures()\n" +msgstr "" + +#: src/Global.cpp:352 +#, c-format +msgid "Generating random sequences\n" +msgstr "Создание случайной последовательности\n" + +#: src/HeroAmmo.cpp:167 +#, c-format +msgid "HeroAmmo::addAmmo(%d, <%f %f %f> )\n" +msgstr "" + +#: src/HeroAmmo.cpp:190 +#, c-format +msgid "%p <--%p--> %p\n" +msgstr "" + +#: src/HiScore.cpp:58 +#, c-format +msgid "nobody" +msgstr "пусто" + +#: src/HiScore.cpp:83 +#, c-format +msgid "WARNING: HiScore::init() has already been called.\n" +msgstr "ПРЕДУПРЕЖДЕНИЕ: HiScore::init() уже вызывалась.\n" + +#: src/HiScore.cpp:241 +#, c-format +msgid "WARNING: could not write score file (%s)\n" +msgstr "ПРЕДУПРЕЖДЕНИЕ: не могу записать счёт (%s).\n" + +#: src/HiScore.cpp:276 +#, fuzzy, c-format +msgid "WARNING: error reading score file (%s)\n" +msgstr "ПРЕДУПРЕЖДЕНИЕ: не могу прочитать счёт (%s).\n" + +#: src/HiScore.cpp:319 src/HiScore.cpp:321 src/HiScore.cpp:323 +#: src/HiScore.cpp:343 src/HiScore.cpp:345 src/HiScore.cpp:347 +#, fuzzy, c-format +msgid "WARNING: error reading old score file (%s)\n" +msgstr "ПРЕДУПРЕЖДЕНИЕ: не могу прочитать счёт (%s).\n" + +#: src/HiScore.cpp:332 +#, c-format +msgid "WARNING: empty score file (%s)\n" +msgstr "ПРЕДУПРЕЖДЕНИЕ: счёт пустой (%s).\n" + +#: src/HiScore.cpp:357 +#, c-format +msgid "WARNING: could not read score file (%s)\n" +msgstr "ПРЕДУПРЕЖДЕНИЕ: не могу прочитать счёт (%s).\n" + +#: src/HiScore.cpp:449 +#, c-format +msgid "high scores:\n" +msgstr "рекорды:\n" + +#: src/HiScore.cpp:455 +#, c-format +msgid "%02d/%02d/%04d %16s %d\n" +msgstr "" + +#: src/main.cpp:119 +#, c-format +msgid "" +"\n" +"--------------------------------------------------\n" +"Chromium B.S.U. options\n" +"--------------------------------------------------\n" +" -f/--fullscreen : run in fullscreen mode\n" +" -w/--window : run in windowed mode\n" +" -v/--vidmode : mode 0 = 512 x 384\n" +" : 1 = 640 x 480\n" +" : 2 = 800 x 600\n" +" : 3 = 1024 x 768\n" +" : 4 = 1280 x 960\n" +" -na/--noaudio : do not initialize audio\n" +" -nb/--noblend : disable blending (OpenGL)\n" +" -nt/--notexborder : do not set tex border color (OpenGL)\n" +"--------------------------------------------------\n" +"\n" +msgstr "" +"\n" +"--------------------------------------------------\n" +"Chromium B.S.U. параметры\n" +"--------------------------------------------------\n" +" -f/--fullscreen : запуск в полноэкранном режиме\n" +" -w/--window : запуск в оконном режиме\n" +" -v/--vidmode : разрешение экрана 0 = 512 x 384\n" +" : 1 = 640 x 480\n" +" : 2 = 800 x 600\n" +" : 3 = 1024 x 768\n" +" : 4 = 1280 x 960\n" +" -na/--noaudio : режим без звука\n" +" -nb/--noblend : отключить смешивание (OpenGL)\n" +" -nt/--notexborder : не устанавливать цвет рамки tex (OpenGL)\n" +"--------------------------------------------------\n" +"\n" + +#: src/main.cpp:231 +#, c-format +msgid "!! ERROR !! - " +msgstr "!! ОШИБКА !! - " + +#: src/main.cpp:255 +#, c-format +msgid "Extensions :" +msgstr "Дополнения :" + +#: src/MainGL.cpp:86 +#, c-format +msgid "initGL()\n" +msgstr "" + +#: src/MainGL.cpp:148 +#, c-format +msgid "error loading font: %s\n" +msgstr "ошибка при загрузке шрифта: %s\n" + +#: src/MainGL.cpp:153 +#, c-format +msgid "error loading font\n" +msgstr "ошибка при загрузке шрифта\n" + +#: src/MainGL.cpp:183 +#, c-format +msgid "!!MainGL::drawGL() HUH?\n" +msgstr "" + +#: src/MainGL.cpp:311 +#, c-format +msgid "" +"new high score!\n" +"\n" +"%d" +msgstr "" +"новый рекорд!\n" +"\n" +"%d" + +#: src/MainGL.cpp:316 +#, c-format +msgid "" +"n o t b a d !\n" +"rank : %d\n" +"\n" +"%d" +msgstr "" +"т ы к р у т !\n" +"место : %d\n" +"\n" +"%d" + +#: src/MainGL.cpp:321 +msgid "l o s e r" +msgstr "м а з и л а" + +#: src/MainGL.cpp:379 +#, c-format +msgid "" +"congratulations!\n" +" \n" +"l e v e l\n" +" %d \n" +"c o m p l e t e\n" +" \n" +msgstr "" +"отлично!\n" +" \n" +"у р о в е н ь\n" +" %d \n" +"п р о й д е н\n" +" \n" + +#: src/MainGLUT.cpp:77 +#, c-format +msgid "MainGLUT::run()\n" +msgstr "" + +#: src/MainGLUT.cpp:93 src/MainSDL.cpp:286 +#, c-format +msgid "ERROR!!! OpenGL error: %s\n" +msgstr "ОШИБКА!!! Ошибка OpenGL: %s\n" + +#: src/MainGLUT.cpp:235 +#, c-format +msgid "key = %d\n" +msgstr "клавиша = %d\n" + +#: src/MainSDL.cpp:74 +#, c-format +msgid "Couldn't initialize SDL: %s\n" +msgstr "Ошибка инициализации SDL: %s\n" + +#: src/MainSDL.cpp:77 +#, c-format +msgid "SDL initialized.\n" +msgstr "SDL стартовал.\n" + +#: src/MainSDL.cpp:83 +#, c-format +msgid "num joysticks = %d\n" +msgstr "номера джойстиков = %d\n" + +#: src/MainSDL.cpp:85 +#, c-format +msgid " joystick 0 = %p\n" +msgstr " джойстик0 = %p\n" + +#: src/MainSDL.cpp:91 +#, c-format +msgid "no joysticks found\n" +msgstr "джойстики не найдены\n" + +#: src/MainSDL.cpp:116 src/MainSDL.cpp:347 +#, c-format +msgid "Couldn't set video mode: %s\n" +msgstr "Невозможно установить видео режим: %s\n" + +#: src/MainSDL.cpp:124 +#, c-format +msgid "" +"-OpenGL-----------------------------------------------------\n" +"Vendor : %s\n" +"Renderer : %s\n" +"Version : %s\n" +msgstr "" +"-OpenGL-----------------------------------------------------\n" +"Разработчик : %s\n" +"Рендерер : %s\n" +"Версия : %s\n" + +#: src/MainSDL.cpp:215 +#, c-format +msgid "init----> %3.2ffps gameSpeed = %g\n" +msgstr "" + +#: src/MainSDL.cpp:222 +#, c-format +msgid "init----> %3.2ffps targetAdj = %g, tmp = %g\n" +msgstr "" + +#: src/MainSDL.cpp:235 +#, c-format +msgid "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" +msgstr "" + +#: src/MainSDL.cpp:257 +#, c-format +msgid "" +"%d speed adjustments required.\n" +"NOTE: The game was not able to maintain a steady 50 frames per\n" +" second. You should consider reducing your screen resolution\n" +" or lowering the graphics detail setting.\n" +" -OR-\n" +" make sure that you aren't running any system monitoring\n" +" tools (like 'top', 'xosview', etc.) These kinds of tools\n" +" can make it difficult to maintain a steady frame rate.\n" +msgstr "" +"%d необходимо увеличить скорость.\n" +"Не получается сделать стабильные 50 кадров\n" +" в секунду. Попробуйте уменьшить разрешение экрана\n" +" или уровень детализации.\n" +" -ЛИБО-\n" +" проверьте, что не запущена какая-нибудь программа мониторинга\n" +" (вроде \"top\", \"xosview\", и т.д.) Эти утилиты могут помешать\n" +" установке постоянного количества кадров в секунду.\n" + +#: src/MainSDL.cpp:269 +#, c-format +msgid "exit.\n" +msgstr "выход.\n" + +#: src/MainSDL.cpp:294 +#, c-format +msgid "ERROR!!! SDL error '%s'\n" +msgstr "ОШИБКА!!! Ошибка SDL \"%s\"\n" + +#: src/MainSDL.cpp:352 +#, c-format +msgid "video mode set " +msgstr "установка разрешения экрана" + +#: src/MainSDL.cpp:359 +#, c-format +msgid "(bpp=%d RGB=%d%d%d depth=%d)\n" +msgstr "" + +#: src/MainSDL_Event.cpp:40 +#, c-format +msgid "%-5d SDL_ACTIVEEVENT \n" +msgstr "" + +#: src/MainSDL_Event.cpp:41 +#, c-format +msgid "%-5d SDL_KEYDOWN \n" +msgstr "" + +#: src/MainSDL_Event.cpp:42 +#, c-format +msgid "%-5d SDL_KEYUP \n" +msgstr "" + +#: src/MainSDL_Event.cpp:43 +#, c-format +msgid "%-5d SDL_MOUSEMOTION \n" +msgstr "" + +#: src/MainSDL_Event.cpp:44 +#, c-format +msgid "%-5d SDL_MOUSEBUTTONDOWN \n" +msgstr "" + +#: src/MainSDL_Event.cpp:45 +#, c-format +msgid "%-5d SDL_MOUSEBUTTONUP \n" +msgstr "" + +#: src/MainSDL_Event.cpp:46 +#, c-format +msgid "%-5d SDL_JOYBUTTONDOWN \n" +msgstr "" + +#: src/MainSDL_Event.cpp:47 +#, c-format +msgid "%-5d SDL_JOYBUTTONUP \n" +msgstr "" + +#: src/MainSDL_Event.cpp:212 +#, c-format +msgid "MainSDL::getEvent HUH?\n" +msgstr "" + +#: src/MainSDL_Event.cpp:222 +#, c-format +msgid "" +"buffer = \"%s\n" +"\"" +msgstr "" +"буфер = \"%s\n" +"\"" + +#: src/MainSDL_Event.cpp:243 +#, c-format +msgid "mouse active" +msgstr "мышь активна" + +#: src/MainSDL_Event.cpp:251 +#, c-format +msgid "focus\n" +msgstr "фокус\n" + +#: src/MainSDL_Event.cpp:403 +#, c-format +msgid "key '%s' pressed\n" +msgstr "клавиша \"%s\" нажата\n" + +#: src/MainSDL_Event.cpp:404 +#, c-format +msgid "game->gameFrame = %d\n" +msgstr "" + +#: src/MainSDL_Event.cpp:538 +#, c-format +msgid "MainSDL::grabMouse(%d)\n" +msgstr "" + +#: src/MenuGL.cpp:43 +msgid " d o n o t a l l o w -a n y- e n e m i e s g e t p a s t y o u !" +msgstr " н е п о з в о л я й т е п р о л е т а т ь в р а г а м м и м о в а с !" + +#: src/MenuGL.cpp:44 +msgid " e v e r y e n e m y t h a t g e t s b y c o s t s y o u a l i f e !" +msgstr " е с л и в р а г п р о й д ё т , в ы п о т е р я е т е ж и з н ь !" + +#: src/MenuGL.cpp:45 +msgid " a l l o w p o w e r - u p s t o p a s s b y f o r b i g p o i n t s !" +msgstr " е с л и в ы у п у с т и т е б о н у с , т о п о л у ч и т е о ч к и!" + +#: src/MenuGL.cpp:46 +msgid " c r a s h i n t o e n e m i e s t o d e s t r o y t h e m !" +msgstr " в р е з а й т е с ь в о в р а г о в , ч т о б ы у н и ч т о ж и т ь и х!" + +#: src/MenuGL.cpp:47 +msgid " r i g h t c l i c k t w i c e t o s e l f - d e s t r u c t !" +msgstr " д в о й н о й щ е л ч о к п р а в о й к н о п к о й м ы ш и д л я с а м о у н и ч т о ж е н и я!" + +#: src/MenuGL.cpp:48 +msgid " s e l f - d e s t r u c t t o p r e s e r v e y o u r a m m u n i t i o n !" +msgstr " в к л ю ч и т е с а м о у н и ч т о ж е н и е , ч т о б ы с о х р а н и т ь а м у н и ц и ю!" + +#: src/MenuGL.cpp:49 +msgid " d o w n l o a d C h r o m i u m B. S. U. a t http://chromium-bsu.sf.net/" +msgstr " с к а ч а т ь C h r o m i u m B. S. U. с http://chromium-bsu.sf.net/" + +#: src/MenuGL.cpp:70 +msgid "n e w g a m e" +msgstr "н о в а я и г р а" + +#: src/MenuGL.cpp:71 +msgid "l e v e l" +msgstr "у р о в е н ь" + +#: src/MenuGL.cpp:72 +msgid "s k i l l" +msgstr "с л о ж н о с т ь" + +#: src/MenuGL.cpp:73 +msgid "g f x d e t a i l" +msgstr "д е т а л и з а ц и я g f x" + +#: src/MenuGL.cpp:74 +msgid "f u l l s c r e e n" +msgstr "н а в е с ь э к р а н" + +#: src/MenuGL.cpp:75 +msgid "s c r e e n s i z e" +msgstr "р а з р е ш е н и е э к р а н а" + +#: src/MenuGL.cpp:76 +msgid "s o u n d f x v o l u m e" +msgstr "г р о м к о с т ь з в у к о в" + +#: src/MenuGL.cpp:77 +msgid "m u s i c v o l u m e" +msgstr "г р о м к о с т ь м у з ы к и" + +#: src/MenuGL.cpp:78 +msgid "m o v e m e n t s p e e d" +msgstr "с к о р о с т ь" + +#: src/MenuGL.cpp:79 +msgid "q u i t" +msgstr "в ы х о д" + +#: src/MenuGL.cpp:143 src/MenuGL.cpp:417 +#, c-format +msgid "ATTENTION: Using 'thin' text to improve framerate...\n" +msgstr "ВНИМАНИЕ: используется разрежённый текст для увеличения количества кадров...\n" + +#: src/MenuGL.cpp:147 +#, c-format +msgid "MenuGL::createLists\n" +msgstr "" + +#: src/MenuGL.cpp:162 +msgid "fish in a barrel" +msgstr "проще простого" + +#: src/MenuGL.cpp:163 +msgid "wimp" +msgstr "зануда" + +#: src/MenuGL.cpp:164 +msgid "easy" +msgstr "легко" + +#: src/MenuGL.cpp:165 +msgid "normal" +msgstr "нормально" + +#: src/MenuGL.cpp:166 +msgid "experienced" +msgstr "трудно" + +#: src/MenuGL.cpp:167 +msgid "fun" +msgstr "очень трудно" + +#: src/MenuGL.cpp:168 +msgid "insane" +msgstr "сумасшествие" + +#: src/MenuGL.cpp:169 +msgid "impossible" +msgstr "невозможно" + +#: src/MenuGL.cpp:170 +msgid "-" +msgstr "" + +#: src/MenuGL.cpp:292 src/MenuGL.cpp:320 +msgid "high scores" +msgstr "рекорды" + +#: src/MenuGL.cpp:349 +msgid "the" +msgstr "" + +#: src/MenuGL.cpp:353 +msgid "reptile" +msgstr "" + +#: src/MenuGL.cpp:357 +msgid "labour" +msgstr "" + +#: src/MenuGL.cpp:361 +msgid "project" +msgstr "" + +#: src/MenuGL.cpp:422 +#, c-format +msgid "ATTENTION: Reverting to 'thick' text...\n" +msgstr "ВНИМАНИЕ: Переход к разрежённому тексту...\n" + +#: src/MenuGL.cpp:473 +#, c-format +msgid "low" +msgstr "низко" + +#: src/MenuGL.cpp:474 +#, c-format +msgid "med" +msgstr "средне" + +#: src/MenuGL.cpp:475 +#, c-format +msgid "high" +msgstr "высоко" + +#: src/MenuGL.cpp:480 +#, c-format +msgid "%dx%d" +msgstr "" + +#: src/MenuGL.cpp:484 +#, c-format +msgid "true" +msgstr "правда" + +#: src/MenuGL.cpp:485 +#, c-format +msgid "false" +msgstr "ложь" + +#: src/MenuGL.cpp:791 src/MenuGL.cpp:864 src/MenuGL.cpp:935 +#, c-format +msgid "---- error setting full screen mode ----" +msgstr "---- ошибка входа в полноэкранный режим ----" + +#: src/MenuGL.cpp:793 +#, c-format +msgid "---- error setting window mode ----" +msgstr "---- ошибка входа в оконный режим ----" + +#: src/MenuGL.cpp:834 +#, c-format +msgid "---- you must complete level %d before you can select level %d ----" +msgstr "---- вы должны пройти уровень %d, чтобы выбрать уровень %d ----" + +#: src/MenuGL.cpp:850 src/MenuGL.cpp:921 +#, c-format +msgid "---- error setting screen size ----" +msgstr "---- ошибка установки разрешения экрана ----" + +#: src/PowerUps.cpp:180 +#, c-format +msgid "active power ups = %d\n" +msgstr "текущие бонусы = %d\n" + +#: src/PowerUps.cpp:368 +#, c-format +msgid "?? PowerUp::seal()" +msgstr "" + +#: src/ScreenItemAdd.cpp:107 +#, c-format +msgid "ScreenItemAdd::putScreenItems() Hero??? HUH???\n" +msgstr "" + +#: src/StatusDisplay.cpp:653 src/StatusDisplay.cpp:657 +msgid "p a u s e d" +msgstr "п а у з а" + +#: src/StatusDisplay.cpp:677 +msgid "do not let -any- ships past you! each one costs you a life!" +msgstr "не позволяйте вражеским кораблям проходить через низ экрана, любой будет стоить вам жизни!" + +#: src/StatusDisplay.cpp:688 +msgid "let super shields pass by for an extra life!" +msgstr "упустите оранжевый пингвинний щит и получите ещё одну жизнь!" + +#: src/TextFTGL.cpp:35 +#, c-format +msgid "FTGL: error loading font: %s\n" +msgstr "FTGL: ошибка, невозможно загрузить шрифт: %s\n" + +#: src/TextFTGL.cpp:38 +msgid "FTGL: error loading font" +msgstr "FTGL: ошибка, невозможно загрузить шрифт" + +#. TRANSLATORS: If using the FTGL backend, this should be the font +#. name of a font that contains all the Unicode characters in use in +#. your translation. +#. +#. TRANSLATORS: If using the GLC backend, this should be the font +#. name of a font that contains all the Unicode characters in use in +#. your translation. The GLC renderer will fall back on other fonts +#. if some characters are not available though, so choose a font +#. that your language looks good in. +#. +#: src/TextFTGL.cpp:105 src/TextGLC.cpp:41 +msgid "Gothic Uralic" +msgstr "" + +#. TRANSLATORS: If using the FTGL backend, this should be the path of a bold +#. font that contains all the Unicode characters in use in your translation. +#. If the font is available in Debian it should be the Debian path. +#. +#: src/TextFTGL.cpp:135 +msgid "/usr/share/fonts/truetype/uralic/gothub__.ttf" +msgstr "" + +#. TRANSLATORS: If using the FTGL backend, this should be the path of a +#. font that contains all the Unicode characters in use in your translation. +#. If the font is available in Debian it should be the Debian path. +#. +#: src/TextFTGL.cpp:141 +msgid "/usr/share/fonts/truetype/uralic/gothu___.ttf" +msgstr "" + +#. TRANSLATORS: If using the FTGL backend, this should be the path of a bold +#. font that contains all the Unicode characters in use in your translation. +#. If the font is available in Mandrake it should be the Mandrake path. +#. +#: src/TextFTGL.cpp:148 +msgid "/usr/share/fonts/TTF/uralic/GOTHUB__.TTF" +msgstr "" + +#. TRANSLATORS: If using the FTGL backend, this should be the path of a +#. font that contains all the Unicode characters in use in your translation. +#. If the font is available in Mandrake it should be the Mandrake path. +#. +#: src/TextFTGL.cpp:154 +msgid "/usr/share/fonts/TTF/uralic/GOTHU___.TTF" +msgstr "" + +#: src/TextGLC.cpp:30 +msgid "GLC: couldn't set context" +msgstr "GLC: невозможно установить контекст" Binary files /tmp/7K9nOp7Wb5/chromium-bsu-0.9.15/po/sv.gmo and /tmp/9BF9Wy2VjB/chromium-bsu-0.9.15.1/po/sv.gmo differ diff -Nru chromium-bsu-0.9.15/po/sv.po chromium-bsu-0.9.15.1/po/sv.po --- chromium-bsu-0.9.15/po/sv.po 2011-02-14 03:55:27.000000000 +0000 +++ chromium-bsu-0.9.15.1/po/sv.po 2013-05-25 05:43:49.000000000 +0000 @@ -1,18 +1,22 @@ -# Swedish translation for Chromium BSU. -# Daniel Nylander , 2010. +# Swedish translation for Chromium B.S.U. +# This file is put in the public domain. # +# Translators: +# Daniel Nylander , 2010, 2011. +# Nille , 2011. msgid "" msgstr "" "Project-Id-Version: Chromium B.S.U.\n" "Report-Msgid-Bugs-To: http://sf.net/projects/chromium-bsu/bugs\n" -"POT-Creation-Date: 2011-02-10 19:48+0800\n" -"PO-Revision-Date: 2010-03-01 23:14+0100\n" -"Last-Translator: Daniel Nylander \n" +"POT-Creation-Date: 2013-05-25 13:43+0800\n" +"PO-Revision-Date: 2011-05-17 00:20+0000\n" +"Last-Translator: Niklas Åkerström \n" "Language-Team: Swedish \n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/Audio.cpp:110 msgid "audio" @@ -86,12 +90,17 @@ msgid "CDROM status = %d\n" msgstr "CDROM-status = %d\n" -#: src/Audio.cpp:298 +#: src/Audio.cpp:275 +#, c-format +msgid "Could not set CD volume, amixer returned status %d\n" +msgstr "" + +#: src/Audio.cpp:302 #, c-format msgid "Audio::setMusicIndex(%d)\n" msgstr "Audio::setMusicIndex(%d)\n" -#: src/Audio.cpp:315 +#: src/Audio.cpp:319 #, c-format msgid "track %d is data - trying next track...\n" msgstr "Spår %d är data - testar nästa spår... \n" @@ -217,22 +226,22 @@ msgid "ERROR!! <%s> alutGetError() = %s\n" msgstr "FEL!! <%s> alutGetError() = %s\n" -#: src/AudioOpenAL.cpp:732 +#: src/AudioOpenAL.cpp:730 #, c-format msgid "ERROR: filename too long: \"%s\", line %d\n" msgstr "FEL: filnamnet är för långt: \"%s\", rad %d\n" -#: src/AudioOpenAL.cpp:750 +#: src/AudioOpenAL.cpp:748 #, c-format msgid "WARNING: MP3 support not available: \"%s\", line %d\n" msgstr "VARNING: MP3-stöd inte tillgängligt: \"%s\", rad %d\n" -#: src/AudioOpenAL.cpp:761 +#: src/AudioOpenAL.cpp:759 #, c-format msgid "WARNING: Ogg/Vorbis support not available: \"%s\", line %d\n" msgstr "VARNING: Ogg/Vorbis-stöd inte tillgängligt: \"%s\", rad %d\n" -#: src/AudioOpenAL.cpp:765 +#: src/AudioOpenAL.cpp:763 #, c-format msgid "WARNING: file type not recognized: \"%s\": \"%s\", line %d\n" msgstr "VARNING: filtypen känns inte igen: \"%s\": \"%s\", rad %d\n" @@ -268,7 +277,7 @@ msgid "AudioOpenAL::setMusicIndex -- end" msgstr "AudioOpenAL::setMusicIndex -- slut" -#: src/AudioOpenAL.cpp:909 src/AudioOpenAL.cpp:942 src/AudioOpenAL.cpp:986 +#: src/AudioOpenAL.cpp:909 src/AudioOpenAL.cpp:942 src/AudioOpenAL.cpp:992 #, c-format msgid "WARNING: PlayList support not compiled in (AudioOpenAL.cpp): %s\n" msgstr "VARNING: Stöd för spellista har inte kompilerats in (AudioOpenAL.cpp): %s\n" @@ -283,22 +292,32 @@ msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadMP3\n" msgstr "FEL: Kunde inte öppna \"%s\" i AudioOpenAL::loadMP3\n" -#: src/AudioOpenAL.cpp:973 +#: src/AudioOpenAL.cpp:971 +#, fuzzy, c-format +msgid "ERROR: Could not read from \"%s\" in AudioOpenAL::loadMP3\n" +msgstr "FEL: Kunde inte öppna \"%s\" i AudioOpenAL::loadMP3\n" + +#: src/AudioOpenAL.cpp:979 #, c-format msgid "ERROR: alutLoadMP3() failed in AudioOpenAL::loadMP3\n" msgstr "FEL: alutLoadMP3() misslyckades i AudioOpenAL::loadMP3\n" -#: src/AudioOpenAL.cpp:1005 +#: src/AudioOpenAL.cpp:1011 #, c-format msgid "ERROR: Could not allocate memory in AudioOpenAL::loadVorbis\n" msgstr "FEL: Kunde inte allokera minne i AudioOpenAL::loadVorbis\n" -#: src/AudioOpenAL.cpp:1011 +#: src/AudioOpenAL.cpp:1017 #, c-format msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadVorbis\n" msgstr "FEL: Kunde inte öppna \"%s\" i AudioOpenAL::loadVorbis\n" -#: src/AudioOpenAL.cpp:1019 +#: src/AudioOpenAL.cpp:1023 +#, fuzzy, c-format +msgid "ERROR: Could not read from \"%s\" in AudioOpenAL::loadVorbis\n" +msgstr "FEL: Kunde inte öppna \"%s\" i AudioOpenAL::loadVorbis\n" + +#: src/AudioOpenAL.cpp:1031 #, c-format msgid "ERROR: alutLoadVorbis() failed in AudioOpenAL::loadVorbis\n" msgstr "FEL: alutLoadVorbis() misslyckades i AudioOpenAL::loadVorbis\n" @@ -333,7 +352,7 @@ msgid "%d EnemyAircraft allocated\n" msgstr "%d EnemyAircraft allokerat\n" -#: src/EnemyAircraft_Straight.cpp:103 +#: src/EnemyAircraft_Straight.cpp:98 #, c-format msgid "EnemyAircraft_Straight %p ... pos[1] = %g, vel[1] = %g\n" msgstr "EnemyAircraft_Straight %p ... pos[1] = %g, vel[1] = %g\n" @@ -408,27 +427,38 @@ msgid "WARNING: could not write score file (%s)\n" msgstr "VARNING: kunde inte skriva poängfil (%s)\n" -#: src/HiScore.cpp:328 +#: src/HiScore.cpp:276 +#, fuzzy, c-format +msgid "WARNING: error reading score file (%s)\n" +msgstr "VARNING: kunde inte läsa poängfil (%s)\n" + +#: src/HiScore.cpp:319 src/HiScore.cpp:321 src/HiScore.cpp:323 +#: src/HiScore.cpp:343 src/HiScore.cpp:345 src/HiScore.cpp:347 +#, fuzzy, c-format +msgid "WARNING: error reading old score file (%s)\n" +msgstr "VARNING: kunde inte läsa poängfil (%s)\n" + +#: src/HiScore.cpp:332 #, c-format msgid "WARNING: empty score file (%s)\n" msgstr "VARNING: tom poängfil (%s)\n" -#: src/HiScore.cpp:350 +#: src/HiScore.cpp:357 #, c-format msgid "WARNING: could not read score file (%s)\n" msgstr "VARNING: kunde inte läsa poängfil (%s)\n" -#: src/HiScore.cpp:442 +#: src/HiScore.cpp:449 #, c-format msgid "high scores:\n" msgstr "poänglista:\n" -#: src/HiScore.cpp:448 +#: src/HiScore.cpp:455 #, c-format msgid "%02d/%02d/%04d %16s %d\n" msgstr "%02d/%02d/%04d %16s %d\n" -#: src/main.cpp:118 +#: src/main.cpp:119 #, c-format msgid "" "\n" @@ -465,12 +495,12 @@ "--------------------------------------------------\n" "\n" -#: src/main.cpp:230 +#: src/main.cpp:231 #, c-format msgid "!! ERROR !! - " msgstr "!! FEL !! - " -#: src/main.cpp:254 +#: src/main.cpp:255 #, c-format msgid "Extensions :" msgstr "Tillägg :" @@ -545,7 +575,7 @@ msgid "MainGLUT::run()\n" msgstr "MainGLUT::run()\n" -#: src/MainGLUT.cpp:93 src/MainSDL.cpp:288 +#: src/MainGLUT.cpp:93 src/MainSDL.cpp:286 #, c-format msgid "ERROR!!! OpenGL error: %s\n" msgstr "FEL!!! OpenGL-fel: %s\n" @@ -580,7 +610,7 @@ msgid "no joysticks found\n" msgstr "inga styrspakar hittades\n" -#: src/MainSDL.cpp:116 src/MainSDL.cpp:349 +#: src/MainSDL.cpp:116 src/MainSDL.cpp:347 #, c-format msgid "Couldn't set video mode: %s\n" msgstr "Kunde inte ställa in grafikläge: %s\n" @@ -598,22 +628,22 @@ "Renderare : %s\n" "Version : %s\n" -#: src/MainSDL.cpp:217 +#: src/MainSDL.cpp:215 #, c-format msgid "init----> %3.2ffps gameSpeed = %g\n" msgstr "init----> %3.2ffps gameSpeed = %g\n" -#: src/MainSDL.cpp:224 +#: src/MainSDL.cpp:222 #, c-format msgid "init----> %3.2ffps targetAdj = %g, tmp = %g\n" msgstr "init----> %3.2ffps targetAdj = %g, tmp = %g\n" -#: src/MainSDL.cpp:237 +#: src/MainSDL.cpp:235 #, c-format msgid "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" msgstr "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" -#: src/MainSDL.cpp:259 +#: src/MainSDL.cpp:257 #, c-format msgid "" "%d speed adjustments required.\n" @@ -626,22 +656,22 @@ " can make it difficult to maintain a steady frame rate.\n" msgstr "" -#: src/MainSDL.cpp:271 +#: src/MainSDL.cpp:269 #, c-format msgid "exit.\n" msgstr "avsluta.\n" -#: src/MainSDL.cpp:296 +#: src/MainSDL.cpp:294 #, c-format msgid "ERROR!!! SDL error '%s'\n" msgstr "FEL!!! SDL-fel \"%s\"\n" -#: src/MainSDL.cpp:354 +#: src/MainSDL.cpp:352 #, c-format msgid "video mode set " msgstr "grafikläge inställt " -#: src/MainSDL.cpp:361 +#: src/MainSDL.cpp:359 #, c-format msgid "(bpp=%d RGB=%d%d%d depth=%d)\n" msgstr "(bpp=%d RGB=%d%d%d djup=%d)\n" @@ -708,7 +738,7 @@ #: src/MainSDL_Event.cpp:251 #, c-format msgid "focus\n" -msgstr "" +msgstr "fokus\n" #: src/MainSDL_Event.cpp:403 #, c-format @@ -720,7 +750,7 @@ msgid "game->gameFrame = %d\n" msgstr "game->gameFrame = %d\n" -#: src/MainSDL_Event.cpp:534 +#: src/MainSDL_Event.cpp:538 #, c-format msgid "MainSDL::grabMouse(%d)\n" msgstr "MainSDL::grabMouse(%d)\n" @@ -793,7 +823,7 @@ msgid "q u i t" msgstr "a v s l u t a" -#: src/MenuGL.cpp:143 src/MenuGL.cpp:418 +#: src/MenuGL.cpp:143 src/MenuGL.cpp:417 #, c-format msgid "ATTENTION: Using 'thin' text to improve framerate...\n" msgstr "" @@ -805,7 +835,7 @@ #: src/MenuGL.cpp:162 msgid "fish in a barrel" -msgstr "" +msgstr "fisk i en tunna" #: src/MenuGL.cpp:163 msgid "wimp" @@ -839,77 +869,77 @@ msgid "-" msgstr "-" -#: src/MenuGL.cpp:292 src/MenuGL.cpp:321 +#: src/MenuGL.cpp:292 src/MenuGL.cpp:320 msgid "high scores" msgstr "högsta poäng" -#: src/MenuGL.cpp:350 +#: src/MenuGL.cpp:349 msgid "the" msgstr "" -#: src/MenuGL.cpp:354 +#: src/MenuGL.cpp:353 msgid "reptile" -msgstr "" +msgstr "reptil" -#: src/MenuGL.cpp:358 +#: src/MenuGL.cpp:357 msgid "labour" msgstr "" -#: src/MenuGL.cpp:362 +#: src/MenuGL.cpp:361 msgid "project" -msgstr "" +msgstr "projekt" -#: src/MenuGL.cpp:423 +#: src/MenuGL.cpp:422 #, c-format msgid "ATTENTION: Reverting to 'thick' text...\n" msgstr "" -#: src/MenuGL.cpp:474 +#: src/MenuGL.cpp:473 #, c-format msgid "low" msgstr "låg" -#: src/MenuGL.cpp:475 +#: src/MenuGL.cpp:474 #, c-format msgid "med" msgstr "med" -#: src/MenuGL.cpp:476 +#: src/MenuGL.cpp:475 #, c-format msgid "high" msgstr "hög" -#: src/MenuGL.cpp:481 +#: src/MenuGL.cpp:480 #, c-format msgid "%dx%d" msgstr "%dx%d" -#: src/MenuGL.cpp:485 +#: src/MenuGL.cpp:484 #, c-format msgid "true" msgstr "sant" -#: src/MenuGL.cpp:486 +#: src/MenuGL.cpp:485 #, c-format msgid "false" msgstr "falskt" -#: src/MenuGL.cpp:792 src/MenuGL.cpp:865 src/MenuGL.cpp:936 +#: src/MenuGL.cpp:791 src/MenuGL.cpp:864 src/MenuGL.cpp:935 #, c-format msgid "---- error setting full screen mode ----" msgstr "---- fel vid inställning av helskärmsläge ----" -#: src/MenuGL.cpp:794 +#: src/MenuGL.cpp:793 #, c-format msgid "---- error setting window mode ----" msgstr "---- fel vid inställning av fönsterläge ----" -#: src/MenuGL.cpp:835 +#: src/MenuGL.cpp:834 #, c-format msgid "---- you must complete level %d before you can select level %d ----" msgstr "---- du måste klara av nivå %d innan du kan välja nivå %d ----" -#: src/MenuGL.cpp:851 src/MenuGL.cpp:922 +#: src/MenuGL.cpp:850 src/MenuGL.cpp:921 #, c-format msgid "---- error setting screen size ----" msgstr "---- fel vid inställning av skärmstorlek ----" @@ -929,15 +959,15 @@ msgid "ScreenItemAdd::putScreenItems() Hero??? HUH???\n" msgstr "ScreenItemAdd::putScreenItems() Hero??? HUH???\n" -#: src/StatusDisplay.cpp:651 src/StatusDisplay.cpp:655 +#: src/StatusDisplay.cpp:653 src/StatusDisplay.cpp:657 msgid "p a u s e d" msgstr "p a u s a d" -#: src/StatusDisplay.cpp:675 +#: src/StatusDisplay.cpp:677 msgid "do not let -any- ships past you! each one costs you a life!" msgstr "låt inte -några- skepp passera dig! varje skepp kostar dig ett liv!" -#: src/StatusDisplay.cpp:686 +#: src/StatusDisplay.cpp:688 msgid "let super shields pass by for an extra life!" msgstr "låt supersköldar passera dig för att få ett extraliv!" Binary files /tmp/7K9nOp7Wb5/chromium-bsu-0.9.15/po/tr.gmo and /tmp/9BF9Wy2VjB/chromium-bsu-0.9.15.1/po/tr.gmo differ diff -Nru chromium-bsu-0.9.15/po/tr.po chromium-bsu-0.9.15.1/po/tr.po --- chromium-bsu-0.9.15/po/tr.po 1970-01-01 00:00:00.000000000 +0000 +++ chromium-bsu-0.9.15.1/po/tr.po 2013-05-25 05:43:49.000000000 +0000 @@ -0,0 +1,980 @@ +# Turkish translation for Chromium B.S.U. +# This file is put in the public domain. +# +# Translators: +# Murat Ikilik <>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: Chromium B.S.U.\n" +"Report-Msgid-Bugs-To: http://sf.net/projects/chromium-bsu/bugs\n" +"POT-Creation-Date: 2013-05-25 13:43+0800\n" +"PO-Revision-Date: 2012-03-19 21:25+0000\n" +"Last-Translator: Murat Ikilik <>\n" +"Language-Team: LANGUAGE \n" +"Language: tr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: src/Audio.cpp:110 +msgid "audio" +msgstr "Ses" + +#: src/Audio.cpp:111 +msgid "data" +msgstr "Bilgi" + +#: src/Audio.cpp:113 +#, c-format +msgid "UNKNOWN(type=%d)" +msgstr "Bilinmiyen(type=%d)" + +#: src/Audio.cpp:124 +#, c-format +msgid "%d CDROM drive(s).\n" +msgstr "" + +#: src/Audio.cpp:135 +#, c-format +msgid "Tracks: %d\n" +msgstr "" + +#: src/Audio.cpp:139 +#, c-format +msgid "track %2d: %s\n" +msgstr "" + +#: src/Audio.cpp:148 +#, c-format +msgid "" +"\n" +" Data track(s) only. CD audio not available.\n" +"\n" +msgstr "" + +#: src/Audio.cpp:154 +#, c-format +msgid "" +"\n" +" use_cdrom enabled. Set to '0' in the configuration file to disable.\n" +msgstr "" + +#: src/Audio.cpp:155 +#, c-format +msgid "" +" Press the 'N' key to skip to next CD track during a game.\n" +"\n" +msgstr "" + +#: src/Audio.cpp:166 +#, c-format +msgid "ERROR! Could not access CDROM device %d : %s\n" +msgstr "" + +#: src/Audio.cpp:209 +#, c-format +msgid "CDROM error in AudioOpenAL::pauseGameMusic(%d)\n" +msgstr "" + +#: src/Audio.cpp:210 +#, c-format +msgid "CDROM status = %d\n" +msgstr "" + +#: src/Audio.cpp:275 +#, c-format +msgid "Could not set CD volume, amixer returned status %d\n" +msgstr "" + +#: src/Audio.cpp:302 +#, c-format +msgid "Audio::setMusicIndex(%d)\n" +msgstr "" + +#: src/Audio.cpp:319 +#, c-format +msgid "track %d is data - trying next track...\n" +msgstr "" + +#: src/AudioOpenAL.cpp:149 +#, c-format +msgid "alAttenuationScale == 0. Kludge it.\n" +msgstr "" + +#: src/AudioOpenAL.cpp:162 +#, c-format +msgid "AudioOpenAL::Audio done\n" +msgstr "" + +#: src/AudioOpenAL.cpp:170 +#, c-format +msgid "stopping OpenAL..." +msgstr "" + +#: src/AudioOpenAL.cpp:182 +msgid "AudioOpenAL::~Audio()" +msgstr "" + +#: src/AudioOpenAL.cpp:203 +#, c-format +msgid "done.\n" +msgstr "" + +#: src/AudioOpenAL.cpp:249 +#, c-format +msgid "" +"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" +"!! ATTENTION !! - one or more errors were encountered during audio check.\n" +"!! Audio will be disabled.\n" +"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" +msgstr "" + +#: src/AudioOpenAL.cpp:269 +#, c-format +msgid "AudioOpenAL::initSound() begin...\n" +msgstr "" + +#: src/AudioOpenAL.cpp:273 +#, c-format +msgid "" +"-OpenAL-----------------------------------------------------\n" +"Vendor : %s\n" +"Renderer : %s\n" +"Version : %s\n" +msgstr "" + +#: src/AudioOpenAL.cpp:279 src/MainSDL.cpp:130 +#, c-format +msgid "------------------------------------------------------------\n" +msgstr "" + +#: src/AudioOpenAL.cpp:311 +#, c-format +msgid "Audio.cpp - init %s" +msgstr "" + +#: src/AudioOpenAL.cpp:324 +#, c-format +msgid "Audio.cpp - init explosion %d" +msgstr "" + +#: src/AudioOpenAL.cpp:337 +#, c-format +msgid "Audio.cpp - init exploPop %d" +msgstr "" + +#: src/AudioOpenAL.cpp:350 +msgid "Audio.cpp - initSound complete." +msgstr "" + +#: src/AudioOpenAL.cpp:430 +#, c-format +msgid "AudioOpenAL::setMusicMode(SoundType mode)\n" +msgstr "" + +#: src/AudioOpenAL.cpp:465 +#, c-format +msgid "AudioOpenAL::setSoundVolume(%f)\n" +msgstr "" + +#: src/AudioOpenAL.cpp:508 +#, c-format +msgid "Music volume = %f\n" +msgstr "" + +#: src/AudioOpenAL.cpp:524 +#, c-format +msgid "" +"\n" +"ERROR! - sound enumerant index %d does not have valid filename!\n" +msgstr "" + +#: src/AudioOpenAL.cpp:547 +#, c-format +msgid "alutLoadWAVFile(\"%s\",...);\n" +msgstr "" + +#: src/AudioOpenAL.cpp:563 +#, c-format +msgid "ERROR!! <%s> alGetError() = %s\n" +msgstr "" + +#: src/AudioOpenAL.cpp:568 +#, c-format +msgid "ERROR!! <%s> alcGetError() = %s\n" +msgstr "" + +#: src/AudioOpenAL.cpp:573 +#, c-format +msgid "ERROR!! <%s> alutGetError() = %s\n" +msgstr "" + +#: src/AudioOpenAL.cpp:730 +#, c-format +msgid "ERROR: filename too long: \"%s\", line %d\n" +msgstr "" + +#: src/AudioOpenAL.cpp:748 +#, c-format +msgid "WARNING: MP3 support not available: \"%s\", line %d\n" +msgstr "" + +#: src/AudioOpenAL.cpp:759 +#, c-format +msgid "WARNING: Ogg/Vorbis support not available: \"%s\", line %d\n" +msgstr "" + +#: src/AudioOpenAL.cpp:763 +#, c-format +msgid "WARNING: file type not recognized: \"%s\": \"%s\", line %d\n" +msgstr "" + +#: src/AudioOpenAL.cpp:778 +#, c-format +msgid "music playlist:\n" +msgstr "" + +#: src/AudioOpenAL.cpp:781 +#, c-format +msgid " %2d : %s\n" +msgstr "" + +#: src/AudioOpenAL.cpp:783 +#, c-format +msgid "loaded %s\n" +msgstr "" + +#: src/AudioOpenAL.cpp:808 +msgid "AudioOpenAL::setMusicIndex -- begin" +msgstr "" + +#: src/AudioOpenAL.cpp:821 +msgid "AudioOpenAL::setMusicIndex -- before setting source buffer to 0" +msgstr "" + +#: src/AudioOpenAL.cpp:824 +msgid "AudioOpenAL::setMusicIndex -- after setting source buffer to 0" +msgstr "" + +#: src/AudioOpenAL.cpp:859 +msgid "AudioOpenAL::setMusicIndex -- end" +msgstr "" + +#: src/AudioOpenAL.cpp:909 src/AudioOpenAL.cpp:942 src/AudioOpenAL.cpp:992 +#, c-format +msgid "WARNING: PlayList support not compiled in (AudioOpenAL.cpp): %s\n" +msgstr "" + +#: src/AudioOpenAL.cpp:959 +#, c-format +msgid "ERROR: Could not allocate memory in AudioOpenAL::loadMP3\n" +msgstr "" + +#: src/AudioOpenAL.cpp:965 +#, c-format +msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadMP3\n" +msgstr "" + +#: src/AudioOpenAL.cpp:971 +#, c-format +msgid "ERROR: Could not read from \"%s\" in AudioOpenAL::loadMP3\n" +msgstr "" + +#: src/AudioOpenAL.cpp:979 +#, c-format +msgid "ERROR: alutLoadMP3() failed in AudioOpenAL::loadMP3\n" +msgstr "" + +#: src/AudioOpenAL.cpp:1011 +#, c-format +msgid "ERROR: Could not allocate memory in AudioOpenAL::loadVorbis\n" +msgstr "" + +#: src/AudioOpenAL.cpp:1017 +#, c-format +msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadVorbis\n" +msgstr "" + +#: src/AudioOpenAL.cpp:1023 +#, c-format +msgid "ERROR: Could not read from \"%s\" in AudioOpenAL::loadVorbis\n" +msgstr "" + +#: src/AudioOpenAL.cpp:1031 +#, c-format +msgid "ERROR: alutLoadVorbis() failed in AudioOpenAL::loadVorbis\n" +msgstr "" + +#: src/AudioSDLMixer.cpp:65 +#, c-format +msgid "ERROR initializing audio - AudioSDLMixer::initSound()\n" +msgstr "" + +#: src/Config.cpp:114 +#, c-format +msgid "WARNING: Config::init() has already been called.\n" +msgstr "" + +#: src/Config.cpp:243 +#, c-format +msgid "WARNING: could not read config file (%s)\n" +msgstr "" + +#: src/Config.cpp:302 +#, c-format +msgid "wrote config file (%s)\n" +msgstr "" + +#: src/Config.cpp:307 +#, c-format +msgid "WARNING: could not write config file (%s)\n" +msgstr "" + +#: src/EnemyAircraft.cpp:111 +#, c-format +msgid "%d EnemyAircraft allocated\n" +msgstr "" + +#: src/EnemyAircraft_Straight.cpp:98 +#, c-format +msgid "EnemyAircraft_Straight %p ... pos[1] = %g, vel[1] = %g\n" +msgstr "" + +#: src/EnemyFleet.cpp:243 +#, c-format +msgid "num enemies on screen = %d\n" +msgstr "" + +#: src/Global.cpp:114 +#, c-format +msgid "WARNING: Global::init() has already been called.\n" +msgstr "" + +#: src/Global.cpp:211 +#, c-format +msgid "Starting up..." +msgstr "Başlatılıyo" + +#: src/Global.cpp:242 +#, c-format +msgid "...startup complete.\n" +msgstr "" + +#: src/Global.cpp:249 +#, c-format +msgid "Shutting down...\n" +msgstr "" + +#: src/Global.cpp:262 +#, c-format +msgid "...shutdown complete.\n" +msgstr "" + +#: src/Global.cpp:269 +#, c-format +msgid "deleteTextures()\n" +msgstr "" + +#: src/Global.cpp:289 +#, c-format +msgid "Global::loadTextures()\n" +msgstr "" + +#: src/Global.cpp:352 +#, c-format +msgid "Generating random sequences\n" +msgstr "" + +#: src/HeroAmmo.cpp:167 +#, c-format +msgid "HeroAmmo::addAmmo(%d, <%f %f %f> )\n" +msgstr "" + +#: src/HeroAmmo.cpp:190 +#, c-format +msgid "%p <--%p--> %p\n" +msgstr "" + +#: src/HiScore.cpp:58 +#, c-format +msgid "nobody" +msgstr "" + +#: src/HiScore.cpp:83 +#, c-format +msgid "WARNING: HiScore::init() has already been called.\n" +msgstr "" + +#: src/HiScore.cpp:241 +#, c-format +msgid "WARNING: could not write score file (%s)\n" +msgstr "" + +#: src/HiScore.cpp:276 +#, c-format +msgid "WARNING: error reading score file (%s)\n" +msgstr "" + +#: src/HiScore.cpp:319 src/HiScore.cpp:321 src/HiScore.cpp:323 +#: src/HiScore.cpp:343 src/HiScore.cpp:345 src/HiScore.cpp:347 +#, c-format +msgid "WARNING: error reading old score file (%s)\n" +msgstr "" + +#: src/HiScore.cpp:332 +#, c-format +msgid "WARNING: empty score file (%s)\n" +msgstr "" + +#: src/HiScore.cpp:357 +#, c-format +msgid "WARNING: could not read score file (%s)\n" +msgstr "" + +#: src/HiScore.cpp:449 +#, c-format +msgid "high scores:\n" +msgstr "" + +#: src/HiScore.cpp:455 +#, c-format +msgid "%02d/%02d/%04d %16s %d\n" +msgstr "" + +#: src/main.cpp:119 +#, c-format +msgid "" +"\n" +"--------------------------------------------------\n" +"Chromium B.S.U. options\n" +"--------------------------------------------------\n" +" -f/--fullscreen : run in fullscreen mode\n" +" -w/--window : run in windowed mode\n" +" -v/--vidmode : mode 0 = 512 x 384\n" +" : 1 = 640 x 480\n" +" : 2 = 800 x 600\n" +" : 3 = 1024 x 768\n" +" : 4 = 1280 x 960\n" +" -na/--noaudio : do not initialize audio\n" +" -nb/--noblend : disable blending (OpenGL)\n" +" -nt/--notexborder : do not set tex border color (OpenGL)\n" +"--------------------------------------------------\n" +"\n" +msgstr "" + +#: src/main.cpp:231 +#, c-format +msgid "!! ERROR !! - " +msgstr "" + +#: src/main.cpp:255 +#, c-format +msgid "Extensions :" +msgstr "" + +#: src/MainGL.cpp:86 +#, c-format +msgid "initGL()\n" +msgstr "" + +#: src/MainGL.cpp:148 +#, c-format +msgid "error loading font: %s\n" +msgstr "" + +#: src/MainGL.cpp:153 +#, c-format +msgid "error loading font\n" +msgstr "" + +#: src/MainGL.cpp:183 +#, c-format +msgid "!!MainGL::drawGL() HUH?\n" +msgstr "" + +#: src/MainGL.cpp:311 +#, c-format +msgid "" +"new high score!\n" +"\n" +"%d" +msgstr "" + +#: src/MainGL.cpp:316 +#, c-format +msgid "" +"n o t b a d !\n" +"rank : %d\n" +"\n" +"%d" +msgstr "" + +#: src/MainGL.cpp:321 +msgid "l o s e r" +msgstr "" + +#: src/MainGL.cpp:379 +#, c-format +msgid "" +"congratulations!\n" +" \n" +"l e v e l\n" +" %d \n" +"c o m p l e t e\n" +" \n" +msgstr "" + +#: src/MainGLUT.cpp:77 +#, c-format +msgid "MainGLUT::run()\n" +msgstr "" + +#: src/MainGLUT.cpp:93 src/MainSDL.cpp:286 +#, c-format +msgid "ERROR!!! OpenGL error: %s\n" +msgstr "" + +#: src/MainGLUT.cpp:235 +#, c-format +msgid "key = %d\n" +msgstr "" + +#: src/MainSDL.cpp:74 +#, c-format +msgid "Couldn't initialize SDL: %s\n" +msgstr "" + +#: src/MainSDL.cpp:77 +#, c-format +msgid "SDL initialized.\n" +msgstr "" + +#: src/MainSDL.cpp:83 +#, c-format +msgid "num joysticks = %d\n" +msgstr "" + +#: src/MainSDL.cpp:85 +#, c-format +msgid " joystick 0 = %p\n" +msgstr "" + +#: src/MainSDL.cpp:91 +#, c-format +msgid "no joysticks found\n" +msgstr "" + +#: src/MainSDL.cpp:116 src/MainSDL.cpp:347 +#, c-format +msgid "Couldn't set video mode: %s\n" +msgstr "" + +#: src/MainSDL.cpp:124 +#, c-format +msgid "" +"-OpenGL-----------------------------------------------------\n" +"Vendor : %s\n" +"Renderer : %s\n" +"Version : %s\n" +msgstr "" + +#: src/MainSDL.cpp:215 +#, c-format +msgid "init----> %3.2ffps gameSpeed = %g\n" +msgstr "" + +#: src/MainSDL.cpp:222 +#, c-format +msgid "init----> %3.2ffps targetAdj = %g, tmp = %g\n" +msgstr "" + +#: src/MainSDL.cpp:235 +#, c-format +msgid "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" +msgstr "" + +#: src/MainSDL.cpp:257 +#, c-format +msgid "" +"%d speed adjustments required.\n" +"NOTE: The game was not able to maintain a steady 50 frames per\n" +" second. You should consider reducing your screen resolution\n" +" or lowering the graphics detail setting.\n" +" -OR-\n" +" make sure that you aren't running any system monitoring\n" +" tools (like 'top', 'xosview', etc.) These kinds of tools\n" +" can make it difficult to maintain a steady frame rate.\n" +msgstr "" + +#: src/MainSDL.cpp:269 +#, c-format +msgid "exit.\n" +msgstr "" + +#: src/MainSDL.cpp:294 +#, c-format +msgid "ERROR!!! SDL error '%s'\n" +msgstr "" + +#: src/MainSDL.cpp:352 +#, c-format +msgid "video mode set " +msgstr "" + +#: src/MainSDL.cpp:359 +#, c-format +msgid "(bpp=%d RGB=%d%d%d depth=%d)\n" +msgstr "" + +#: src/MainSDL_Event.cpp:40 +#, c-format +msgid "%-5d SDL_ACTIVEEVENT \n" +msgstr "" + +#: src/MainSDL_Event.cpp:41 +#, c-format +msgid "%-5d SDL_KEYDOWN \n" +msgstr "" + +#: src/MainSDL_Event.cpp:42 +#, c-format +msgid "%-5d SDL_KEYUP \n" +msgstr "" + +#: src/MainSDL_Event.cpp:43 +#, c-format +msgid "%-5d SDL_MOUSEMOTION \n" +msgstr "" + +#: src/MainSDL_Event.cpp:44 +#, c-format +msgid "%-5d SDL_MOUSEBUTTONDOWN \n" +msgstr "" + +#: src/MainSDL_Event.cpp:45 +#, c-format +msgid "%-5d SDL_MOUSEBUTTONUP \n" +msgstr "" + +#: src/MainSDL_Event.cpp:46 +#, c-format +msgid "%-5d SDL_JOYBUTTONDOWN \n" +msgstr "" + +#: src/MainSDL_Event.cpp:47 +#, c-format +msgid "%-5d SDL_JOYBUTTONUP \n" +msgstr "" + +#: src/MainSDL_Event.cpp:212 +#, c-format +msgid "MainSDL::getEvent HUH?\n" +msgstr "" + +#: src/MainSDL_Event.cpp:222 +#, c-format +msgid "" +"buffer = \"%s\n" +"\"" +msgstr "" + +#: src/MainSDL_Event.cpp:243 +#, c-format +msgid "mouse active" +msgstr "" + +#: src/MainSDL_Event.cpp:251 +#, c-format +msgid "focus\n" +msgstr "" + +#: src/MainSDL_Event.cpp:403 +#, c-format +msgid "key '%s' pressed\n" +msgstr "" + +#: src/MainSDL_Event.cpp:404 +#, c-format +msgid "game->gameFrame = %d\n" +msgstr "" + +#: src/MainSDL_Event.cpp:538 +#, c-format +msgid "MainSDL::grabMouse(%d)\n" +msgstr "" + +#: src/MenuGL.cpp:43 +msgid " d o n o t a l l o w -a n y- e n e m i e s g e t p a s t y o u !" +msgstr "" + +#: src/MenuGL.cpp:44 +msgid " e v e r y e n e m y t h a t g e t s b y c o s t s y o u a l i f e !" +msgstr "" + +#: src/MenuGL.cpp:45 +msgid " a l l o w p o w e r - u p s t o p a s s b y f o r b i g p o i n t s !" +msgstr "" + +#: src/MenuGL.cpp:46 +msgid " c r a s h i n t o e n e m i e s t o d e s t r o y t h e m !" +msgstr "" + +#: src/MenuGL.cpp:47 +msgid " r i g h t c l i c k t w i c e t o s e l f - d e s t r u c t !" +msgstr "" + +#: src/MenuGL.cpp:48 +msgid " s e l f - d e s t r u c t t o p r e s e r v e y o u r a m m u n i t i o n !" +msgstr "" + +#: src/MenuGL.cpp:49 +msgid " d o w n l o a d C h r o m i u m B. S. U. a t http://chromium-bsu.sf.net/" +msgstr "" + +#: src/MenuGL.cpp:70 +msgid "n e w g a m e" +msgstr "" + +#: src/MenuGL.cpp:71 +msgid "l e v e l" +msgstr "" + +#: src/MenuGL.cpp:72 +msgid "s k i l l" +msgstr "" + +#: src/MenuGL.cpp:73 +msgid "g f x d e t a i l" +msgstr "" + +#: src/MenuGL.cpp:74 +msgid "f u l l s c r e e n" +msgstr "" + +#: src/MenuGL.cpp:75 +msgid "s c r e e n s i z e" +msgstr "" + +#: src/MenuGL.cpp:76 +msgid "s o u n d f x v o l u m e" +msgstr "" + +#: src/MenuGL.cpp:77 +msgid "m u s i c v o l u m e" +msgstr "" + +#: src/MenuGL.cpp:78 +msgid "m o v e m e n t s p e e d" +msgstr "" + +#: src/MenuGL.cpp:79 +msgid "q u i t" +msgstr "" + +#: src/MenuGL.cpp:143 src/MenuGL.cpp:417 +#, c-format +msgid "ATTENTION: Using 'thin' text to improve framerate...\n" +msgstr "" + +#: src/MenuGL.cpp:147 +#, c-format +msgid "MenuGL::createLists\n" +msgstr "" + +#: src/MenuGL.cpp:162 +msgid "fish in a barrel" +msgstr "" + +#: src/MenuGL.cpp:163 +msgid "wimp" +msgstr "" + +#: src/MenuGL.cpp:164 +msgid "easy" +msgstr "" + +#: src/MenuGL.cpp:165 +msgid "normal" +msgstr "" + +#: src/MenuGL.cpp:166 +msgid "experienced" +msgstr "" + +#: src/MenuGL.cpp:167 +msgid "fun" +msgstr "" + +#: src/MenuGL.cpp:168 +msgid "insane" +msgstr "" + +#: src/MenuGL.cpp:169 +msgid "impossible" +msgstr "" + +#: src/MenuGL.cpp:170 +msgid "-" +msgstr "" + +#: src/MenuGL.cpp:292 src/MenuGL.cpp:320 +msgid "high scores" +msgstr "" + +#: src/MenuGL.cpp:349 +msgid "the" +msgstr "" + +#: src/MenuGL.cpp:353 +msgid "reptile" +msgstr "" + +#: src/MenuGL.cpp:357 +msgid "labour" +msgstr "" + +#: src/MenuGL.cpp:361 +msgid "project" +msgstr "" + +#: src/MenuGL.cpp:422 +#, c-format +msgid "ATTENTION: Reverting to 'thick' text...\n" +msgstr "" + +#: src/MenuGL.cpp:473 +#, c-format +msgid "low" +msgstr "" + +#: src/MenuGL.cpp:474 +#, c-format +msgid "med" +msgstr "" + +#: src/MenuGL.cpp:475 +#, c-format +msgid "high" +msgstr "" + +#: src/MenuGL.cpp:480 +#, c-format +msgid "%dx%d" +msgstr "" + +#: src/MenuGL.cpp:484 +#, c-format +msgid "true" +msgstr "" + +#: src/MenuGL.cpp:485 +#, c-format +msgid "false" +msgstr "" + +#: src/MenuGL.cpp:791 src/MenuGL.cpp:864 src/MenuGL.cpp:935 +#, c-format +msgid "---- error setting full screen mode ----" +msgstr "" + +#: src/MenuGL.cpp:793 +#, c-format +msgid "---- error setting window mode ----" +msgstr "" + +#: src/MenuGL.cpp:834 +#, c-format +msgid "---- you must complete level %d before you can select level %d ----" +msgstr "" + +#: src/MenuGL.cpp:850 src/MenuGL.cpp:921 +#, c-format +msgid "---- error setting screen size ----" +msgstr "" + +#: src/PowerUps.cpp:180 +#, c-format +msgid "active power ups = %d\n" +msgstr "" + +#: src/PowerUps.cpp:368 +#, c-format +msgid "?? PowerUp::seal()" +msgstr "" + +#: src/ScreenItemAdd.cpp:107 +#, c-format +msgid "ScreenItemAdd::putScreenItems() Hero??? HUH???\n" +msgstr "" + +#: src/StatusDisplay.cpp:653 src/StatusDisplay.cpp:657 +msgid "p a u s e d" +msgstr "" + +#: src/StatusDisplay.cpp:677 +msgid "do not let -any- ships past you! each one costs you a life!" +msgstr "" + +#: src/StatusDisplay.cpp:688 +msgid "let super shields pass by for an extra life!" +msgstr "" + +#: src/TextFTGL.cpp:35 +#, c-format +msgid "FTGL: error loading font: %s\n" +msgstr "" + +#: src/TextFTGL.cpp:38 +msgid "FTGL: error loading font" +msgstr "" + +#. TRANSLATORS: If using the FTGL backend, this should be the font +#. name of a font that contains all the Unicode characters in use in +#. your translation. +#. +#. TRANSLATORS: If using the GLC backend, this should be the font +#. name of a font that contains all the Unicode characters in use in +#. your translation. The GLC renderer will fall back on other fonts +#. if some characters are not available though, so choose a font +#. that your language looks good in. +#. +#: src/TextFTGL.cpp:105 src/TextGLC.cpp:41 +msgid "Gothic Uralic" +msgstr "" + +#. TRANSLATORS: If using the FTGL backend, this should be the path of a bold +#. font that contains all the Unicode characters in use in your translation. +#. If the font is available in Debian it should be the Debian path. +#. +#: src/TextFTGL.cpp:135 +msgid "/usr/share/fonts/truetype/uralic/gothub__.ttf" +msgstr "" + +#. TRANSLATORS: If using the FTGL backend, this should be the path of a +#. font that contains all the Unicode characters in use in your translation. +#. If the font is available in Debian it should be the Debian path. +#. +#: src/TextFTGL.cpp:141 +msgid "/usr/share/fonts/truetype/uralic/gothu___.ttf" +msgstr "" + +#. TRANSLATORS: If using the FTGL backend, this should be the path of a bold +#. font that contains all the Unicode characters in use in your translation. +#. If the font is available in Mandrake it should be the Mandrake path. +#. +#: src/TextFTGL.cpp:148 +msgid "/usr/share/fonts/TTF/uralic/GOTHUB__.TTF" +msgstr "" + +#. TRANSLATORS: If using the FTGL backend, this should be the path of a +#. font that contains all the Unicode characters in use in your translation. +#. If the font is available in Mandrake it should be the Mandrake path. +#. +#: src/TextFTGL.cpp:154 +msgid "/usr/share/fonts/TTF/uralic/GOTHU___.TTF" +msgstr "" + +#: src/TextGLC.cpp:30 +msgid "GLC: couldn't set context" +msgstr "" Binary files /tmp/7K9nOp7Wb5/chromium-bsu-0.9.15/po/zh_CN.gmo and /tmp/9BF9Wy2VjB/chromium-bsu-0.9.15.1/po/zh_CN.gmo differ diff -Nru chromium-bsu-0.9.15/po/zh_CN.po chromium-bsu-0.9.15.1/po/zh_CN.po --- chromium-bsu-0.9.15/po/zh_CN.po 1970-01-01 00:00:00.000000000 +0000 +++ chromium-bsu-0.9.15.1/po/zh_CN.po 2013-05-25 05:43:49.000000000 +0000 @@ -0,0 +1,1043 @@ +# Traditional Chinese translation of the Chromium BSU package. +# This file is put in the public domain. +# +# Translators: +# Emmanuel Trillaud , 2010. +# Wei-Lun Chao , 2010. +# Long Si-Tai-Zi ,2011 +# +msgid "" +msgstr "" +"Project-Id-Version: Chromium B.S.U.\n" +"Report-Msgid-Bugs-To: http://sf.net/projects/chromium-bsu/bugs\n" +"POT-Creation-Date: 2013-05-25 13:43+0800\n" +"PO-Revision-Date: 2011-10-31 04:04+0000\n" +"Last-Translator: \n" +"Language-Team: Chinese (Simplified) \n" +"Language: zh_CN\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: src/Audio.cpp:110 +msgid "audio" +msgstr "音频" + +#: src/Audio.cpp:111 +msgid "data" +msgstr "资料" + +#: src/Audio.cpp:113 +#, c-format +msgid "UNKNOWN(type=%d)" +msgstr "不明(型态=%d)" + +#: src/Audio.cpp:124 +#, c-format +msgid "%d CDROM drive(s).\n" +msgstr "%d 光驱。\n" + +#: src/Audio.cpp:135 +#, c-format +msgid "Tracks: %d\n" +msgstr "轨段：%d\n" + +#: src/Audio.cpp:139 +#, c-format +msgid "track %2d: %s\n" +msgstr "轨段 %2d：%s\n" + +#: src/Audio.cpp:148 +#, c-format +msgid "" +"\n" +" Data track(s) only. CD audio not available.\n" +"\n" +msgstr "" +"\n" +"只有资料轨段。CD 音频无法使用。\n" +"\n" + +#: src/Audio.cpp:154 +#, c-format +msgid "" +"\n" +" use_cdrom enabled. Set to '0' in the configuration file to disable.\n" +msgstr "" +"\n" +"use_cdrom 已启用。在组态文件中设置为「0」以停用。\n" + +#: src/Audio.cpp:155 +#, c-format +msgid "" +" Press the 'N' key to skip to next CD track during a game.\n" +"\n" +msgstr "" +" 在游戏期间按下「N」键以跳到下一个 CD 轨段。\n" +"\n" + +#: src/Audio.cpp:166 +#, c-format +msgid "ERROR! Could not access CDROM device %d : %s\n" +msgstr "错误！无法存取 CDROM 裝置 %d：%s\n" + +#: src/Audio.cpp:209 +#, c-format +msgid "CDROM error in AudioOpenAL::pauseGameMusic(%d)\n" +msgstr "CDROM 发生错误于 AudioOpenAL::pauseGameMusic(%d)\n" + +#: src/Audio.cpp:210 +#, c-format +msgid "CDROM status = %d\n" +msgstr "CDROM 狀态 = %d\n" + +#: src/Audio.cpp:275 +#, c-format +msgid "Could not set CD volume, amixer returned status %d\n" +msgstr "" + +#: src/Audio.cpp:302 +#, c-format +msgid "Audio::setMusicIndex(%d)\n" +msgstr "音频::setMusicIndex(%d)\n" + +#: src/Audio.cpp:319 +#, c-format +msgid "track %d is data - trying next track...\n" +msgstr "轨段 %d 是资料 - 尝试下一轨段…\n" + +#: src/AudioOpenAL.cpp:149 +#, c-format +msgid "alAttenuationScale == 0. Kludge it.\n" +msgstr "alAttenuationScale == 0. Kludge it。\n" + +#: src/AudioOpenAL.cpp:162 +#, c-format +msgid "AudioOpenAL::Audio done\n" +msgstr "AudioOpenAL::音频已完成\n" + +#: src/AudioOpenAL.cpp:170 +#, c-format +msgid "stopping OpenAL..." +msgstr "停止 OpenAL…" + +#: src/AudioOpenAL.cpp:182 +msgid "AudioOpenAL::~Audio()" +msgstr "AudioOpenAL::~Audio()" + +#: src/AudioOpenAL.cpp:203 +#, c-format +msgid "done.\n" +msgstr "已完成。\n" + +#: src/AudioOpenAL.cpp:249 +#, c-format +msgid "" +"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" +"!! ATTENTION !! - one or more errors were encountered during audio check.\n" +"!! Audio will be disabled.\n" +"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" +msgstr "" +"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" +"!! 注意 !! - 在音频检查期间遇到一个或更多错误。\n" +"!! 音频將被停用。\n" +"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" + +#: src/AudioOpenAL.cpp:269 +#, c-format +msgid "AudioOpenAL::initSound() begin...\n" +msgstr "AudioOpenAL::initSound() 开始…\n" + +#: src/AudioOpenAL.cpp:273 +#, c-format +msgid "" +"-OpenAL-----------------------------------------------------\n" +"Vendor : %s\n" +"Renderer : %s\n" +"Version : %s\n" +msgstr "" +"-OpenAL-----------------------------------------------------\n" +"供应商 ：%s\n" +"渲染 ：%s\n" +"版本 ：%s\n" + +#: src/AudioOpenAL.cpp:279 src/MainSDL.cpp:130 +#, c-format +msgid "------------------------------------------------------------\n" +msgstr "------------------------------------------------------------\n" + +#: src/AudioOpenAL.cpp:311 +#, c-format +msgid "Audio.cpp - init %s" +msgstr "Audio.cpp - 初始 %s" + +#: src/AudioOpenAL.cpp:324 +#, c-format +msgid "Audio.cpp - init explosion %d" +msgstr "Audio.cpp - 初始爆炸 %d" + +#: src/AudioOpenAL.cpp:337 +#, c-format +msgid "Audio.cpp - init exploPop %d" +msgstr "Audio.cpp - init exploPop %d" + +#: src/AudioOpenAL.cpp:350 +msgid "Audio.cpp - initSound complete." +msgstr "Audio.cpp - initSound 完成。" + +#: src/AudioOpenAL.cpp:430 +#, c-format +msgid "AudioOpenAL::setMusicMode(SoundType mode)\n" +msgstr "AudioOpenAL::setMusicMode(SoundType 模式)\n" + +#: src/AudioOpenAL.cpp:465 +#, c-format +msgid "AudioOpenAL::setSoundVolume(%f)\n" +msgstr "AudioOpenAL::setSoundVolume(%f)\n" + +#: src/AudioOpenAL.cpp:508 +#, c-format +msgid "Music volume = %f\n" +msgstr "音乐音量 = %f\n" + +#: src/AudioOpenAL.cpp:524 +#, c-format +msgid "" +"\n" +"ERROR! - sound enumerant index %d does not have valid filename!\n" +msgstr "" +"\n" +"错误！- 声音无序索引 %d 沒有有效文件名！\n" + +#: src/AudioOpenAL.cpp:547 +#, c-format +msgid "alutLoadWAVFile(\"%s\",...);\n" +msgstr "alutLoadWAVFile(\"%s\",...);\n" + +#: src/AudioOpenAL.cpp:563 +#, c-format +msgid "ERROR!! <%s> alGetError() = %s\n" +msgstr "错误 !!<%s> alGetError() = %s\n" + +#: src/AudioOpenAL.cpp:568 +#, c-format +msgid "ERROR!! <%s> alcGetError() = %s\n" +msgstr "错误 !!<%s> alcGetError() = %s\n" + +#: src/AudioOpenAL.cpp:573 +#, c-format +msgid "ERROR!! <%s> alutGetError() = %s\n" +msgstr "错误 !!<%s> alutGetError() = %s\n" + +#: src/AudioOpenAL.cpp:730 +#, c-format +msgid "ERROR: filename too long: \"%s\", line %d\n" +msgstr "错误：文件名太长：\"%s\", 列 %d\n" + +#: src/AudioOpenAL.cpp:748 +#, c-format +msgid "WARNING: MP3 support not available: \"%s\", line %d\n" +msgstr "警告：MP3 支持无法使用：\"%s\", 列 %d\n" + +#: src/AudioOpenAL.cpp:759 +#, c-format +msgid "WARNING: Ogg/Vorbis support not available: \"%s\", line %d\n" +msgstr "警告：Ogg/Vorbis 支持无法使用：\"%s\", 列 %d\n" + +#: src/AudioOpenAL.cpp:763 +#, c-format +msgid "WARNING: file type not recognized: \"%s\": \"%s\", line %d\n" +msgstr "警告：文件类型无法识别：\"%s\":\"%s\", 列 %d\n" + +#: src/AudioOpenAL.cpp:778 +#, c-format +msgid "music playlist:\n" +msgstr "音乐播放清单：\n" + +#: src/AudioOpenAL.cpp:781 +#, c-format +msgid " %2d : %s\n" +msgstr " %2d：%s\n" + +#: src/AudioOpenAL.cpp:783 +#, c-format +msgid "loaded %s\n" +msgstr "已载入 %s\n" + +#: src/AudioOpenAL.cpp:808 +msgid "AudioOpenAL::setMusicIndex -- begin" +msgstr "AudioOpenAL::setMusicIndex -- 开始" + +#: src/AudioOpenAL.cpp:821 +msgid "AudioOpenAL::setMusicIndex -- before setting source buffer to 0" +msgstr "AudioOpenAL::setMusicIndex -- 设置来源缓冲区为 0 之前" + +#: src/AudioOpenAL.cpp:824 +msgid "AudioOpenAL::setMusicIndex -- after setting source buffer to 0" +msgstr "AudioOpenAL::setMusicIndex -- 设置来源缓冲区为 0 之后" + +#: src/AudioOpenAL.cpp:859 +msgid "AudioOpenAL::setMusicIndex -- end" +msgstr "AudioOpenAL::setMusicIndex -- 结束" + +#: src/AudioOpenAL.cpp:909 src/AudioOpenAL.cpp:942 src/AudioOpenAL.cpp:992 +#, c-format +msgid "WARNING: PlayList support not compiled in (AudioOpenAL.cpp): %s\n" +msgstr "警告：播放清单支持无法在 (AudioOpenAL.cpp) 中编译：%s\n" + +#: src/AudioOpenAL.cpp:959 +#, c-format +msgid "ERROR: Could not allocate memory in AudioOpenAL::loadMP3\n" +msgstr "错误：无法在 AudioOpenAL::loadMP3 中配置记忆体\n" + +#: src/AudioOpenAL.cpp:965 +#, c-format +msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadMP3\n" +msgstr "错误：无法在 AudioOpenAL::loadMP3 中开启「%s」\n" + +#: src/AudioOpenAL.cpp:971 +#, fuzzy, c-format +msgid "ERROR: Could not read from \"%s\" in AudioOpenAL::loadMP3\n" +msgstr "错误：无法在 AudioOpenAL::loadMP3 中开启「%s」\n" + +#: src/AudioOpenAL.cpp:979 +#, c-format +msgid "ERROR: alutLoadMP3() failed in AudioOpenAL::loadMP3\n" +msgstr "错误：alutLoadMP3() 在 AudioOpenAL::loadMP3 中失败\n" + +#: src/AudioOpenAL.cpp:1011 +#, c-format +msgid "ERROR: Could not allocate memory in AudioOpenAL::loadVorbis\n" +msgstr "错误：无法在 AudioOpenAL::loadVorbis 中配置记忆体\n" + +#: src/AudioOpenAL.cpp:1017 +#, c-format +msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadVorbis\n" +msgstr "错误：无法在 AudioOpenAL::loadVorbis 中开启「%s」\n" + +#: src/AudioOpenAL.cpp:1023 +#, fuzzy, c-format +msgid "ERROR: Could not read from \"%s\" in AudioOpenAL::loadVorbis\n" +msgstr "错误：无法在 AudioOpenAL::loadVorbis 中开启「%s」\n" + +#: src/AudioOpenAL.cpp:1031 +#, c-format +msgid "ERROR: alutLoadVorbis() failed in AudioOpenAL::loadVorbis\n" +msgstr "错误：alutLoadVorbis() 在 AudioOpenAL::loadVorbis 中失败\n" + +#: src/AudioSDLMixer.cpp:65 +#, c-format +msgid "ERROR initializing audio - AudioSDLMixer::initSound()\n" +msgstr "初始化音频 - AudioSDLMixer::initSound() 时发生错误\n" + +#: src/Config.cpp:114 +#, c-format +msgid "WARNING: Config::init() has already been called.\n" +msgstr "警告：Config::init() 已呼叫。\n" + +#: src/Config.cpp:243 +#, c-format +msgid "WARNING: could not read config file (%s)\n" +msgstr "警告：无法读取组态文件 (%s)\n" + +#: src/Config.cpp:302 +#, c-format +msgid "wrote config file (%s)\n" +msgstr "已写入组态文件 (%s)\n" + +#: src/Config.cpp:307 +#, c-format +msgid "WARNING: could not write config file (%s)\n" +msgstr "警告：无法写入组态文件 (%s)\n" + +#: src/EnemyAircraft.cpp:111 +#, c-format +msgid "%d EnemyAircraft allocated\n" +msgstr "%d EnemyAircraft 配置\n" + +#: src/EnemyAircraft_Straight.cpp:98 +#, c-format +msgid "EnemyAircraft_Straight %p ... pos[1] = %g, vel[1] = %g\n" +msgstr "EnemyAircraft_Straight %p…pos[1] = %g，vel[1] = %g\n" + +#: src/EnemyFleet.cpp:243 +#, c-format +msgid "num enemies on screen = %d\n" +msgstr "屏幕上敌人数量 = %d\n" + +#: src/Global.cpp:114 +#, c-format +msgid "WARNING: Global::init() has already been called.\n" +msgstr "警告：Global::init() 已呼叫。\n" + +#: src/Global.cpp:211 +#, c-format +msgid "Starting up..." +msgstr "开始启动…" + +#: src/Global.cpp:242 +#, c-format +msgid "...startup complete.\n" +msgstr "...启动完成。\n" + +#: src/Global.cpp:249 +#, c-format +msgid "Shutting down...\n" +msgstr "关闭…\n" + +#: src/Global.cpp:262 +#, c-format +msgid "...shutdown complete.\n" +msgstr "...关闭完成。\n" + +#: src/Global.cpp:269 +#, c-format +msgid "deleteTextures()\n" +msgstr "deleteTextures()\n" + +#: src/Global.cpp:289 +#, c-format +msgid "Global::loadTextures()\n" +msgstr "Global::loadTextures()\n" + +#: src/Global.cpp:352 +#, c-format +msgid "Generating random sequences\n" +msgstr "产生随机序列\n" + +#: src/HeroAmmo.cpp:167 +#, c-format +msgid "HeroAmmo::addAmmo(%d, <%f %f %f> )\n" +msgstr "HeroAmmo::addAmmo(%d，<%f %f %f> )\n" + +#: src/HeroAmmo.cpp:190 +#, c-format +msgid "%p <--%p--> %p\n" +msgstr "%p <--%p--> %p\n" + +#: src/HiScore.cpp:58 +#, c-format +msgid "nobody" +msgstr "沒有任何人" + +#: src/HiScore.cpp:83 +#, c-format +msgid "WARNING: HiScore::init() has already been called.\n" +msgstr "警告：HiScore::init() 已呼叫。\n" + +#: src/HiScore.cpp:241 +#, c-format +msgid "WARNING: could not write score file (%s)\n" +msgstr "警告：无法写入分数文件 (%s)\n" + +#: src/HiScore.cpp:276 +#, fuzzy, c-format +msgid "WARNING: error reading score file (%s)\n" +msgstr "警告：无法读取分数文件 (%s)\n" + +#: src/HiScore.cpp:319 src/HiScore.cpp:321 src/HiScore.cpp:323 +#: src/HiScore.cpp:343 src/HiScore.cpp:345 src/HiScore.cpp:347 +#, fuzzy, c-format +msgid "WARNING: error reading old score file (%s)\n" +msgstr "警告：无法读取分数文件 (%s)\n" + +#: src/HiScore.cpp:332 +#, c-format +msgid "WARNING: empty score file (%s)\n" +msgstr "警告：空的分数文件 (%s)\n" + +#: src/HiScore.cpp:357 +#, c-format +msgid "WARNING: could not read score file (%s)\n" +msgstr "警告：无法读取分数文件 (%s)\n" + +#: src/HiScore.cpp:449 +#, c-format +msgid "high scores:\n" +msgstr "高分：\n" + +#: src/HiScore.cpp:455 +#, c-format +msgid "%02d/%02d/%04d %16s %d\n" +msgstr "%02d/%02d/%04d %16s %d\n" + +#: src/main.cpp:119 +#, c-format +msgid "" +"\n" +"--------------------------------------------------\n" +"Chromium B.S.U. options\n" +"--------------------------------------------------\n" +" -f/--fullscreen : run in fullscreen mode\n" +" -w/--window : run in windowed mode\n" +" -v/--vidmode : mode 0 = 512 x 384\n" +" : 1 = 640 x 480\n" +" : 2 = 800 x 600\n" +" : 3 = 1024 x 768\n" +" : 4 = 1280 x 960\n" +" -na/--noaudio : do not initialize audio\n" +" -nb/--noblend : disable blending (OpenGL)\n" +" -nt/--notexborder : do not set tex border color (OpenGL)\n" +"--------------------------------------------------\n" +"\n" +msgstr "" +"\n" +"--------------------------------------------------\n" +"Chromium B.S.U.选項\n" +"--------------------------------------------------\n" +" -f/--fullscreen ：在全屏幕模式中运行\n" +" -w/--window ：在窗口模式中运行\n" +" -v/--vidmode ：模式 0 = 512 x 384\n" +" ： 1 = 640 x 480\n" +" ： 2 = 800 x 600\n" +" ： 3 = 1024 x 768\n" +" ： 4 = 1280 x 960\n" +" -na /--noaudio ：不初始化音频\n" +" -nb /--noblend ：停用混色 (OpenGL)\n" +" -nt /--notexborder ：不设置 tex 边框顏色 (OpenGL)\n" +"--------------------------------------------------\n" +"\n" + +#: src/main.cpp:231 +#, c-format +msgid "!! ERROR !! - " +msgstr "!! 错误 !! - " + +#: src/main.cpp:255 +#, c-format +msgid "Extensions :" +msgstr "延伸：" + +#: src/MainGL.cpp:86 +#, c-format +msgid "initGL()\n" +msgstr "initGL()\n" + +#: src/MainGL.cpp:148 +#, c-format +msgid "error loading font: %s\n" +msgstr "载入字型时发生错误：%s\n" + +#: src/MainGL.cpp:153 +#, c-format +msgid "error loading font\n" +msgstr "载入字型时发生错误\n" + +#: src/MainGL.cpp:183 +#, c-format +msgid "!!MainGL::drawGL() HUH?\n" +msgstr "!!MainGL::drawGL() 呃？\n" + +#: src/MainGL.cpp:311 +#, c-format +msgid "" +"new high score!\n" +"\n" +"%d" +msgstr "" +"新高分！\n" +"\n" +"%d" + +#: src/MainGL.cpp:316 +#, c-format +msgid "" +"n o t b a d !\n" +"rank : %d\n" +"\n" +"%d" +msgstr "" +"不 错 噢！\n" +"分级：%d\n" +"\n" +"%d" + +#: src/MainGL.cpp:321 +msgid "l o s e r" +msgstr "失 败 者" + +#: src/MainGL.cpp:379 +#, c-format +msgid "" +"congratulations!\n" +" \n" +"l e v e l\n" +" %d \n" +"c o m p l e t e\n" +" \n" +msgstr "" +"恭喜！\n" +"\n" +" 过\n" +"%d\n" +" 关\n" +"\n" + +#: src/MainGLUT.cpp:77 +#, c-format +msgid "MainGLUT::run()\n" +msgstr "MainGLUT::run()\n" + +#: src/MainGLUT.cpp:93 src/MainSDL.cpp:286 +#, c-format +msgid "ERROR!!! OpenGL error: %s\n" +msgstr "错误!!! OpenGL 错误：%s\n" + +#: src/MainGLUT.cpp:235 +#, c-format +msgid "key = %d\n" +msgstr "键 = %d\n" + +#: src/MainSDL.cpp:74 +#, c-format +msgid "Couldn't initialize SDL: %s\n" +msgstr "无法初始化 SDL：%s\n" + +#: src/MainSDL.cpp:77 +#, c-format +msgid "SDL initialized.\n" +msgstr "SDL 已初始化。\n" + +#: src/MainSDL.cpp:83 +#, c-format +msgid "num joysticks = %d\n" +msgstr "摇杆数量 = %d\n" + +#: src/MainSDL.cpp:85 +#, c-format +msgid " joystick 0 = %p\n" +msgstr " 摇杆 0=%p\n" + +#: src/MainSDL.cpp:91 +#, c-format +msgid "no joysticks found\n" +msgstr "找不到任何摇杆\n" + +#: src/MainSDL.cpp:116 src/MainSDL.cpp:347 +#, c-format +msgid "Couldn't set video mode: %s\n" +msgstr "无法设置视频模式：%s\n" + +#: src/MainSDL.cpp:124 +#, c-format +msgid "" +"-OpenGL-----------------------------------------------------\n" +"Vendor : %s\n" +"Renderer : %s\n" +"Version : %s\n" +msgstr "" +"-OpenGL-----------------------------------------------------\n" +"供应商 ：%s\n" +"渲染 ：%s\n" +"版本 ：%s\n" + +#: src/MainSDL.cpp:215 +#, c-format +msgid "init----> %3.2ffps gameSpeed = %g\n" +msgstr "init----> %3.2ffps 游戏速度 = %g\n" + +#: src/MainSDL.cpp:222 +#, c-format +msgid "init----> %3.2ffps targetAdj = %g, tmp = %g\n" +msgstr "init----> %3.2ffps targetAdj = %g，tmp = %g\n" + +#: src/MainSDL.cpp:235 +#, c-format +msgid "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" +msgstr "adjust--> %3.2f targetAdj = %g -- game-> speedAdj = %g\n" + +#: src/MainSDL.cpp:257 +#, c-format +msgid "" +"%d speed adjustments required.\n" +"NOTE: The game was not able to maintain a steady 50 frames per\n" +" second. You should consider reducing your screen resolution\n" +" or lowering the graphics detail setting.\n" +" -OR-\n" +" make sure that you aren't running any system monitoring\n" +" tools (like 'top', 'xosview', etc.) These kinds of tools\n" +" can make it difficult to maintain a steady frame rate.\n" +msgstr "" +"%d 需要调整速度\n" +"注意：游戏无法保持每秒稳定 50 讯框。\n" +" 您应该考虑减少您的屏幕解析度\n" +" 或降低图形细节设置。\n" +" -或者-\n" +" 确定您沒有正在执行任何系統监控\n" +" 工具 (像是 'top'，'xosview'，etc.) 这类工具\n" +" 有可能让它难以保持稳定的帧率。\n" + +#: src/MainSDL.cpp:269 +#, c-format +msgid "exit.\n" +msgstr "退出。\n" + +#: src/MainSDL.cpp:294 +#, c-format +msgid "ERROR!!! SDL error '%s'\n" +msgstr "错误!!! SDL 错误 '%s'\n" + +#: src/MainSDL.cpp:352 +#, c-format +msgid "video mode set " +msgstr "视频模式设置 " + +#: src/MainSDL.cpp:359 +#, c-format +msgid "(bpp=%d RGB=%d%d%d depth=%d)\n" +msgstr "(bpp=%d RGB=%d%d%d depth=%d)\n" + +#: src/MainSDL_Event.cpp:40 +#, c-format +msgid "%-5d SDL_ACTIVEEVENT \n" +msgstr "%-5d SDL_ACTIVEEVENT \n" + +#: src/MainSDL_Event.cpp:41 +#, c-format +msgid "%-5d SDL_KEYDOWN \n" +msgstr "%-5d SDL_KEYDOWN \n" + +#: src/MainSDL_Event.cpp:42 +#, c-format +msgid "%-5d SDL_KEYUP \n" +msgstr "%-5d SDL_KEYUP \n" + +#: src/MainSDL_Event.cpp:43 +#, c-format +msgid "%-5d SDL_MOUSEMOTION \n" +msgstr "%-5d SDL_MOUSEMOTION \n" + +#: src/MainSDL_Event.cpp:44 +#, c-format +msgid "%-5d SDL_MOUSEBUTTONDOWN \n" +msgstr "%-5d SDL_MOUSEBUTTONDOWN \n" + +#: src/MainSDL_Event.cpp:45 +#, c-format +msgid "%-5d SDL_MOUSEBUTTONUP \n" +msgstr "%-5d SDL_MOUSEBUTTONUP \n" + +#: src/MainSDL_Event.cpp:46 +#, c-format +msgid "%-5d SDL_JOYBUTTONDOWN \n" +msgstr "%-5d SDL_JOYBUTTONDOWN \n" + +#: src/MainSDL_Event.cpp:47 +#, c-format +msgid "%-5d SDL_JOYBUTTONUP \n" +msgstr "%-5d SDL_JOYBUTTONUP \n" + +#: src/MainSDL_Event.cpp:212 +#, c-format +msgid "MainSDL::getEvent HUH?\n" +msgstr "MainSDL::getEvent 呃？\n" + +#: src/MainSDL_Event.cpp:222 +#, c-format +msgid "" +"buffer = \"%s\n" +"\"" +msgstr "" +"缓冲区 =「%s\n" +"」" + +#: src/MainSDL_Event.cpp:243 +#, c-format +msgid "mouse active" +msgstr "鼠标启用" + +#: src/MainSDL_Event.cpp:251 +#, c-format +msgid "focus\n" +msgstr "焦点\n" + +#: src/MainSDL_Event.cpp:403 +#, c-format +msgid "key '%s' pressed\n" +msgstr "键「%s」已按\n" + +#: src/MainSDL_Event.cpp:404 +#, c-format +msgid "game->gameFrame = %d\n" +msgstr "game->gameFrame = %d\n" + +#: src/MainSDL_Event.cpp:538 +#, c-format +msgid "MainSDL::grabMouse(%d)\n" +msgstr "MainSDL::grabMouse(%d)\n" + +#: src/MenuGL.cpp:43 +msgid " d o n o t a l l o w -a n y- e n e m i e s g e t p a s t y o u !" +msgstr " 不 要 让 -任 何- 敌 人 从 您 身 旁 经 过！" + +#: src/MenuGL.cpp:44 +msgid " e v e r y e n e m y t h a t g e t s b y c o s t s y o u a l i f e !" +msgstr " 每 一 个 经 过 您 的 敌 人 都 会 减 少 您 的 生 命！" + +#: src/MenuGL.cpp:45 +msgid " a l l o w p o w e r - u p s t o p a s s b y f o r b i g p o i n t s !" +msgstr " 允 许 能 源 器 经 过 以 得 到 高 额 点 数！" + +#: src/MenuGL.cpp:46 +msgid " c r a s h i n t o e n e m i e s t o d e s t r o y t h e m !" +msgstr " 在 敌 人 之 中 爆 炸 以 毁 灭 它 们！" + +#: src/MenuGL.cpp:47 +msgid " r i g h t c l i c k t w i c e t o s e l f - d e s t r u c t !" +msgstr " 连 按 鼠 标 右 键 两 次 启 动 自 我 毁 灭！" + +#: src/MenuGL.cpp:48 +msgid " s e l f - d e s t r u c t t o p r e s e r v e y o u r a m m u n i t i o n !" +msgstr " 自 我 毁 灭 以 保 护 您 的 弹 药 库！" + +#: src/MenuGL.cpp:49 +msgid " d o w n l o a d C h r o m i u m B. S. U. a t http://chromium-bsu.sf.net/" +msgstr " 从 http://chromium-bsu.sf.net/ 下 载 C h r o m i u m B. S. U." + +#: src/MenuGL.cpp:70 +msgid "n e w g a m e" +msgstr "新 游 戏" + +#: src/MenuGL.cpp:71 +msgid "l e v e l" +msgstr "等 级" + +#: src/MenuGL.cpp:72 +msgid "s k i l l" +msgstr "技 巧" + +#: src/MenuGL.cpp:73 +msgid "g f x d e t a i l" +msgstr "显 示 细 节" + +#: src/MenuGL.cpp:74 +msgid "f u l l s c r e e n" +msgstr "全 屏 幕" + +#: src/MenuGL.cpp:75 +msgid "s c r e e n s i z e" +msgstr "画 面 尺 寸" + +#: src/MenuGL.cpp:76 +msgid "s o u n d f x v o l u m e" +msgstr "音 效 音 量" + +#: src/MenuGL.cpp:77 +msgid "m u s i c v o l u m e" +msgstr "音 乐 音 量" + +#: src/MenuGL.cpp:78 +msgid "m o v e m e n t s p e e d" +msgstr "鼠 标 速 度" + +#: src/MenuGL.cpp:79 +msgid "q u i t" +msgstr "退 出" + +#: src/MenuGL.cpp:143 src/MenuGL.cpp:417 +#, c-format +msgid "ATTENTION: Using 'thin' text to improve framerate...\n" +msgstr "注意：使用「细体」文字以改善帧率…\n" + +#: src/MenuGL.cpp:147 +#, c-format +msgid "MenuGL::createLists\n" +msgstr "MenuGL::createLists\n" + +#: src/MenuGL.cpp:162 +msgid "fish in a barrel" +msgstr "瓮中捉鳖" + +#: src/MenuGL.cpp:163 +msgid "wimp" +msgstr "傻瓜" + +#: src/MenuGL.cpp:164 +msgid "easy" +msgstr "容易" + +#: src/MenuGL.cpp:165 +msgid "normal" +msgstr "一般" + +#: src/MenuGL.cpp:166 +msgid "experienced" +msgstr "熟练" + +#: src/MenuGL.cpp:167 +msgid "fun" +msgstr "娱乐" + +#: src/MenuGL.cpp:168 +msgid "insane" +msgstr "狂暴" + +#: src/MenuGL.cpp:169 +msgid "impossible" +msgstr "不可能" + +#: src/MenuGL.cpp:170 +msgid "-" +msgstr "-" + +#: src/MenuGL.cpp:292 src/MenuGL.cpp:320 +msgid "high scores" +msgstr "高分" + +#: src/MenuGL.cpp:349 +msgid "the" +msgstr " " + +#: src/MenuGL.cpp:353 +msgid "reptile" +msgstr "爬蟲" + +#: src/MenuGL.cpp:357 +msgid "labour" +msgstr "劳力" + +#: src/MenuGL.cpp:361 +msgid "project" +msgstr "项目" + +#: src/MenuGL.cpp:422 +#, c-format +msgid "ATTENTION: Reverting to 'thick' text...\n" +msgstr "注意：还原成「粗体」文字…\n" + +#: src/MenuGL.cpp:473 +#, c-format +msgid "low" +msgstr "低" + +#: src/MenuGL.cpp:474 +#, c-format +msgid "med" +msgstr "中" + +#: src/MenuGL.cpp:475 +#, c-format +msgid "high" +msgstr "高" + +#: src/MenuGL.cpp:480 +#, c-format +msgid "%dx%d" +msgstr "" + +#: src/MenuGL.cpp:484 +#, c-format +msgid "true" +msgstr "真" + +#: src/MenuGL.cpp:485 +#, c-format +msgid "false" +msgstr "假" + +#: src/MenuGL.cpp:791 src/MenuGL.cpp:864 src/MenuGL.cpp:935 +#, c-format +msgid "---- error setting full screen mode ----" +msgstr "---- 设置全屏幕模式时发生错误 ----" + +#: src/MenuGL.cpp:793 +#, c-format +msgid "---- error setting window mode ----" +msgstr "---- 设置窗口模式时发生错误 ----" + +#: src/MenuGL.cpp:834 +#, c-format +msgid "---- you must complete level %d before you can select level %d ----" +msgstr "---- 在您可以选取等级 %2$d 之前，您必須完成等级 %1$d ----" + +#: src/MenuGL.cpp:850 src/MenuGL.cpp:921 +#, c-format +msgid "---- error setting screen size ----" +msgstr "---- 设置屏幕大小时发生错误 ----" + +#: src/PowerUps.cpp:180 +#, c-format +msgid "active power ups = %d\n" +msgstr "作用中的动力提升 = %d\n" + +#: src/PowerUps.cpp:368 +#, c-format +msgid "?? PowerUp::seal()" +msgstr "?? PowerUp::seal()" + +#: src/ScreenItemAdd.cpp:107 +#, c-format +msgid "ScreenItemAdd::putScreenItems() Hero??? HUH???\n" +msgstr "ScreenItemAdd::putScreenItems() 英雄??? 呃???\n" + +#: src/StatusDisplay.cpp:653 src/StatusDisplay.cpp:657 +msgid "p a u s e d" +msgstr "暂 停" + +#: src/StatusDisplay.cpp:677 +msgid "do not let -any- ships past you! each one costs you a life!" +msgstr "不要让 *任何* 的船只从您旁边越过！每一个都会损耗您的生命！" + +#: src/StatusDisplay.cpp:688 +msgid "let super shields pass by for an extra life!" +msgstr "让超级防护罩从旁越过以得到额外的生命！" + +#: src/TextFTGL.cpp:35 +#, c-format +msgid "FTGL: error loading font: %s\n" +msgstr "FTGL：载入字型时发生错误：%s\n" + +#: src/TextFTGL.cpp:38 +msgid "FTGL: error loading font" +msgstr "FTGL：载入字型时发生错误" + +#. TRANSLATORS: If using the FTGL backend, this should be the font +#. name of a font that contains all the Unicode characters in use in +#. your translation. +#. +#. TRANSLATORS: If using the GLC backend, this should be the font +#. name of a font that contains all the Unicode characters in use in +#. your translation. The GLC renderer will fall back on other fonts +#. if some characters are not available though, so choose a font +#. that your language looks good in. +#. +#: src/TextFTGL.cpp:105 src/TextGLC.cpp:41 +msgid "Gothic Uralic" +msgstr "Gothic Uralic" + +#. TRANSLATORS: If using the FTGL backend, this should be the path of a bold +#. font that contains all the Unicode characters in use in your translation. +#. If the font is available in Debian it should be the Debian path. +#. +#: src/TextFTGL.cpp:135 +msgid "/usr/share/fonts/truetype/uralic/gothub__.ttf" +msgstr "/usr/share/fonts/truetype/uralic/gothub__.ttf" + +#. TRANSLATORS: If using the FTGL backend, this should be the path of a +#. font that contains all the Unicode characters in use in your translation. +#. If the font is available in Debian it should be the Debian path. +#. +#: src/TextFTGL.cpp:141 +msgid "/usr/share/fonts/truetype/uralic/gothu___.ttf" +msgstr "/usr/share/fonts/truetype/uralic/gothu___.ttf" + +#. TRANSLATORS: If using the FTGL backend, this should be the path of a bold +#. font that contains all the Unicode characters in use in your translation. +#. If the font is available in Mandrake it should be the Mandrake path. +#. +#: src/TextFTGL.cpp:148 +msgid "/usr/share/fonts/TTF/uralic/GOTHUB__.TTF" +msgstr "/usr/share/fonts/TTF/uralic/GOTHUB__.TTF" + +#. TRANSLATORS: If using the FTGL backend, this should be the path of a +#. font that contains all the Unicode characters in use in your translation. +#. If the font is available in Mandrake it should be the Mandrake path. +#. +#: src/TextFTGL.cpp:154 +msgid "/usr/share/fonts/TTF/uralic/GOTHU___.TTF" +msgstr "/usr/share/fonts/TTF/uralic/GOTHU___.TTF" + +#: src/TextGLC.cpp:30 +msgid "GLC: couldn't set context" +msgstr "GLC：无法设置狀态组合" Binary files /tmp/7K9nOp7Wb5/chromium-bsu-0.9.15/po/zh_TW.gmo and /tmp/9BF9Wy2VjB/chromium-bsu-0.9.15.1/po/zh_TW.gmo differ diff -Nru chromium-bsu-0.9.15/po/zh_TW.po chromium-bsu-0.9.15.1/po/zh_TW.po --- chromium-bsu-0.9.15/po/zh_TW.po 2011-02-14 03:55:27.000000000 +0000 +++ chromium-bsu-0.9.15.1/po/zh_TW.po 2013-05-25 05:43:49.000000000 +0000 @@ -1,15 +1,15 @@ # Traditional Chinese translation of the Chromium BSU package. # This file is put in the public domain. -# This file is distributed under the same license as the chromium-bsu package. +# +# Translators: # Emmanuel Trillaud , 2010. # Wei-Lun Chao , 2010. -# msgid "" msgstr "" -"Project-Id-Version: chromium-bsu \n" +"Project-Id-Version: Chromium B.S.U.\n" "Report-Msgid-Bugs-To: http://sf.net/projects/chromium-bsu/bugs\n" -"POT-Creation-Date: 2011-02-10 19:48+0800\n" -"PO-Revision-Date: 2010-11-06 23:37+0800\n" +"POT-Creation-Date: 2013-05-25 13:43+0800\n" +"PO-Revision-Date: 2011-03-22 15:18+0000\n" "Last-Translator: Wei-Lun Chao \n" "Language-Team: Chinese (traditional) \n" "Language: zh_TW\n" @@ -90,12 +90,17 @@ msgid "CDROM status = %d\n" msgstr "CDROM 狀態 = %d\n" -#: src/Audio.cpp:298 +#: src/Audio.cpp:275 +#, c-format +msgid "Could not set CD volume, amixer returned status %d\n" +msgstr "" + +#: src/Audio.cpp:302 #, c-format msgid "Audio::setMusicIndex(%d)\n" msgstr "音訊::setMusicIndex(%d)\n" -#: src/Audio.cpp:315 +#: src/Audio.cpp:319 #, c-format msgid "track %d is data - trying next track...\n" msgstr "軌段 %d 是資料 - 嘗試下一軌段…\n" @@ -223,22 +228,22 @@ msgid "ERROR!! <%s> alutGetError() = %s\n" msgstr "錯誤 !!<%s> alutGetError() = %s\n" -#: src/AudioOpenAL.cpp:732 +#: src/AudioOpenAL.cpp:730 #, c-format msgid "ERROR: filename too long: \"%s\", line %d\n" msgstr "錯誤：檔名太長：\"%s\", 列 %d\n" -#: src/AudioOpenAL.cpp:750 +#: src/AudioOpenAL.cpp:748 #, c-format msgid "WARNING: MP3 support not available: \"%s\", line %d\n" msgstr "警告：MP3 支援無法使用：\"%s\", 列 %d\n" -#: src/AudioOpenAL.cpp:761 +#: src/AudioOpenAL.cpp:759 #, c-format msgid "WARNING: Ogg/Vorbis support not available: \"%s\", line %d\n" msgstr "警告：Ogg/Vorbis 支援無法使用：\"%s\", 列 %d\n" -#: src/AudioOpenAL.cpp:765 +#: src/AudioOpenAL.cpp:763 #, c-format msgid "WARNING: file type not recognized: \"%s\": \"%s\", line %d\n" msgstr "警告：檔案類型無法辨識：\"%s\":\"%s\", 列 %d\n" @@ -274,7 +279,7 @@ msgid "AudioOpenAL::setMusicIndex -- end" msgstr "AudioOpenAL::setMusicIndex -- 結束" -#: src/AudioOpenAL.cpp:909 src/AudioOpenAL.cpp:942 src/AudioOpenAL.cpp:986 +#: src/AudioOpenAL.cpp:909 src/AudioOpenAL.cpp:942 src/AudioOpenAL.cpp:992 #, c-format msgid "WARNING: PlayList support not compiled in (AudioOpenAL.cpp): %s\n" msgstr "警告：播放清單支援無法在 (AudioOpenAL.cpp) 中編譯：%s\n" @@ -289,22 +294,32 @@ msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadMP3\n" msgstr "錯誤：無法在 AudioOpenAL::loadMP3 中開啟「%s」\n" -#: src/AudioOpenAL.cpp:973 +#: src/AudioOpenAL.cpp:971 +#, fuzzy, c-format +msgid "ERROR: Could not read from \"%s\" in AudioOpenAL::loadMP3\n" +msgstr "錯誤：無法在 AudioOpenAL::loadMP3 中開啟「%s」\n" + +#: src/AudioOpenAL.cpp:979 #, c-format msgid "ERROR: alutLoadMP3() failed in AudioOpenAL::loadMP3\n" msgstr "錯誤：alutLoadMP3() 在 AudioOpenAL::loadMP3 中失敗\n" -#: src/AudioOpenAL.cpp:1005 +#: src/AudioOpenAL.cpp:1011 #, c-format msgid "ERROR: Could not allocate memory in AudioOpenAL::loadVorbis\n" msgstr "錯誤：無法在 AudioOpenAL::loadVorbis 中配置記憶體\n" -#: src/AudioOpenAL.cpp:1011 +#: src/AudioOpenAL.cpp:1017 #, c-format msgid "ERROR: Could not open \"%s\" in AudioOpenAL::loadVorbis\n" msgstr "錯誤：無法在 AudioOpenAL::loadVorbis 中開啟「%s」\n" -#: src/AudioOpenAL.cpp:1019 +#: src/AudioOpenAL.cpp:1023 +#, fuzzy, c-format +msgid "ERROR: Could not read from \"%s\" in AudioOpenAL::loadVorbis\n" +msgstr "錯誤：無法在 AudioOpenAL::loadVorbis 中開啟「%s」\n" + +#: src/AudioOpenAL.cpp:1031 #, c-format msgid "ERROR: alutLoadVorbis() failed in AudioOpenAL::loadVorbis\n" msgstr "錯誤：alutLoadVorbis() 在 AudioOpenAL::loadVorbis 中失敗\n" @@ -339,7 +354,7 @@ msgid "%d EnemyAircraft allocated\n" msgstr "%d EnemyAircraft 配置\n" -#: src/EnemyAircraft_Straight.cpp:103 +#: src/EnemyAircraft_Straight.cpp:98 #, c-format msgid "EnemyAircraft_Straight %p ... pos[1] = %g, vel[1] = %g\n" msgstr "EnemyAircraft_Straight %p…pos[1] = %g，vel[1] = %g\n" @@ -414,27 +429,38 @@ msgid "WARNING: could not write score file (%s)\n" msgstr "警告：無法寫入分數檔案 (%s)\n" -#: src/HiScore.cpp:328 +#: src/HiScore.cpp:276 +#, fuzzy, c-format +msgid "WARNING: error reading score file (%s)\n" +msgstr "警告：無法讀取分數檔案 (%s)\n" + +#: src/HiScore.cpp:319 src/HiScore.cpp:321 src/HiScore.cpp:323 +#: src/HiScore.cpp:343 src/HiScore.cpp:345 src/HiScore.cpp:347 +#, fuzzy, c-format +msgid "WARNING: error reading old score file (%s)\n" +msgstr "警告：無法讀取分數檔案 (%s)\n" + +#: src/HiScore.cpp:332 #, c-format msgid "WARNING: empty score file (%s)\n" msgstr "警告：空的分數檔案 (%s)\n" -#: src/HiScore.cpp:350 +#: src/HiScore.cpp:357 #, c-format msgid "WARNING: could not read score file (%s)\n" msgstr "警告：無法讀取分數檔案 (%s)\n" -#: src/HiScore.cpp:442 +#: src/HiScore.cpp:449 #, c-format msgid "high scores:\n" msgstr "高分：\n" -#: src/HiScore.cpp:448 +#: src/HiScore.cpp:455 #, c-format msgid "%02d/%02d/%04d %16s %d\n" msgstr "%02d/%02d/%04d %16s %d\n" -#: src/main.cpp:118 +#: src/main.cpp:119 #, c-format msgid "" "\n" @@ -471,12 +497,12 @@ "--------------------------------------------------\n" "\n" -#: src/main.cpp:230 +#: src/main.cpp:231 #, c-format msgid "!! ERROR !! - " msgstr "!! 錯誤 !! - " -#: src/main.cpp:254 +#: src/main.cpp:255 #, c-format msgid "Extensions :" msgstr "延伸：" @@ -551,7 +577,7 @@ msgid "MainGLUT::run()\n" msgstr "MainGLUT::run()\n" -#: src/MainGLUT.cpp:93 src/MainSDL.cpp:288 +#: src/MainGLUT.cpp:93 src/MainSDL.cpp:286 #, c-format msgid "ERROR!!! OpenGL error: %s\n" msgstr "錯誤!!! OpenGL 錯誤：%s\n" @@ -586,7 +612,7 @@ msgid "no joysticks found\n" msgstr "找不到任何搖桿\n" -#: src/MainSDL.cpp:116 src/MainSDL.cpp:349 +#: src/MainSDL.cpp:116 src/MainSDL.cpp:347 #, c-format msgid "Couldn't set video mode: %s\n" msgstr "無法設定視訊模式：%s\n" @@ -604,22 +630,22 @@ "潤算器 ：%s\n" "版本 ：%s\n" -#: src/MainSDL.cpp:217 +#: src/MainSDL.cpp:215 #, c-format msgid "init----> %3.2ffps gameSpeed = %g\n" msgstr "init----> %3.2ffps 遊戲速度 = %g\n" -#: src/MainSDL.cpp:224 +#: src/MainSDL.cpp:222 #, c-format msgid "init----> %3.2ffps targetAdj = %g, tmp = %g\n" msgstr "init----> %3.2ffps targetAdj = %g，tmp = %g\n" -#: src/MainSDL.cpp:237 +#: src/MainSDL.cpp:235 #, c-format msgid "adjust--> %3.2f targetAdj = %g -- game->speedAdj = %g\n" msgstr "adjust--> %3.2f targetAdj = %g -- game-> speedAdj = %g\n" -#: src/MainSDL.cpp:259 +#: src/MainSDL.cpp:257 #, c-format msgid "" "%d speed adjustments required.\n" @@ -640,22 +666,22 @@ " 工具 (像是 'top'，'xosview'，etc.) 這類工具\n" " 有可能讓它難以保持穩定訊框率。\n" -#: src/MainSDL.cpp:271 +#: src/MainSDL.cpp:269 #, c-format msgid "exit.\n" msgstr "離開。\n" -#: src/MainSDL.cpp:296 +#: src/MainSDL.cpp:294 #, c-format msgid "ERROR!!! SDL error '%s'\n" msgstr "錯誤!!! SDL 錯誤 '%s'\n" -#: src/MainSDL.cpp:354 +#: src/MainSDL.cpp:352 #, c-format msgid "video mode set " msgstr "視訊模式設定 " -#: src/MainSDL.cpp:361 +#: src/MainSDL.cpp:359 #, c-format msgid "(bpp=%d RGB=%d%d%d depth=%d)\n" msgstr "(bpp=%d RGB=%d%d%d depth=%d)\n" @@ -734,7 +760,7 @@ msgid "game->gameFrame = %d\n" msgstr "game->gameFrame = %d\n" -#: src/MainSDL_Event.cpp:534 +#: src/MainSDL_Event.cpp:538 #, c-format msgid "MainSDL::grabMouse(%d)\n" msgstr "MainSDL::grabMouse(%d)\n" @@ -808,7 +834,7 @@ msgid "q u i t" msgstr "離 開" -#: src/MenuGL.cpp:143 src/MenuGL.cpp:418 +#: src/MenuGL.cpp:143 src/MenuGL.cpp:417 #, c-format msgid "ATTENTION: Using 'thin' text to improve framerate...\n" msgstr "注意：使用「細體」文字以改善訊框速率…\n" @@ -854,77 +880,77 @@ msgid "-" msgstr "-" -#: src/MenuGL.cpp:292 src/MenuGL.cpp:321 +#: src/MenuGL.cpp:292 src/MenuGL.cpp:320 msgid "high scores" msgstr "高分" -#: src/MenuGL.cpp:350 +#: src/MenuGL.cpp:349 msgid "the" msgstr " " -#: src/MenuGL.cpp:354 +#: src/MenuGL.cpp:353 msgid "reptile" msgstr "爬蟲" -#: src/MenuGL.cpp:358 +#: src/MenuGL.cpp:357 msgid "labour" msgstr "勞力" -#: src/MenuGL.cpp:362 +#: src/MenuGL.cpp:361 msgid "project" msgstr "專案" -#: src/MenuGL.cpp:423 +#: src/MenuGL.cpp:422 #, c-format msgid "ATTENTION: Reverting to 'thick' text...\n" msgstr "注意：還原成「粗體」文字…\n" -#: src/MenuGL.cpp:474 +#: src/MenuGL.cpp:473 #, c-format msgid "low" msgstr "低" -#: src/MenuGL.cpp:475 +#: src/MenuGL.cpp:474 #, c-format msgid "med" msgstr "中" -#: src/MenuGL.cpp:476 +#: src/MenuGL.cpp:475 #, c-format msgid "high" msgstr "高" -#: src/MenuGL.cpp:481 +#: src/MenuGL.cpp:480 #, c-format msgid "%dx%d" msgstr "" -#: src/MenuGL.cpp:485 +#: src/MenuGL.cpp:484 #, c-format msgid "true" msgstr "真" -#: src/MenuGL.cpp:486 +#: src/MenuGL.cpp:485 #, c-format msgid "false" msgstr "假" -#: src/MenuGL.cpp:792 src/MenuGL.cpp:865 src/MenuGL.cpp:936 +#: src/MenuGL.cpp:791 src/MenuGL.cpp:864 src/MenuGL.cpp:935 #, c-format msgid "---- error setting full screen mode ----" msgstr "---- 設定全螢幕模式時發生錯誤 ----" -#: src/MenuGL.cpp:794 +#: src/MenuGL.cpp:793 #, c-format msgid "---- error setting window mode ----" msgstr "---- 設定視窗模式時發生錯誤 ----" -#: src/MenuGL.cpp:835 +#: src/MenuGL.cpp:834 #, c-format msgid "---- you must complete level %d before you can select level %d ----" msgstr "---- 在您可以選取等級 %2$d 之前，您必須完成等級 %1$d ----" -#: src/MenuGL.cpp:851 src/MenuGL.cpp:922 +#: src/MenuGL.cpp:850 src/MenuGL.cpp:921 #, c-format msgid "---- error setting screen size ----" msgstr "---- 設定螢幕大小時發生錯誤 ----" @@ -944,15 +970,15 @@ msgid "ScreenItemAdd::putScreenItems() Hero??? HUH???\n" msgstr "ScreenItemAdd::putScreenItems() 英雄??? 呃???\n" -#: src/StatusDisplay.cpp:651 src/StatusDisplay.cpp:655 +#: src/StatusDisplay.cpp:653 src/StatusDisplay.cpp:657 msgid "p a u s e d" msgstr "暫 停" -#: src/StatusDisplay.cpp:675 +#: src/StatusDisplay.cpp:677 msgid "do not let -any- ships past you! each one costs you a life!" msgstr "不要讓 *任何* 的船隻從您旁邊越過！每一個都會耗損您的生命！" -#: src/StatusDisplay.cpp:686 +#: src/StatusDisplay.cpp:688 msgid "let super shields pass by for an extra life!" msgstr "讓超級防護罩從旁越過以得到額外的生命！" diff -Nru chromium-bsu-0.9.15/src/Audio.cpp chromium-bsu-0.9.15.1/src/Audio.cpp --- chromium-bsu-0.9.15/src/Audio.cpp 2011-02-14 03:54:04.000000000 +0000 +++ chromium-bsu-0.9.15.1/src/Audio.cpp 2013-05-25 05:35:51.000000000 +0000 @@ -269,7 +269,11 @@ string command = "amixer set CD "; command += volume.str(); command += "% unmute"; - system(command.c_str()); + int status = system(command.c_str()); + if( status == -1 || !(WIFEXITED(status) && WEXITSTATUS(status) == 0) ) + { + fprintf(stderr, _("Could not set CD volume, amixer returned status %d\n"), status); + } } #endif // __linux__ } diff -Nru chromium-bsu-0.9.15/src/Audio.h chromium-bsu-0.9.15.1/src/Audio.h --- chromium-bsu-0.9.15/src/Audio.h 2011-02-14 03:54:04.000000000 +0000 +++ chromium-bsu-0.9.15.1/src/Audio.h 2013-05-25 05:35:51.000000000 +0000 @@ -21,7 +21,7 @@ class Global; #ifdef USE_SDL -#include // for CDROM +#include // for CDROM #else #define SDL_CD void #endif diff -Nru chromium-bsu-0.9.15/src/AudioOpenAL.cpp chromium-bsu-0.9.15.1/src/AudioOpenAL.cpp --- chromium-bsu-0.9.15/src/AudioOpenAL.cpp 2011-02-14 03:54:04.000000000 +0000 +++ chromium-bsu-0.9.15.1/src/AudioOpenAL.cpp 2013-05-25 05:35:51.000000000 +0000 @@ -694,7 +694,6 @@ { Config *config = Config::instance(); int i; - bool ok = false; int lineCount = 0; char buffer[1024]; char configFilename[256]; @@ -725,7 +724,6 @@ int tmp = strlen(buffer); buffer[tmp-1] = '\0'; //-- get rid of new line - ok = false; lineCount++; if(strlen(buffer) > 255) { @@ -769,6 +767,8 @@ if(musicMax+1 >= MAX_MUSIC) // limited music array size. break; } + fclose(file); + file = NULL; } else config->setUsePlayList(false); @@ -944,7 +944,7 @@ #else//USE_PLAYLIST FILE *file; struct stat sbuf; - int size; + size_t size; void *data; if(stat(filename, &sbuf) == -1) @@ -966,7 +966,13 @@ free(data); return false; } - fread(data, 1, size, file); + if( fread(data, 1, size, file) != size ) + { + fprintf(stderr, _("ERROR: Could not read from \"%s\" in AudioOpenAL::loadMP3\n"), filename); + fclose(file); + free(data); + return false; + } fclose(file); if( !(alutLoadMP3(buffer[MusicGame], data, size)) ) { @@ -990,7 +996,7 @@ { FILE *file; struct stat sbuf; - int size; + size_t size; void *data; if(stat(filename, &sbuf) == -1) @@ -1012,7 +1018,13 @@ free(data); return false; } - fread(data, 1, size, file); + if( fread(data, 1, size, file) != size ) + { + fprintf(stderr, _("ERROR: Could not read from \"%s\" in AudioOpenAL::loadVorbis\n"), filename); + fclose(file); + free(data); + return false; + } fclose(file); if( !(alutLoadVorbis(buffer[MusicGame], data, size)) ) { diff -Nru chromium-bsu-0.9.15/src/AudioSDLMixer.h chromium-bsu-0.9.15.1/src/AudioSDLMixer.h --- chromium-bsu-0.9.15/src/AudioSDLMixer.h 2010-06-18 17:04:44.000000000 +0000 +++ chromium-bsu-0.9.15.1/src/AudioSDLMixer.h 2013-05-11 04:52:10.000000000 +0000 @@ -14,7 +14,7 @@ extern "C" { #endif -#include +#include #include "Audio.h" diff -Nru chromium-bsu-0.9.15/src/EnemyAircraft_Boss00.cpp chromium-bsu-0.9.15.1/src/EnemyAircraft_Boss00.cpp --- chromium-bsu-0.9.15/src/EnemyAircraft_Boss00.cpp 2010-06-18 17:04:44.000000000 +0000 +++ chromium-bsu-0.9.15.1/src/EnemyAircraft_Boss00.cpp 2013-05-11 04:48:17.000000000 +0000 @@ -85,7 +85,8 @@ } if(!(age%5)) //-- side cannons { - shootSwap = ++shootSwap%15; + shootSwap++; + shootSwap %= 15; if(shootSwap < 6) { v[1] = -0.2; diff -Nru chromium-bsu-0.9.15/src/EnemyAircraft_Straight.cpp chromium-bsu-0.9.15.1/src/EnemyAircraft_Straight.cpp --- chromium-bsu-0.9.15/src/EnemyAircraft_Straight.cpp 2010-06-18 17:04:44.000000000 +0000 +++ chromium-bsu-0.9.15.1/src/EnemyAircraft_Straight.cpp 2013-05-11 04:48:17.000000000 +0000 @@ -93,14 +93,9 @@ void EnemyAircraft_Straight::move() { Config *config = Config::instance(); - float *hpos; - if(target) - hpos = target->getPos(); - else - hpos = pos; pos[1] += (game->speedAdj*(vel[1] * game->gameSkill)); - if( config->debug() ) fprintf(stderr, _("EnemyAircraft_Straight %p ... pos[1] = %g, vel[1] = %g\n"), this, pos[1], vel[1]); + if( config->debug() ) fprintf(stderr, _("EnemyAircraft_Straight %p ... pos[1] = %g, vel[1] = %g\n"), (void*)this, pos[1], vel[1]); if(pos[0] < -config->screenBoundX()) pos[0] = -config->screenBoundX(); diff -Nru chromium-bsu-0.9.15/src/EnemyAircraft_Tank.cpp chromium-bsu-0.9.15.1/src/EnemyAircraft_Tank.cpp --- chromium-bsu-0.9.15/src/EnemyAircraft_Tank.cpp 2010-06-18 17:04:44.000000000 +0000 +++ chromium-bsu-0.9.15.1/src/EnemyAircraft_Tank.cpp 2013-05-11 04:48:17.000000000 +0000 @@ -90,7 +90,8 @@ p[0] = pos[0] - 1.5; game->enemyAmmo->addAmmo(0, p, v); } - shootSwap = ++shootSwap%100; + shootSwap++; + shootSwap %= 100; } if(!((tmpInt = age/200)%2)) //-- omni shooters diff -Nru chromium-bsu-0.9.15/src/EnemyFleet.cpp chromium-bsu-0.9.15.1/src/EnemyFleet.cpp --- chromium-bsu-0.9.15/src/EnemyFleet.cpp 2011-02-14 03:54:03.000000000 +0000 +++ chromium-bsu-0.9.15.1/src/EnemyFleet.cpp 2013-05-25 05:35:50.000000000 +0000 @@ -290,7 +290,8 @@ // we know when they're hurting... if((int)thisEnemy->type >= (int)EnemyBoss00) { - float s[2] = { thisEnemy->size[0]*0.7, thisEnemy->size[1]*0.7 }; + float size = thisEnemy->size[0]*0.7; + float s[2] = { size, size }; if( thisEnemy->damage > thisEnemy->baseDamage*0.7 ) if( !(game->gameFrame%18) ) { diff -Nru chromium-bsu-0.9.15/src/GroundMetal.cpp chromium-bsu-0.9.15.1/src/GroundMetal.cpp --- chromium-bsu-0.9.15/src/GroundMetal.cpp 2011-02-07 03:59:50.000000000 +0000 +++ chromium-bsu-0.9.15.1/src/GroundMetal.cpp 2013-05-25 05:35:50.000000000 +0000 @@ -135,7 +135,8 @@ if(seg->pos[1] < -s2) { - float p[3] = { 0.0, seg->pos[1]+s2+s2, 0.0}; + float pos1 = seg->pos[1]+s2+s2; + float p[3] = { 0.0, pos1, 0.0}; float s[2] = { size, size }; seg->back->next = 0; delete seg; diff -Nru chromium-bsu-0.9.15/src/GroundSea.cpp chromium-bsu-0.9.15.1/src/GroundSea.cpp --- chromium-bsu-0.9.15/src/GroundSea.cpp 2011-02-07 03:59:50.000000000 +0000 +++ chromium-bsu-0.9.15.1/src/GroundSea.cpp 2013-05-15 05:03:14.000000000 +0000 @@ -85,7 +85,8 @@ { seg->back->next = 0; delete seg; - float p[3] = {0.0, size*2.0, 0.0}; + float pos1 = size*2.0; + float p[3] = {0.0, pos1, 0.0}; float s[2] = { size, size }; tmp = new GroundSeaSegment(p, s, this); rootSeg->next->back = tmp; diff -Nru chromium-bsu-0.9.15/src/HeroAmmo.cpp chromium-bsu-0.9.15.1/src/HeroAmmo.cpp --- chromium-bsu-0.9.15/src/HeroAmmo.cpp 2011-02-14 03:54:04.000000000 +0000 +++ chromium-bsu-0.9.15.1/src/HeroAmmo.cpp 2013-05-25 05:35:50.000000000 +0000 @@ -187,7 +187,7 @@ thisAmmo = ammoRoot[type]; while(thisAmmo) { - fprintf(stderr, _("%p <--%p--> %p\n"), thisAmmo->back, thisAmmo, thisAmmo->next); + fprintf(stderr, _("%p <--%p--> %p\n"), (void*)thisAmmo->back, (void*)thisAmmo, (void*)thisAmmo->next); thisAmmo = thisAmmo->next; } } diff -Nru chromium-bsu-0.9.15/src/HiScore.cpp chromium-bsu-0.9.15.1/src/HiScore.cpp --- chromium-bsu-0.9.15/src/HiScore.cpp 2011-02-07 03:59:50.000000000 +0000 +++ chromium-bsu-0.9.15.1/src/HiScore.cpp 2013-05-15 05:03:14.000000000 +0000 @@ -218,7 +218,7 @@ time = gmtime(&hiScoreDate[i][j]); if( time != NULL ){ fprintf(file, - "%d %d %lf %04d-%02d-%02d %02d:%02d:%02d %s\n", + "%d %d %f %04d-%02d-%02d %02d:%02d:%02d %s\n", i, j, hiScore[i][j], 1900+time->tm_year, @@ -272,7 +272,8 @@ tzset(); // Discard the comment line - fscanf(file,"%*[^\n]"); + if( fscanf(file,"%*[^\n]") == EOF ) + fprintf(stderr, _("WARNING: error reading score file (%s)\n"), getFileName()); char name[100]; struct tm time; @@ -314,9 +315,12 @@ } else { // Nasty old memory dump format - fread(hiScore, sizeof(double), 10*HI_SCORE_HIST, file); - fread(hiScoreName, 64*sizeof(char), 10*HI_SCORE_HIST, file); - fread(hiScoreDate, sizeof(time_t), 10*HI_SCORE_HIST, file); + if( fread(hiScore, sizeof(double), 10*HI_SCORE_HIST, file) != 10*HI_SCORE_HIST ) + fprintf(stderr, _("WARNING: error reading old score file (%s)\n"), getFileName()); + if( fread(hiScoreName, 64*sizeof(char), 10*HI_SCORE_HIST, file) != 10*HI_SCORE_HIST ) + fprintf(stderr, _("WARNING: error reading old score file (%s)\n"), getFileName()); + if( fread(hiScoreDate, sizeof(time_t), 10*HI_SCORE_HIST, file) != 10*HI_SCORE_HIST ) + fprintf(stderr, _("WARNING: error reading old score file (%s)\n"), getFileName()); fclose(file); // Resave the file in plain text format saveFile(); @@ -335,9 +339,12 @@ file = fopen(fileName, "r"); if(file) { - fread(hiScore, sizeof(double), 10*HI_SCORE_HIST, file); - fread(hiScoreName, 64*sizeof(char), 10*HI_SCORE_HIST, file); - fread(hiScoreDate, sizeof(time_t), 10*HI_SCORE_HIST, file); + if( fread(hiScore, sizeof(double), 10*HI_SCORE_HIST, file) != 10*HI_SCORE_HIST ) + fprintf(stderr, _("WARNING: error reading old score file (%s)\n"), getFileName()); + if( fread(hiScoreName, 64*sizeof(char), 10*HI_SCORE_HIST, file) != 10*HI_SCORE_HIST ) + fprintf(stderr, _("WARNING: error reading old score file (%s)\n"), getFileName()); + if( fread(hiScoreDate, sizeof(time_t), 10*HI_SCORE_HIST, file) != 10*HI_SCORE_HIST ) + fprintf(stderr, _("WARNING: error reading old score file (%s)\n"), getFileName()); fclose(file); // Try to save the new file and delete the old one if successful diff -Nru chromium-bsu-0.9.15/src/Image.cpp chromium-bsu-0.9.15.1/src/Image.cpp --- chromium-bsu-0.9.15/src/Image.cpp 2011-02-14 03:54:03.000000000 +0000 +++ chromium-bsu-0.9.15.1/src/Image.cpp 2013-05-25 05:35:51.000000000 +0000 @@ -13,9 +13,15 @@ #if IMAGE_SDL -#include -#include -#include +#include +#include +#include + +#if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GLU_H) +#include +#else +#include +#endif #elif IMAGE_GLPNG diff -Nru chromium-bsu-0.9.15/src/MainGL.cpp chromium-bsu-0.9.15.1/src/MainGL.cpp --- chromium-bsu-0.9.15/src/MainGL.cpp 2011-02-14 03:54:04.000000000 +0000 +++ chromium-bsu-0.9.15.1/src/MainGL.cpp 2013-05-25 05:35:51.000000000 +0000 @@ -394,7 +394,6 @@ { int i, l, lines = 1; float aa, ca; - float clr; float x_sin, y_sin, y, min_y; float width, height; char *walker,*newline; @@ -429,8 +428,6 @@ { for(i = 0; i < 6; i++) { - clr = ((float)i)/5.0; - clr = clr; glColor4f(1.0, ca*ca*0.3, ca*0.3, aa*aa); x_sin = 1.75*sin(i+game->frame*0.06); y_sin = 0.75*sin(i+game->frame*0.09); diff -Nru chromium-bsu-0.9.15/src/MainSDL.cpp chromium-bsu-0.9.15.1/src/MainSDL.cpp --- chromium-bsu-0.9.15/src/MainSDL.cpp 2011-02-14 03:54:04.000000000 +0000 +++ chromium-bsu-0.9.15.1/src/MainSDL.cpp 2013-05-25 05:35:51.000000000 +0000 @@ -18,10 +18,10 @@ #include #include -#include +#include #ifdef ENABLE_WINDOW_ICON -#include +#include #endif #include "compatibility.h" @@ -102,7 +102,7 @@ #define ICON "png/icon32.png" #else // Elsewhere SDL can do any size icons - #define ICON "png/icon64.png" + #define ICON "png/hero.png" #endif SDL_Surface *icon = IMG_Load(dataLoc(ICON)); if (icon) { @@ -147,7 +147,6 @@ Global *game = Global::getInstance(); Config *config = Config::instance(); float targetAdj = 1.0; - Uint32 start_time = 0; Uint32 now_time = 0; Uint32 last_time = 0; key_speed_x = key_speed_y = 0.0; @@ -155,7 +154,6 @@ int frames; //-- enter main loop... - start_time = SDL_GetTicks(); frames = 0; while( !done ) { diff -Nru chromium-bsu-0.9.15/src/MainSDL.h chromium-bsu-0.9.15.1/src/MainSDL.h --- chromium-bsu-0.9.15/src/MainSDL.h 2011-02-14 03:54:04.000000000 +0000 +++ chromium-bsu-0.9.15.1/src/MainSDL.h 2013-05-25 05:35:51.000000000 +0000 @@ -9,7 +9,7 @@ #define MainSDL_h #ifdef USE_SDL -#include +#include #include "MainToolkit.h" diff -Nru chromium-bsu-0.9.15/src/MainSDL_Event.cpp chromium-bsu-0.9.15.1/src/MainSDL_Event.cpp --- chromium-bsu-0.9.15/src/MainSDL_Event.cpp 2011-02-14 03:54:04.000000000 +0000 +++ chromium-bsu-0.9.15.1/src/MainSDL_Event.cpp 2013-05-25 05:35:51.000000000 +0000 @@ -412,15 +412,19 @@ { Global *game = Global::getInstance(); if(game->gameMode == Global::Game){ +#if SDL_MAJOR_VERSION == 1 && SDL_MINOR_VERSION >= 3 + Uint8 *keystate = SDL_GetKeyboardState(NULL); +#else Uint8 *keystate = SDL_GetKeyState(NULL); +#endif if( keystate[SDLK_LEFT] || keystate[SDLK_KP4] ) key_speed_x -= 2.0 + abs(key_speed_x)*0.4; if( keystate[SDLK_RIGHT] || keystate[SDLK_KP6] ) key_speed_x += 2.0 + abs(key_speed_x)*0.4; if( keystate[SDLK_UP] || keystate[SDLK_KP8] ) key_speed_y -= 2.0 + abs(key_speed_y)*0.4; if( keystate[SDLK_DOWN] || keystate[SDLK_KP2] ) key_speed_y += 2.0 + abs(key_speed_y)*0.4; if( keystate[SDLK_KP7] ){ key_speed_x -= 2.0 + abs(key_speed_x)*0.4; key_speed_y -= 2.0 + abs(key_speed_y)*0.4; } - if( keystate[SDLK_KP9] ){ key_speed_x -= 2.0 + abs(key_speed_x)*0.4; key_speed_y -= 2.0 + abs(key_speed_y)*0.4; } - if( keystate[SDLK_KP3] ){ key_speed_x -= 2.0 + abs(key_speed_x)*0.4; key_speed_y -= 2.0 + abs(key_speed_y)*0.4; } - if( keystate[SDLK_KP1] ){ key_speed_x -= 2.0 + abs(key_speed_x)*0.4; key_speed_y -= 2.0 + abs(key_speed_y)*0.4; } + if( keystate[SDLK_KP9] ){ key_speed_x += 2.0 + abs(key_speed_x)*0.4; key_speed_y -= 2.0 + abs(key_speed_y)*0.4; } + if( keystate[SDLK_KP3] ){ key_speed_x += 2.0 + abs(key_speed_x)*0.4; key_speed_y += 2.0 + abs(key_speed_y)*0.4; } + if( keystate[SDLK_KP1] ){ key_speed_x -= 2.0 + abs(key_speed_x)*0.4; key_speed_y += 2.0 + abs(key_speed_y)*0.4; } //float s = (1.0-game->speedAdj)+(game->speedAdj*0.7); float s = 0.7; key_speed_x *= s; diff -Nru chromium-bsu-0.9.15/src/Makefile.in chromium-bsu-0.9.15.1/src/Makefile.in --- chromium-bsu-0.9.15/src/Makefile.in 2011-02-14 03:55:04.000000000 +0000 +++ chromium-bsu-0.9.15.1/src/Makefile.in 2013-05-25 05:40:40.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.6 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -36,10 +52,10 @@ host_triplet = @host@ bin_PROGRAMS = chromium-bsu$(EXEEXT) subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/m4/ax_check_gl.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_gl.m4 \ $(top_srcdir)/m4/ax_check_glu.m4 \ $(top_srcdir)/m4/ax_check_glut.m4 \ $(top_srcdir)/m4/ax_lang_compiler_ms.m4 \ @@ -114,6 +130,11 @@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(chromium_bsu_SOURCES) DIST_SOURCES = $(chromium_bsu_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -194,11 +215,13 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ +SDLIMAGE_CFLAGS = @SDLIMAGE_CFLAGS@ +SDLIMAGE_LIBS = @SDLIMAGE_LIBS@ +SDLMIXER_CFLAGS = @SDLMIXER_CFLAGS@ +SDLMIXER_LIBS = @SDLMIXER_LIBS@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_LIBS = @SDL_LIBS@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -222,7 +245,6 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -415,8 +437,11 @@ $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p; \ @@ -450,7 +475,7 @@ clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -chromium-bsu$(EXEEXT): $(chromium_bsu_OBJECTS) $(chromium_bsu_DEPENDENCIES) +chromium-bsu$(EXEEXT): $(chromium_bsu_OBJECTS) $(chromium_bsu_DEPENDENCIES) $(EXTRA_chromium_bsu_DEPENDENCIES) @rm -f chromium-bsu$(EXEEXT) $(CXXLINK) $(chromium_bsu_OBJECTS) $(chromium_bsu_LDADD) $(LIBS) @@ -1169,6 +1194,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -1219,10 +1258,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -1307,7 +1351,7 @@ .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic ctags distclean distclean-compile \ + clean-generic cscopelist ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-dvi install-dvi-am \ diff -Nru chromium-bsu-0.9.15/src/MenuGL.cpp chromium-bsu-0.9.15.1/src/MenuGL.cpp --- chromium-bsu-0.9.15/src/MenuGL.cpp 2011-02-14 03:54:03.000000000 +0000 +++ chromium-bsu-0.9.15.1/src/MenuGL.cpp 2013-05-25 05:35:50.000000000 +0000 @@ -292,7 +292,7 @@ game->text->Render(_("high scores")); glTranslatef(-100.0, -30.0, 0.0); char buf[16]; - int i,len; + int i; float trans; time_t nowTime = time(NULL); int l = config->intSkill(); @@ -317,7 +317,6 @@ glColor4f(1.0, 1.0, 1.0, 0.2+0.2*r); // glColor4f(0.5+r*0.5, 0.5, 0.25-r*0.25, 0.2+0.2*r); sprintf(buf, "%d", (int)hiScore->getScore(config->intSkill(), i) ); - len = strlen(buf); trans = 80.0 + game->text->Advance(_("high scores")) - game->text->Advance(buf); glTranslatef( trans, 0.0, 0.0 ); game->text->Render(buf); @@ -465,7 +464,7 @@ case SkillLevel: level = config->gameSkillBase(); tmp = (int)((level+0.05)*10.0); - sprintf(buf, skillString(tmp)); + sprintf(buf, "%s", skillString(tmp)); break; case Graphics: level = config->gfxLevel()/2.0; diff -Nru chromium-bsu-0.9.15/src/StatusDisplay.cpp chromium-bsu-0.9.15.1/src/StatusDisplay.cpp --- chromium-bsu-0.9.15/src/StatusDisplay.cpp 2011-02-14 03:54:04.000000000 +0000 +++ chromium-bsu-0.9.15.1/src/StatusDisplay.cpp 2013-05-25 05:35:50.000000000 +0000 @@ -355,8 +355,10 @@ if(config->gfxLevel() > 1 && (!game->game_pause) ) { float p[3] = { 0.0, 0.0, hero->pos[2] }; - float v[3] = { 0.01*SRAND, 0.0, 0.0 }; - float c[4] = { 1.0, 1.0, 0.7, 1.0-sls*sls }; + float v0 = 0.01*SRAND; + float v[3] = { v0, 0.0, 0.0 }; + float c3 = 1.0-sls*sls; + float c[4] = { 1.0, 1.0, 0.7, c3 }; switch(game->gameFrame%2) { case 0: diff -Nru chromium-bsu-0.9.15/src/Text.cpp chromium-bsu-0.9.15.1/src/Text.cpp --- chromium-bsu-0.9.15/src/Text.cpp 2011-02-07 03:59:50.000000000 +0000 +++ chromium-bsu-0.9.15.1/src/Text.cpp 2013-05-11 04:48:17.000000000 +0000 @@ -12,8 +12,6 @@ #include "Text.h" -using namespace std; - //==================================================================== Text::Text() { diff -Nru chromium-bsu-0.9.15/src/main.cpp chromium-bsu-0.9.15.1/src/main.cpp --- chromium-bsu-0.9.15/src/main.cpp 2011-02-14 03:54:03.000000000 +0000 +++ chromium-bsu-0.9.15.1/src/main.cpp 2013-05-25 05:35:50.000000000 +0000 @@ -44,6 +44,7 @@ #include "MainGLUT.h" #include "Config.h" +#include "extern.h" #include "Global.h" #include "HiScore.h" diff -Nru chromium-bsu-0.9.15/src/textGeometryBSU.cpp chromium-bsu-0.9.15.1/src/textGeometryBSU.cpp --- chromium-bsu-0.9.15/src/textGeometryBSU.cpp 2011-02-14 03:54:03.000000000 +0000 +++ chromium-bsu-0.9.15.1/src/textGeometryBSU.cpp 2013-05-25 05:35:50.000000000 +0000 @@ -10,6 +10,7 @@ #include #endif +#include "textGeometry.h" #include "compatibility.h" #if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H) diff -Nru chromium-bsu-0.9.15/src/textGeometryChromium.cpp chromium-bsu-0.9.15.1/src/textGeometryChromium.cpp --- chromium-bsu-0.9.15/src/textGeometryChromium.cpp 2011-02-14 03:54:03.000000000 +0000 +++ chromium-bsu-0.9.15.1/src/textGeometryChromium.cpp 2013-05-25 05:35:50.000000000 +0000 @@ -10,6 +10,7 @@ #include #endif +#include "textGeometry.h" #include "compatibility.h" #if defined(HAVE_APPLE_OPENGL_FRAMEWORK) || defined(HAVE_OPENGL_GL_H)