--- totem-2.23.3.orig/aclocal.m4 +++ totem-2.23.3/aclocal.m4 @@ -737,7 +737,7 @@ dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 36 IT_PROG_INTLTOOL +# serial 40 IT_PROG_INTLTOOL AC_DEFUN([IT_PROG_INTLTOOL], [AC_PREREQ([2.50])dnl @@ -753,14 +753,21 @@ AC_MSG_CHECKING([for intltool >= $1]) INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` - [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in` + INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` + [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` ] AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) fi +AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) +AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) +AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) +if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then + AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) +fi + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' @@ -815,12 +822,7 @@ AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) fi -# Use the tools built into the package, not the ones that are installed. -AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') -AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge') -AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update') - -AC_PATH_PROG(INTLTOOL_PERL, perl) +AC_PATH_PROG(INTLTOOL_PERL, [perl]) if test -z "$INTLTOOL_PERL"; then AC_MSG_ERROR([perl not found; required for intltool]) fi @@ -866,42 +868,6 @@ IT_PO_SUBDIR([po]) -dnl The following is very similar to -dnl -dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update]) -dnl -dnl with the following slight differences: -dnl - the *.in files are in ac_aux_dir, -dnl - if the file haven't changed upon reconfigure, it's not touched, -dnl - the evaluation of the third parameter enables a hack which computes -dnl the actual value of $libdir, -dnl - the user sees "executing intltool commands", instead of -dnl "creating intltool-extract" and such. -dnl -dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were -dnl a reason for it. - -AC_CONFIG_COMMANDS([intltool], [ - -for file in intltool-extract intltool-merge intltool-update; do - sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ - -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ - -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ - < ${ac_aux_dir}/${file}.in > ${file}.out - if cmp -s ${file} ${file}.out 2>/dev/null; then - rm -f ${file}.out - else - mv -f ${file}.out ${file} - fi - chmod ugo+x ${file} - chmod u+w ${file} -done - -], -[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' -prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" -INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}']) - ]) @@ -949,7 +915,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 51 AC_PROG_LIBTOOL +# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -1037,7 +1003,6 @@ AC_REQUIRE([AC_OBJEXT])dnl AC_REQUIRE([AC_EXEEXT])dnl dnl - AC_LIBTOOL_SYS_MAX_CMD_LEN AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE AC_LIBTOOL_OBJDIR @@ -1139,6 +1104,8 @@ ;; esac +_LT_REQUIRED_DARWIN_CHECKS + AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], enable_win32_dll=yes, enable_win32_dll=no) @@ -1218,9 +1185,80 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* ])# _LT_LINKER_BOILERPLATE +# _LT_REQUIRED_DARWIN_CHECKS +# -------------------------- +# Check for some things on darwin +AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ + case $host_os in + rhapsody* | darwin*) + AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) + AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) + + AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], + [lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + echo "int foo(void){return 1;}" > conftest.c + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib ${wl}-single_module conftest.c + if test -f libconftest.dylib; then + lt_cv_apple_cc_single_mod=yes + rm -rf libconftest.dylib* + fi + rm conftest.c + fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], + [lt_cv_ld_exported_symbols_list], + [lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [lt_cv_ld_exported_symbols_list=yes], + [lt_cv_ld_exported_symbols_list=no]) + LDFLAGS="$save_LDFLAGS" + ]) + case $host_os in + rhapsody* | darwin1.[[0123]]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[[012]]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" + fi + if test "$DSYMUTIL" != ":"; then + _lt_dsymutil="~$DSYMUTIL \$lib || :" + else + _lt_dsymutil= + fi + ;; + esac +]) # _LT_AC_SYS_LIBPATH_AIX # ---------------------- @@ -1501,7 +1539,6 @@ esac ;; *64-bit*) - libsuff=64 case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_x86_64_fbsd" @@ -1546,7 +1583,11 @@ *64-bit*) case $lt_cv_prog_gnu_ld in yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) LD="${LD-ld} -64" ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; esac ;; esac @@ -1639,7 +1680,7 @@ $2=yes fi fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" ]) @@ -1910,7 +1951,7 @@ AC_CHECK_FUNC([shl_load], [lt_cv_dlopen="shl_load"], [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], [AC_CHECK_FUNC([dlopen], [lt_cv_dlopen="dlopen"], [AC_CHECK_LIB([dl], [dlopen], @@ -1918,7 +1959,7 @@ [AC_CHECK_LIB([svld], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) ]) ]) ]) @@ -2235,7 +2276,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[[4-9]]*) version_type=linux need_lib_prefix=no need_version=no @@ -2560,13 +2601,11 @@ # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2578,6 +2617,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -2758,6 +2809,13 @@ AC_MSG_RESULT([$dynamic_linker]) test "$dynamic_linker" = no && can_build_shared=no +AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], +[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], +[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -3257,7 +3315,7 @@ # whether `pass_all' will *always* work, you probably want this one. case $host_os in -aix4* | aix5*) +aix[[4-9]]*) lt_cv_deplibs_check_method=pass_all ;; @@ -3352,7 +3410,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -3693,7 +3751,7 @@ fi ;; -aix4* | aix5*) +aix[[4-9]]*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi @@ -3750,6 +3808,7 @@ _LT_AC_TAGVAR(predeps, $1)= _LT_AC_TAGVAR(postdeps, $1)= _LT_AC_TAGVAR(compiler_lib_search_path, $1)= +_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= # Source file extension for C++ test sources. ac_ext=cpp @@ -3859,7 +3918,7 @@ # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - aix4* | aix5*) + aix[[4-9]]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -3872,7 +3931,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do case $ld_flag in *-brtl*) @@ -4018,51 +4077,23 @@ fi ;; darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_automatic, $1)=yes _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - if test "$GXX" = yes ; then - lt_int_apple_cc_single_mod=no + _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + if test "$GXX" = yes ; then output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + if test "$lt_cv_apple_cc_single_mod" != "yes"; then + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - fi - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else case $cc_basename in xlc*) @@ -4313,7 +4344,7 @@ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ;; - pgCC*) + pgCC* | pgcpp*) # Portland Group C++ compiler _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' @@ -4386,7 +4417,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' wlarc= @@ -4748,7 +4779,8 @@ # compiler output when linking a shared library. # Parse the compiler output and extract the necessary # objects, libraries and library flags. -AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ +AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], +[AC_REQUIRE([LT_AC_PROG_SED])dnl dnl we can't use the lt_simple_compile_test_code here, dnl because it contains code intended for an executable, dnl not a library. It's possible we should let each @@ -4873,6 +4905,11 @@ $rm -f confest.$objext +_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= +if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then + _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` +fi + # PORTME: override above test on systems where it is broken ifelse([$1],[CXX], [case $host_os in @@ -4929,7 +4966,6 @@ ;; esac ]) - case " $_LT_AC_TAGVAR(postdeps, $1) " in *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; esac @@ -5014,7 +5050,7 @@ postinstall_cmds='$RANLIB $lib' fi ;; -aix4* | aix5*) +aix[[4-9]]*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi @@ -5191,6 +5227,7 @@ _LT_AC_TAGVAR(predeps, $1) \ _LT_AC_TAGVAR(postdeps, $1) \ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ + _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ _LT_AC_TAGVAR(archive_cmds, $1) \ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ _LT_AC_TAGVAR(postinstall_cmds, $1) \ @@ -5253,7 +5290,7 @@ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. # # This file is part of GNU Libtool: @@ -5490,6 +5527,10 @@ # shared library. postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) @@ -5839,7 +5880,7 @@ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD cat conftest.$ac_ext >&5 fi - rm -f conftest* conftst* + rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. if test "$pipe_works" = yes; then @@ -5896,7 +5937,8 @@ # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + m4_if([$1], [GCJ], [], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -5933,7 +5975,7 @@ esac else case $host_os in - aix4* | aix5*) + aix[[4-9]]*) # All AIX code is PIC. if test "$host_cpu" = ia64; then # AIX 5 now supports IA64 processor @@ -6029,7 +6071,7 @@ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; - pgCC*) + pgCC* | pgcpp*) # Portland Group C++ compiler. _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' @@ -6067,7 +6109,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; osf3* | osf4* | osf5*) case $cc_basename in @@ -6180,7 +6222,8 @@ # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + m4_if([$1], [GCJ], [], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; darwin* | rhapsody*) @@ -6250,7 +6293,8 @@ mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + m4_if([$1], [GCJ], [], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; hpux9* | hpux10* | hpux11*) @@ -6387,7 +6431,7 @@ # if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], - _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), + _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in "" | " "*) ;; @@ -6411,7 +6455,7 @@ # wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], - _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), + _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), $lt_tmp_static_flag, [], [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) @@ -6427,7 +6471,7 @@ ifelse([$1],[CXX],[ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in - aix4* | aix5*) + aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm if $NM -V 2>&1 | grep 'GNU' > /dev/null; then @@ -6442,10 +6486,14 @@ cygwin* | mingw*) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ;; + linux* | k*bsd*-gnu) + _LT_AC_TAGVAR(link_all_deplibs, $1)=no + ;; *) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; esac + _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ],[ runpath_var= _LT_AC_TAGVAR(allow_undefined_flag, $1)= @@ -6476,12 +6524,14 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. - _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" + _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if # the symbol is explicitly referenced. Since portable code cannot # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. +dnl Note also adjust exclude_expsyms for C++ above. extract_expsyms_cmds= # Just being paranoid about ensuring that cc_basename is set. _LT_CC_BASENAME([$compiler]) @@ -6531,7 +6581,7 @@ # See if GNU ld supports shared libraries. case $host_os in - aix3* | aix4* | aix5*) + aix[[3-9]]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -6647,12 +6697,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi + _LT_AC_TAGVAR(link_all_deplibs, $1)=no else _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -6750,7 +6801,7 @@ fi ;; - aix4* | aix5*) + aix[[4-9]]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -6770,7 +6821,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -6930,11 +6981,10 @@ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes if test "$GCC" = yes ; then output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else case $cc_basename in xlc*) @@ -7084,7 +7134,7 @@ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -7583,14 +7633,16 @@ # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - 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_failed=yes]) - else - pkg_failed=untried +[if test -n "$PKG_CONFIG"; then + if test -n "$$1"; then + pkg_cv_[]$1="$$1" + else + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + fi +else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -7634,9 +7686,9 @@ if test $pkg_failed = yes; then _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 --errors-to-stdout --print-errors "$2"` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD --- totem-2.23.3.orig/configure +++ totem-2.23.3/configure @@ -864,6 +864,9 @@ POFILES POSUB MKINSTALLDIRS +INTLTOOL_UPDATE +INTLTOOL_MERGE +INTLTOOL_EXTRACT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE @@ -884,9 +887,6 @@ INTLTOOL_SERVICE_RULE INTLTOOL_POLICY_RULE MSGMERGE -INTLTOOL_EXTRACT -INTLTOOL_MERGE -INTLTOOL_UPDATE INTLTOOL_PERL ALL_LINGUAS PKG_CONFIG @@ -917,6 +917,8 @@ ECHO AR RANLIB +DSYMUTIL +NMEDIT CXXCPP F77 FFLAGS @@ -6049,8 +6051,8 @@ echo $ECHO_N "checking for intltool >= 0.35.0... $ECHO_C" >&6; } INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` - INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in` + INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` + INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5 echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; } @@ -6060,6 +6062,132 @@ { (exit 1); exit 1; }; } fi +# Extract the first word of "intltool-update", so it can be a program name with args. +set dummy intltool-update; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $INTLTOOL_UPDATE in + [\\/]* | ?:[\\/]*) + ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path. + ;; + *) + 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_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE +if test -n "$INTLTOOL_UPDATE"; then + { echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5 +echo "${ECHO_T}$INTLTOOL_UPDATE" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +# Extract the first word of "intltool-merge", so it can be a program name with args. +set dummy intltool-merge; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $INTLTOOL_MERGE in + [\\/]* | ?:[\\/]*) + ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path. + ;; + *) + 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_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE +if test -n "$INTLTOOL_MERGE"; then + { echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5 +echo "${ECHO_T}$INTLTOOL_MERGE" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +# Extract the first word of "intltool-extract", so it can be a program name with args. +set dummy intltool-extract; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $INTLTOOL_EXTRACT in + [\\/]* | ?:[\\/]*) + ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path. + ;; + *) + 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_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT +if test -n "$INTLTOOL_EXTRACT"; then + { echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5 +echo "${ECHO_T}$INTLTOOL_EXTRACT" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then + { { echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5 +echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;} + { (exit 1); exit 1; }; } +fi + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -6235,14 +6363,6 @@ { (exit 1); exit 1; }; } fi -# Use the tools built into the package, not the ones that are installed. -INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract' - -INTLTOOL_MERGE='$(top_builddir)/intltool-merge' - -INTLTOOL_UPDATE='$(top_builddir)/intltool-update' - - # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -6455,10 +6575,6 @@ -ac_config_commands="$ac_config_commands intltool" - - - @@ -7694,7 +7810,7 @@ # whether `pass_all' will *always* work, you probably want this one. case $host_os in -aix4* | aix5*) +aix[4-9]*) lt_cv_deplibs_check_method=pass_all ;; @@ -7789,7 +7905,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -7909,7 +8025,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7912 "configure"' > conftest.$ac_ext + echo '#line 8028 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7974,7 +8090,6 @@ esac ;; *64-bit*) - libsuff=64 case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_x86_64_fbsd" @@ -8082,7 +8197,11 @@ *64-bit*) case $lt_cv_prog_gnu_ld in yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) LD="${LD-ld} -64" ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; esac ;; esac @@ -8738,7 +8857,6 @@ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! - # find the maximum length of command line arguments { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } @@ -9053,7 +9171,7 @@ echo "$progname: failed program was:" >&5 cat conftest.$ac_ext >&5 fi - rm -f conftest* conftst* + rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. if test "$pipe_works" = yes; then @@ -9613,52 +9731,364 @@ ;; esac -enable_dlopen=no -enable_win32_dll=no -# Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then - enableval=$enable_libtool_lock; + case $host_os in + rhapsody* | darwin*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. +set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_DSYMUTIL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$DSYMUTIL"; then + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # 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_DSYMUTIL="${ac_tool_prefix}dsymutil" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +DSYMUTIL=$ac_cv_prog_DSYMUTIL +if test -n "$DSYMUTIL"; then + { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 +echo "${ECHO_T}$DSYMUTIL" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +fi +if test -z "$ac_cv_prog_DSYMUTIL"; then + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. +set dummy dsymutil; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_DSYMUTIL"; then + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # 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_ac_ct_DSYMUTIL="dsymutil" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS -# Check whether --with-pic was given. -if test "${with_pic+set}" = set; then - withval=$with_pic; pic_mode="$withval" +fi +fi +ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL +if test -n "$ac_ct_DSYMUTIL"; then + { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 +echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } else - pic_mode=default + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -test -z "$pic_mode" && pic_mode=default - -# Use C for the default configuration in the libtool script -tagname= -lt_save_CC="$CC" -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 - + if test "x$ac_ct_DSYMUTIL" = x; then + DSYMUTIL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + DSYMUTIL=$ac_ct_DSYMUTIL + fi +else + DSYMUTIL="$ac_cv_prog_DSYMUTIL" +fi -# Source file extension for C test sources. -ac_ext=c + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. +set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_NMEDIT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$NMEDIT"; then + ac_cv_prog_NMEDIT="$NMEDIT" # 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_NMEDIT="${ac_tool_prefix}nmedit" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS -# Object file extension for compiled C test sources. -objext=o -objext=$objext +fi +fi +NMEDIT=$ac_cv_prog_NMEDIT +if test -n "$NMEDIT"; then + { echo "$as_me:$LINENO: result: $NMEDIT" >&5 +echo "${ECHO_T}$NMEDIT" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' +fi +if test -z "$ac_cv_prog_NMEDIT"; then + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. +set dummy nmedit; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_NMEDIT"; then + ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # 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_ac_ct_NMEDIT="nmedit" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS +fi +fi +ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT +if test -n "$ac_ct_NMEDIT"; then + { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 +echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} + if test "x$ac_ct_NMEDIT" = x; then + NMEDIT=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + NMEDIT=$ac_ct_NMEDIT + fi +else + NMEDIT="$ac_cv_prog_NMEDIT" +fi + + + { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 +echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } +if test "${lt_cv_apple_cc_single_mod+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + echo "int foo(void){return 1;}" > conftest.c + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib ${wl}-single_module conftest.c + if test -f libconftest.dylib; then + lt_cv_apple_cc_single_mod=yes + rm -rf libconftest.dylib* + fi + rm conftest.c + fi +fi +{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 +echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } + { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 +echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } +if test "${lt_cv_ld_exported_symbols_list+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + lt_cv_ld_exported_symbols_list=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + lt_cv_ld_exported_symbols_list=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + +fi +{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 +echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } + case $host_os in + rhapsody* | darwin1.[0123]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[91]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[012]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" + fi + if test "$DSYMUTIL" != ":"; then + _lt_dsymutil="~$DSYMUTIL \$lib || :" + else + _lt_dsymutil= + fi + ;; + esac + + +enable_dlopen=no +enable_win32_dll=no + +# Check whether --enable-libtool-lock was given. +if test "${enable_libtool_lock+set}" = set; then + enableval=$enable_libtool_lock; +fi + +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + + +# Check whether --with-pic was given. +if test "${with_pic+set}" = set; then + withval=$with_pic; pic_mode="$withval" +else + pic_mode=default +fi + +test -z "$pic_mode" && pic_mode=default + +# Use C for the default configuration in the libtool script +tagname= +lt_save_CC="$CC" +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 + + +# Source file extension for C test sources. +ac_ext=c + +# Object file extension for compiled C test sources. +objext=o +objext=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;" + +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}' + + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} # If no C compiler flags were specified, use CFLAGS. LTCFLAGS=${LTCFLAGS-"$CFLAGS"} @@ -9678,7 +10108,7 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* @@ -9706,11 +10136,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9709: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10139: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9713: \$? = $ac_status" >&5 + echo "$as_me:10143: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9980,10 +10410,10 @@ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_pic_works+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_pic_works=no + lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic -DPIC" @@ -9996,27 +10426,27 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9999: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10429: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10003: \$? = $ac_status" >&5 + echo "$as_me:10433: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_pic_works=yes + lt_cv_prog_compiler_pic_works=yes fi fi $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } -if test x"$lt_prog_compiler_pic_works" = xyes; then +if test x"$lt_cv_prog_compiler_pic_works" = xyes; then case $lt_prog_compiler_pic in "" | " "*) ;; *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; @@ -10043,10 +10473,10 @@ wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_static_works+set}" = set; then +if test "${lt_cv_prog_compiler_static_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_static_works=no + lt_cv_prog_compiler_static_works=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext @@ -10059,20 +10489,20 @@ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works=yes + lt_cv_prog_compiler_static_works=yes fi else - lt_prog_compiler_static_works=yes + lt_cv_prog_compiler_static_works=yes fi fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } -if test x"$lt_prog_compiler_static_works" = xyes; then +if test x"$lt_cv_prog_compiler_static_works" = xyes; then : else lt_prog_compiler_static= @@ -10100,11 +10530,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10103: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10533: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10107: \$? = $ac_status" >&5 + echo "$as_me:10537: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10184,12 +10614,13 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. - exclude_expsyms="_GLOBAL_OFFSET_TABLE_" + exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if # the symbol is explicitly referenced. Since portable code cannot # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. extract_expsyms_cmds= # Just being paranoid about ensuring that cc_basename is set. for cc_temp in $compiler""; do @@ -10248,7 +10679,7 @@ # See if GNU ld supports shared libraries. case $host_os in - aix3* | aix4* | aix5*) + aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs=no @@ -10364,12 +10795,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi + link_all_deplibs=no else ld_shlibs=no fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -10467,7 +10899,7 @@ fi ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -10487,7 +10919,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -10759,11 +11191,10 @@ link_all_deplibs=yes if test "$GCC" = yes ; then output_verbose_link_cmd='echo' - archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else case $cc_basename in xlc*) @@ -10913,7 +11344,7 @@ link_all_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -11283,7 +11714,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[4-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -11608,13 +12039,11 @@ # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -11626,6 +12055,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -11807,6 +12248,21 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +fi + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +fi + +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -12126,7 +12582,7 @@ { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } if test $ac_cv_lib_dld_shl_load = yes; then - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" else { echo "$as_me:$LINENO: checking for dlopen" >&5 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } @@ -12402,7 +12858,7 @@ { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } if test $ac_cv_lib_dld_dld_link = yes; then - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -12451,7 +12907,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* # Allow CC to be a program name with arguments. @@ -13522,7 +13984,7 @@ # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -13535,7 +13997,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do case $ld_flag in *-brtl*) @@ -13793,51 +14255,23 @@ fi ;; darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[012]) - allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac archive_cmds_need_lc_CXX=no hardcode_direct_CXX=no hardcode_automatic_CXX=yes hardcode_shlibpath_var_CXX=unsupported whole_archive_flag_spec_CXX='' link_all_deplibs_CXX=yes - - if test "$GXX" = yes ; then - lt_int_apple_cc_single_mod=no + allow_undefined_flag_CXX="$_lt_dar_allow_undefined" + if test "$GXX" = yes ; then output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes + archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + if test "$lt_cv_apple_cc_single_mod" != "yes"; then + archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - else - archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - fi - module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else case $cc_basename in xlc*) @@ -14088,7 +14522,7 @@ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ;; - pgCC*) + pgCC* | pgcpp*) # Portland Group C++ compiler archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' @@ -14161,7 +14595,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' wlarc= @@ -14495,7 +14929,6 @@ GCC_CXX="$GXX" LD_CXX="$LD" - cat > conftest.$ac_ext <&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_pic_works_CXX=no + lt_cv_prog_compiler_pic_works_CXX=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" @@ -14971,27 +15408,27 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14974: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15411: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14978: \$? = $ac_status" >&5 + echo "$as_me:15415: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_pic_works_CXX=yes + lt_cv_prog_compiler_pic_works_CXX=yes fi fi $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } -if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then +if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then case $lt_prog_compiler_pic_CXX in "" | " "*) ;; *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; @@ -15018,10 +15455,10 @@ wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_static_works_CXX+set}" = set; then +if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_static_works_CXX=no + lt_cv_prog_compiler_static_works_CXX=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext @@ -15034,20 +15471,20 @@ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works_CXX=yes + lt_cv_prog_compiler_static_works_CXX=yes fi else - lt_prog_compiler_static_works_CXX=yes + lt_cv_prog_compiler_static_works_CXX=yes fi fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } -if test x"$lt_prog_compiler_static_works_CXX" = xyes; then +if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then : else lt_prog_compiler_static_CXX= @@ -15075,11 +15512,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15078: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15515: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15082: \$? = $ac_status" >&5 + echo "$as_me:15519: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15132,7 +15569,7 @@ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in - aix4* | aix5*) + aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm if $NM -V 2>&1 | grep 'GNU' > /dev/null; then @@ -15147,10 +15584,14 @@ cygwin* | mingw*) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' ;; + linux* | k*bsd*-gnu) + link_all_deplibs_CXX=no + ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; esac + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 echo "${ECHO_T}$ld_shlibs_CXX" >&6; } @@ -15252,7 +15693,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[4-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -15576,13 +16017,11 @@ # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -15594,6 +16033,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -15775,6 +16226,21 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +fi + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +fi + +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -15858,6 +16324,7 @@ predeps_CXX \ postdeps_CXX \ compiler_lib_search_path_CXX \ + compiler_lib_search_dirs_CXX \ archive_cmds_CXX \ archive_expsym_cmds_CXX \ postinstall_cmds_CXX \ @@ -16106,6 +16573,10 @@ # shared library. postdeps=$lt_postdeps_CXX +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_compiler_lib_search_path_CXX @@ -16320,7 +16791,7 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* # Allow CC to be a program name with arguments. @@ -16358,7 +16829,7 @@ postinstall_cmds='$RANLIB $lib' fi ;; -aix4* | aix5*) +aix[4-9]*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi @@ -16623,10 +17094,10 @@ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_pic_works_F77+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_pic_works_F77=no + lt_cv_prog_compiler_pic_works_F77=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_F77" @@ -16639,27 +17110,27 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16642: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17113: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16646: \$? = $ac_status" >&5 + echo "$as_me:17117: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_pic_works_F77=yes + lt_cv_prog_compiler_pic_works_F77=yes fi fi $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } -if test x"$lt_prog_compiler_pic_works_F77" = xyes; then +if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then case $lt_prog_compiler_pic_F77 in "" | " "*) ;; *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; @@ -16686,10 +17157,10 @@ wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_static_works_F77+set}" = set; then +if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_static_works_F77=no + lt_cv_prog_compiler_static_works_F77=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext @@ -16702,20 +17173,20 @@ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works_F77=yes + lt_cv_prog_compiler_static_works_F77=yes fi else - lt_prog_compiler_static_works_F77=yes + lt_cv_prog_compiler_static_works_F77=yes fi fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } -if test x"$lt_prog_compiler_static_works_F77" = xyes; then +if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then : else lt_prog_compiler_static_F77= @@ -16743,11 +17214,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16746: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17217: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16750: \$? = $ac_status" >&5 + echo "$as_me:17221: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16827,12 +17298,13 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. - exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_" + exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if # the symbol is explicitly referenced. Since portable code cannot # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. extract_expsyms_cmds= # Just being paranoid about ensuring that cc_basename is set. for cc_temp in $compiler""; do @@ -16891,7 +17363,7 @@ # See if GNU ld supports shared libraries. case $host_os in - aix3* | aix4* | aix5*) + aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs_F77=no @@ -17007,12 +17479,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi + link_all_deplibs_F77=no else ld_shlibs_F77=no fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -17110,7 +17583,7 @@ fi ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -17130,7 +17603,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -17382,11 +17855,10 @@ link_all_deplibs_F77=yes if test "$GCC" = yes ; then output_verbose_link_cmd='echo' - archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else case $cc_basename in xlc*) @@ -17536,7 +18008,7 @@ link_all_deplibs_F77=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -17855,7 +18327,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[4-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -18179,13 +18651,11 @@ # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -18197,6 +18667,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -18378,6 +18860,21 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +fi + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +fi + +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -18461,6 +18958,7 @@ predeps_F77 \ postdeps_F77 \ compiler_lib_search_path_F77 \ + compiler_lib_search_dirs_F77 \ archive_cmds_F77 \ archive_expsym_cmds_F77 \ postinstall_cmds_F77 \ @@ -18709,6 +19207,10 @@ # shared library. postdeps=$lt_postdeps_F77 +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77 + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_compiler_lib_search_path_F77 @@ -18883,7 +19385,7 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* # Allow CC to be a program name with arguments. @@ -18932,11 +19434,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18935: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19437: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18939: \$? = $ac_status" >&5 + echo "$as_me:19441: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -18996,7 +19498,7 @@ # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries - lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' + ;; darwin* | rhapsody*) @@ -19066,7 +19568,7 @@ mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' + ;; hpux9* | hpux10* | hpux11*) @@ -19206,10 +19708,10 @@ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_pic_works_GCJ=no + lt_cv_prog_compiler_pic_works_GCJ=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_GCJ" @@ -19222,27 +19724,27 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19225: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19727: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:19229: \$? = $ac_status" >&5 + echo "$as_me:19731: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_pic_works_GCJ=yes + lt_cv_prog_compiler_pic_works_GCJ=yes fi fi $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } -if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then +if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then case $lt_prog_compiler_pic_GCJ in "" | " "*) ;; *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; @@ -19269,10 +19771,10 @@ wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then +if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_static_works_GCJ=no + lt_cv_prog_compiler_static_works_GCJ=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext @@ -19285,20 +19787,20 @@ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works_GCJ=yes + lt_cv_prog_compiler_static_works_GCJ=yes fi else - lt_prog_compiler_static_works_GCJ=yes + lt_cv_prog_compiler_static_works_GCJ=yes fi fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } -if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then +if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then : else lt_prog_compiler_static_GCJ= @@ -19326,11 +19828,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19329: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19831: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19333: \$? = $ac_status" >&5 + echo "$as_me:19835: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19410,12 +19912,13 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. - exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_" + exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if # the symbol is explicitly referenced. Since portable code cannot # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. extract_expsyms_cmds= # Just being paranoid about ensuring that cc_basename is set. for cc_temp in $compiler""; do @@ -19474,7 +19977,7 @@ # See if GNU ld supports shared libraries. case $host_os in - aix3* | aix4* | aix5*) + aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs_GCJ=no @@ -19590,12 +20093,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi + link_all_deplibs_GCJ=no else ld_shlibs_GCJ=no fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -19693,7 +20197,7 @@ fi ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -19713,7 +20217,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -19985,11 +20489,10 @@ link_all_deplibs_GCJ=yes if test "$GCC" = yes ; then output_verbose_link_cmd='echo' - archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else case $cc_basename in xlc*) @@ -20139,7 +20642,7 @@ link_all_deplibs_GCJ=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -20458,7 +20961,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[4-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -20782,13 +21285,11 @@ # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -20800,6 +21301,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -20981,6 +21494,21 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +fi + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +fi + +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -21064,6 +21592,7 @@ predeps_GCJ \ postdeps_GCJ \ compiler_lib_search_path_GCJ \ + compiler_lib_search_dirs_GCJ \ archive_cmds_GCJ \ archive_expsym_cmds_GCJ \ postinstall_cmds_GCJ \ @@ -21312,6 +21841,10 @@ # shared library. postdeps=$lt_postdeps_GCJ +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ @@ -21485,7 +22018,7 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* # Allow CC to be a program name with arguments. @@ -21545,6 +22078,7 @@ predeps_RC \ postdeps_RC \ compiler_lib_search_path_RC \ + compiler_lib_search_dirs_RC \ archive_cmds_RC \ archive_expsym_cmds_RC \ postinstall_cmds_RC \ @@ -21793,6 +22327,10 @@ # shared library. postdeps=$lt_postdeps_RC +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_compiler_lib_search_path_RC @@ -22220,10 +22758,11 @@ { echo "$as_me:$LINENO: checking for NVTV" >&5 echo $ECHO_N "checking for NVTV... $ECHO_C" >&6; } -if test -n "$NVTV_CFLAGS"; then - pkg_cv_NVTV_CFLAGS="$NVTV_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$NVTV_CFLAGS"; then + pkg_cv_NVTV_CFLAGS="$NVTV_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nvtvsimple >= 0.4.5\"") >&5 ($PKG_CONFIG --exists --print-errors "nvtvsimple >= 0.4.5") 2>&5 ac_status=$? @@ -22233,13 +22772,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$NVTV_LIBS"; then - pkg_cv_NVTV_LIBS="$NVTV_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$NVTV_LIBS"; then + pkg_cv_NVTV_LIBS="$NVTV_LIBS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nvtvsimple >= 0.4.5\"") >&5 ($PKG_CONFIG --exists --print-errors "nvtvsimple >= 0.4.5") 2>&5 ac_status=$? @@ -22249,8 +22790,9 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -22263,9 +22805,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - NVTV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "nvtvsimple >= 0.4.5" 2>&1` + NVTV_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "nvtvsimple >= 0.4.5"` else - NVTV_PKG_ERRORS=`$PKG_CONFIG --print-errors "nvtvsimple >= 0.4.5" 2>&1` + NVTV_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nvtvsimple >= 0.4.5"` fi # Put the nasty error message in config.log where it belongs echo "$NVTV_PKG_ERRORS" >&5 @@ -22349,10 +22891,11 @@ { echo "$as_me:$LINENO: checking for MISSING_PLUGINS" >&5 echo $ECHO_N "checking for MISSING_PLUGINS... $ECHO_C" >&6; } -if test -n "$MISSING_PLUGINS_CFLAGS"; then - pkg_cv_MISSING_PLUGINS_CFLAGS="$MISSING_PLUGINS_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$MISSING_PLUGINS_CFLAGS"; then + pkg_cv_MISSING_PLUGINS_CFLAGS="$MISSING_PLUGINS_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10\"") >&5 ($PKG_CONFIG --exists --print-errors "gstreamer-plugins-base-0.10") 2>&5 ac_status=$? @@ -22362,13 +22905,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$MISSING_PLUGINS_LIBS"; then - pkg_cv_MISSING_PLUGINS_LIBS="$MISSING_PLUGINS_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$MISSING_PLUGINS_LIBS"; then + pkg_cv_MISSING_PLUGINS_LIBS="$MISSING_PLUGINS_LIBS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10\"") >&5 ($PKG_CONFIG --exists --print-errors "gstreamer-plugins-base-0.10") 2>&5 ac_status=$? @@ -22378,8 +22923,9 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -22392,9 +22938,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - MISSING_PLUGINS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gstreamer-plugins-base-0.10" 2>&1` + MISSING_PLUGINS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-plugins-base-0.10"` else - MISSING_PLUGINS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gstreamer-plugins-base-0.10" 2>&1` + MISSING_PLUGINS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-plugins-base-0.10"` fi # Put the nasty error message in config.log where it belongs echo "$MISSING_PLUGINS_PKG_ERRORS" >&5 @@ -22466,10 +23012,11 @@ { echo "$as_me:$LINENO: checking for GST" >&5 echo $ECHO_N "checking for GST... $ECHO_C" >&6; } -if test -n "$GST_CFLAGS"; then - pkg_cv_GST_CFLAGS="$GST_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$GST_CFLAGS"; then + pkg_cv_GST_CFLAGS="$GST_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MM\"") >&5 ($PKG_CONFIG --exists --print-errors "$MM") 2>&5 ac_status=$? @@ -22479,13 +23026,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$GST_LIBS"; then - pkg_cv_GST_LIBS="$GST_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$GST_LIBS"; then + pkg_cv_GST_LIBS="$GST_LIBS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MM\"") >&5 ($PKG_CONFIG --exists --print-errors "$MM") 2>&5 ac_status=$? @@ -22495,8 +23044,9 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -22509,9 +23059,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$MM" 2>&1` + GST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$MM"` else - GST_PKG_ERRORS=`$PKG_CONFIG --print-errors "$MM" 2>&1` + GST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MM"` fi # Put the nasty error message in config.log where it belongs echo "$GST_PKG_ERRORS" >&5 @@ -22609,10 +23159,11 @@ { echo "$as_me:$LINENO: checking for XINE" >&5 echo $ECHO_N "checking for XINE... $ECHO_C" >&6; } -if test -n "$XINE_CFLAGS"; then - pkg_cv_XINE_CFLAGS="$XINE_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$XINE_CFLAGS"; then + pkg_cv_XINE_CFLAGS="$XINE_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MM\"") >&5 ($PKG_CONFIG --exists --print-errors "$MM") 2>&5 ac_status=$? @@ -22622,13 +23173,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$XINE_LIBS"; then - pkg_cv_XINE_LIBS="$XINE_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$XINE_LIBS"; then + pkg_cv_XINE_LIBS="$XINE_LIBS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MM\"") >&5 ($PKG_CONFIG --exists --print-errors "$MM") 2>&5 ac_status=$? @@ -22638,8 +23191,9 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -22652,9 +23206,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XINE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$MM" 2>&1` + XINE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$MM"` else - XINE_PKG_ERRORS=`$PKG_CONFIG --print-errors "$MM" 2>&1` + XINE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MM"` fi # Put the nasty error message in config.log where it belongs echo "$XINE_PKG_ERRORS" >&5 @@ -22769,37 +23323,41 @@ { echo "$as_me:$LINENO: checking for EXTRA_GNOME" >&5 echo $ECHO_N "checking for EXTRA_GNOME... $ECHO_C" >&6; } -if test -n "$EXTRA_GNOME_CFLAGS"; then - pkg_cv_EXTRA_GNOME_CFLAGS="$EXTRA_GNOME_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 >= \$GTK_REQS libgnomeui-2.0 >= \$GNOMEUI_REQS gio-2.0 libgnome-2.0 >= \$LIBGNOME_REQS gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES\"") >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES") 2>&5 +if test -n "$PKG_CONFIG"; then + if test -n "$EXTRA_GNOME_CFLAGS"; then + pkg_cv_EXTRA_GNOME_CFLAGS="$EXTRA_GNOME_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS launchpad-integration gtk+-2.0 >= \$GTK_REQS libgnomeui-2.0 >= \$GNOMEUI_REQS gio-2.0 libgnome-2.0 >= \$LIBGNOME_REQS gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS launchpad-integration gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_EXTRA_GNOME_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES" 2>/dev/null` + pkg_cv_EXTRA_GNOME_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQS launchpad-integration gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$EXTRA_GNOME_LIBS"; then - pkg_cv_EXTRA_GNOME_LIBS="$EXTRA_GNOME_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 >= \$GTK_REQS libgnomeui-2.0 >= \$GNOMEUI_REQS gio-2.0 libgnome-2.0 >= \$LIBGNOME_REQS gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES\"") >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES") 2>&5 +if test -n "$PKG_CONFIG"; then + if test -n "$EXTRA_GNOME_LIBS"; then + pkg_cv_EXTRA_GNOME_LIBS="$EXTRA_GNOME_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS launchpad-integration gtk+-2.0 >= \$GTK_REQS libgnomeui-2.0 >= \$GNOMEUI_REQS gio-2.0 libgnome-2.0 >= \$LIBGNOME_REQS gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS launchpad-integration gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_EXTRA_GNOME_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES" 2>/dev/null` + pkg_cv_EXTRA_GNOME_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQS launchpad-integration gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -22812,14 +23370,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES" 2>&1` + EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQS launchpad-integration gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES"` else - EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES" 2>&1` + EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQS launchpad-integration gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES"` fi # Put the nasty error message in config.log where it belongs echo "$EXTRA_GNOME_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES) were not met: + { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQS launchpad-integration gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES) were not met: $EXTRA_GNOME_PKG_ERRORS @@ -22830,7 +23388,7 @@ and EXTRA_GNOME_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES) were not met: +echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQS launchpad-integration gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES) were not met: $EXTRA_GNOME_PKG_ERRORS @@ -22879,37 +23437,41 @@ { echo "$as_me:$LINENO: checking for EXTRA_GNOME" >&5 echo $ECHO_N "checking for EXTRA_GNOME... $ECHO_C" >&6; } -if test -n "$EXTRA_GNOME_CFLAGS"; then - pkg_cv_EXTRA_GNOME_CFLAGS="$EXTRA_GNOME_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 >= \$GTK_REQS gio-2.0 gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES\"") >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES") 2>&5 +if test -n "$PKG_CONFIG"; then + if test -n "$EXTRA_GNOME_CFLAGS"; then + pkg_cv_EXTRA_GNOME_CFLAGS="$EXTRA_GNOME_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS launchpad-integration gtk+-2.0 >= \$GTK_REQS gio-2.0 gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS launchpad-integration gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_EXTRA_GNOME_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES" 2>/dev/null` + pkg_cv_EXTRA_GNOME_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQS launchpad-integration gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$EXTRA_GNOME_LIBS"; then - pkg_cv_EXTRA_GNOME_LIBS="$EXTRA_GNOME_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 >= \$GTK_REQS gio-2.0 gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES\"") >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES") 2>&5 +if test -n "$PKG_CONFIG"; then + if test -n "$EXTRA_GNOME_LIBS"; then + pkg_cv_EXTRA_GNOME_LIBS="$EXTRA_GNOME_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS launchpad-integration gtk+-2.0 >= \$GTK_REQS gio-2.0 gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS launchpad-integration gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_EXTRA_GNOME_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES" 2>/dev/null` + pkg_cv_EXTRA_GNOME_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQS launchpad-integration gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -22922,14 +23484,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES" 2>&1` + EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQS launchpad-integration gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES"` else - EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES" 2>&1` + EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQS launchpad-integration gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES"` fi # Put the nasty error message in config.log where it belongs echo "$EXTRA_GNOME_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES) were not met: + { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQS launchpad-integration gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES) were not met: $EXTRA_GNOME_PKG_ERRORS @@ -22940,7 +23502,7 @@ and EXTRA_GNOME_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES) were not met: +echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQS launchpad-integration gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES) were not met: $EXTRA_GNOME_PKG_ERRORS @@ -22999,10 +23561,11 @@ { echo "$as_me:$LINENO: checking for MM" >&5 echo $ECHO_N "checking for MM... $ECHO_C" >&6; } -if test -n "$MM_CFLAGS"; then - pkg_cv_MM_CFLAGS="$MM_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$MM_CFLAGS"; then + pkg_cv_MM_CFLAGS="$MM_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MM\"") >&5 ($PKG_CONFIG --exists --print-errors "$MM") 2>&5 ac_status=$? @@ -23012,13 +23575,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$MM_LIBS"; then - pkg_cv_MM_LIBS="$MM_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$MM_LIBS"; then + pkg_cv_MM_LIBS="$MM_LIBS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MM\"") >&5 ($PKG_CONFIG --exists --print-errors "$MM") 2>&5 ac_status=$? @@ -23028,8 +23593,9 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -23042,9 +23608,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - MM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$MM" 2>&1` + MM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$MM"` else - MM_PKG_ERRORS=`$PKG_CONFIG --print-errors "$MM" 2>&1` + MM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MM"` fi # Put the nasty error message in config.log where it belongs echo "$MM_PKG_ERRORS" >&5 @@ -23120,10 +23686,11 @@ { echo "$as_me:$LINENO: checking for GTK" >&5 echo $ECHO_N "checking for GTK... $ECHO_C" >&6; } -if test -n "$GTK_CFLAGS"; then - pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$GTK_CFLAGS"; then + pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0\"") >&5 ($PKG_CONFIG --exists --print-errors "gtk+-2.0 gthread-2.0") 2>&5 ac_status=$? @@ -23133,13 +23700,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$GTK_LIBS"; then - pkg_cv_GTK_LIBS="$GTK_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$GTK_LIBS"; then + pkg_cv_GTK_LIBS="$GTK_LIBS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0\"") >&5 ($PKG_CONFIG --exists --print-errors "gtk+-2.0 gthread-2.0") 2>&5 ac_status=$? @@ -23149,8 +23718,9 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -23163,9 +23733,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 gthread-2.0" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 gthread-2.0"` else - GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 gthread-2.0" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 gthread-2.0"` fi # Put the nasty error message in config.log where it belongs echo "$GTK_PKG_ERRORS" >&5 @@ -23497,10 +24067,11 @@ { echo "$as_me:$LINENO: checking for PYGTK" >&5 echo $ECHO_N "checking for PYGTK... $ECHO_C" >&6; } -if test -n "$PYGTK_CFLAGS"; then - pkg_cv_PYGTK_CFLAGS="$PYGTK_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$PYGTK_CFLAGS"; then + pkg_cv_PYGTK_CFLAGS="$PYGTK_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" pygtk-2.0 >= \$PYGTK_REQUIRED totem-plparser >= \$TOTEM_PLPARSER_REQS\"") >&5 @@ -23516,13 +24087,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$PYGTK_LIBS"; then - pkg_cv_PYGTK_LIBS="$PYGTK_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$PYGTK_LIBS"; then + pkg_cv_PYGTK_LIBS="$PYGTK_LIBS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" pygtk-2.0 >= \$PYGTK_REQUIRED totem-plparser >= \$TOTEM_PLPARSER_REQS\"") >&5 @@ -23538,8 +24111,9 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -23552,13 +24126,13 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " + PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " pygtk-2.0 >= $PYGTK_REQUIRED - totem-plparser >= $TOTEM_PLPARSER_REQS" 2>&1` + totem-plparser >= $TOTEM_PLPARSER_REQS"` else - PYGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors " + PYGTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " pygtk-2.0 >= $PYGTK_REQUIRED - totem-plparser >= $TOTEM_PLPARSER_REQS" 2>&1` + totem-plparser >= $TOTEM_PLPARSER_REQS"` fi # Put the nasty error message in config.log where it belongs echo "$PYGTK_PKG_ERRORS" >&5 @@ -23720,10 +24294,11 @@ { echo "$as_me:$LINENO: checking for VALA" >&5 echo $ECHO_N "checking for VALA... $ECHO_C" >&6; } -if test -n "$VALA_CFLAGS"; then - pkg_cv_VALA_CFLAGS="$VALA_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$VALA_CFLAGS"; then + pkg_cv_VALA_CFLAGS="$VALA_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vala-1.0 >= \$VALA_REQS\"") >&5 ($PKG_CONFIG --exists --print-errors "vala-1.0 >= $VALA_REQS") 2>&5 ac_status=$? @@ -23733,13 +24308,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$VALA_LIBS"; then - pkg_cv_VALA_LIBS="$VALA_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$VALA_LIBS"; then + pkg_cv_VALA_LIBS="$VALA_LIBS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vala-1.0 >= \$VALA_REQS\"") >&5 ($PKG_CONFIG --exists --print-errors "vala-1.0 >= $VALA_REQS") 2>&5 ac_status=$? @@ -23749,8 +24326,9 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -23763,9 +24341,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - VALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "vala-1.0 >= $VALA_REQS" 2>&1` + VALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "vala-1.0 >= $VALA_REQS"` else - VALA_PKG_ERRORS=`$PKG_CONFIG --print-errors "vala-1.0 >= $VALA_REQS" 2>&1` + VALA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "vala-1.0 >= $VALA_REQS"` fi # Put the nasty error message in config.log where it belongs echo "$VALA_PKG_ERRORS" >&5 @@ -23868,10 +24446,11 @@ { echo "$as_me:$LINENO: checking for LIBGALAGO" >&5 echo $ECHO_N "checking for LIBGALAGO... $ECHO_C" >&6; } -if test -n "$LIBGALAGO_CFLAGS"; then - pkg_cv_LIBGALAGO_CFLAGS="$LIBGALAGO_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$LIBGALAGO_CFLAGS"; then + pkg_cv_LIBGALAGO_CFLAGS="$LIBGALAGO_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgalago >= 0.5.2\"") >&5 ($PKG_CONFIG --exists --print-errors "libgalago >= 0.5.2") 2>&5 ac_status=$? @@ -23881,13 +24460,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$LIBGALAGO_LIBS"; then - pkg_cv_LIBGALAGO_LIBS="$LIBGALAGO_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$LIBGALAGO_LIBS"; then + pkg_cv_LIBGALAGO_LIBS="$LIBGALAGO_LIBS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgalago >= 0.5.2\"") >&5 ($PKG_CONFIG --exists --print-errors "libgalago >= 0.5.2") 2>&5 ac_status=$? @@ -23897,8 +24478,9 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -23911,9 +24493,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBGALAGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgalago >= 0.5.2" 2>&1` + LIBGALAGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgalago >= 0.5.2"` else - LIBGALAGO_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgalago >= 0.5.2" 2>&1` + LIBGALAGO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgalago >= 0.5.2"` fi # Put the nasty error message in config.log where it belongs echo "$LIBGALAGO_PKG_ERRORS" >&5 @@ -23941,10 +24523,11 @@ { echo "$as_me:$LINENO: checking for MEDIA_PLAYER_KEYS" >&5 echo $ECHO_N "checking for MEDIA_PLAYER_KEYS... $ECHO_C" >&6; } -if test -n "$MEDIA_PLAYER_KEYS_CFLAGS"; then - pkg_cv_MEDIA_PLAYER_KEYS_CFLAGS="$MEDIA_PLAYER_KEYS_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$MEDIA_PLAYER_KEYS_CFLAGS"; then + pkg_cv_MEDIA_PLAYER_KEYS_CFLAGS="$MEDIA_PLAYER_KEYS_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1\"") >&5 ($PKG_CONFIG --exists --print-errors "dbus-glib-1") 2>&5 ac_status=$? @@ -23954,13 +24537,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$MEDIA_PLAYER_KEYS_LIBS"; then - pkg_cv_MEDIA_PLAYER_KEYS_LIBS="$MEDIA_PLAYER_KEYS_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$MEDIA_PLAYER_KEYS_LIBS"; then + pkg_cv_MEDIA_PLAYER_KEYS_LIBS="$MEDIA_PLAYER_KEYS_LIBS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1\"") >&5 ($PKG_CONFIG --exists --print-errors "dbus-glib-1") 2>&5 ac_status=$? @@ -23970,8 +24555,9 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -23984,9 +24570,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - MEDIA_PLAYER_KEYS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1" 2>&1` + MEDIA_PLAYER_KEYS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1"` else - MEDIA_PLAYER_KEYS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1" 2>&1` + MEDIA_PLAYER_KEYS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1"` fi # Put the nasty error message in config.log where it belongs echo "$MEDIA_PLAYER_KEYS_PKG_ERRORS" >&5 @@ -24225,10 +24811,11 @@ { echo "$as_me:$LINENO: checking for GMYTH" >&5 echo $ECHO_N "checking for GMYTH... $ECHO_C" >&6; } -if test -n "$GMYTH_CFLAGS"; then - pkg_cv_GMYTH_CFLAGS="$GMYTH_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$GMYTH_CFLAGS"; then + pkg_cv_GMYTH_CFLAGS="$GMYTH_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmyth >= 0.3.0\"") >&5 ($PKG_CONFIG --exists --print-errors "gmyth >= 0.3.0") 2>&5 ac_status=$? @@ -24238,13 +24825,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$GMYTH_LIBS"; then - pkg_cv_GMYTH_LIBS="$GMYTH_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$GMYTH_LIBS"; then + pkg_cv_GMYTH_LIBS="$GMYTH_LIBS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmyth >= 0.3.0\"") >&5 ($PKG_CONFIG --exists --print-errors "gmyth >= 0.3.0") 2>&5 ac_status=$? @@ -24254,8 +24843,9 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -24268,9 +24858,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GMYTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmyth >= 0.3.0" 2>&1` + GMYTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gmyth >= 0.3.0"` else - GMYTH_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmyth >= 0.3.0" 2>&1` + GMYTH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gmyth >= 0.3.0"` fi # Put the nasty error message in config.log where it belongs echo "$GMYTH_PKG_ERRORS" >&5 @@ -24298,10 +24888,11 @@ { echo "$as_me:$LINENO: checking for BEMUSED" >&5 echo $ECHO_N "checking for BEMUSED... $ECHO_C" >&6; } -if test -n "$BEMUSED_CFLAGS"; then - pkg_cv_BEMUSED_CFLAGS="$BEMUSED_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$BEMUSED_CFLAGS"; then + pkg_cv_BEMUSED_CFLAGS="$BEMUSED_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"bluez\"") >&5 ($PKG_CONFIG --exists --print-errors "bluez") 2>&5 ac_status=$? @@ -24311,13 +24902,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$BEMUSED_LIBS"; then - pkg_cv_BEMUSED_LIBS="$BEMUSED_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$BEMUSED_LIBS"; then + pkg_cv_BEMUSED_LIBS="$BEMUSED_LIBS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"bluez\"") >&5 ($PKG_CONFIG --exists --print-errors "bluez") 2>&5 ac_status=$? @@ -24327,8 +24920,9 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -24341,9 +24935,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - BEMUSED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "bluez" 2>&1` + BEMUSED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "bluez"` else - BEMUSED_PKG_ERRORS=`$PKG_CONFIG --print-errors "bluez" 2>&1` + BEMUSED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "bluez"` fi # Put the nasty error message in config.log where it belongs echo "$BEMUSED_PKG_ERRORS" >&5 @@ -24371,10 +24965,11 @@ { echo "$as_me:$LINENO: checking for LIBEPC" >&5 echo $ECHO_N "checking for LIBEPC... $ECHO_C" >&6; } -if test -n "$LIBEPC_CFLAGS"; then - pkg_cv_LIBEPC_CFLAGS="$LIBEPC_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$LIBEPC_CFLAGS"; then + pkg_cv_LIBEPC_CFLAGS="$LIBEPC_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libepc-ui-1.0 >= 0.3.0\"") >&5 ($PKG_CONFIG --exists --print-errors "libepc-ui-1.0 >= 0.3.0") 2>&5 ac_status=$? @@ -24384,13 +24979,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$LIBEPC_LIBS"; then - pkg_cv_LIBEPC_LIBS="$LIBEPC_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$LIBEPC_LIBS"; then + pkg_cv_LIBEPC_LIBS="$LIBEPC_LIBS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libepc-ui-1.0 >= 0.3.0\"") >&5 ($PKG_CONFIG --exists --print-errors "libepc-ui-1.0 >= 0.3.0") 2>&5 ac_status=$? @@ -24400,8 +24997,9 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -24414,9 +25012,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBEPC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libepc-ui-1.0 >= 0.3.0" 2>&1` + LIBEPC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libepc-ui-1.0 >= 0.3.0"` else - LIBEPC_PKG_ERRORS=`$PKG_CONFIG --print-errors "libepc-ui-1.0 >= 0.3.0" 2>&1` + LIBEPC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libepc-ui-1.0 >= 0.3.0"` fi # Put the nasty error message in config.log where it belongs echo "$LIBEPC_PKG_ERRORS" >&5 @@ -24444,10 +25042,11 @@ { echo "$as_me:$LINENO: checking for TRACKER" >&5 echo $ECHO_N "checking for TRACKER... $ECHO_C" >&6; } -if test -n "$TRACKER_CFLAGS"; then - pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$TRACKER_CFLAGS"; then + pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker\"") >&5 ($PKG_CONFIG --exists --print-errors "tracker") 2>&5 ac_status=$? @@ -24457,13 +25056,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$TRACKER_LIBS"; then - pkg_cv_TRACKER_LIBS="$TRACKER_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$TRACKER_LIBS"; then + pkg_cv_TRACKER_LIBS="$TRACKER_LIBS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker\"") >&5 ($PKG_CONFIG --exists --print-errors "tracker") 2>&5 ac_status=$? @@ -24473,8 +25074,9 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -24487,9 +25089,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tracker" 2>&1` + TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tracker"` else - TRACKER_PKG_ERRORS=`$PKG_CONFIG --print-errors "tracker" 2>&1` + TRACKER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tracker"` fi # Put the nasty error message in config.log where it belongs echo "$TRACKER_PKG_ERRORS" >&5 @@ -24523,10 +25125,11 @@ { echo "$as_me:$LINENO: checking for GLIB" >&5 echo $ECHO_N "checking for GLIB... $ECHO_C" >&6; } -if test -n "$GLIB_CFLAGS"; then - pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$GLIB_CFLAGS"; then + pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.0\"") >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.0") 2>&5 ac_status=$? @@ -24536,13 +25139,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$GLIB_LIBS"; then - pkg_cv_GLIB_LIBS="$GLIB_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$GLIB_LIBS"; then + pkg_cv_GLIB_LIBS="$GLIB_LIBS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.0\"") >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.0") 2>&5 ac_status=$? @@ -24552,8 +25157,9 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -24566,9 +25172,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.15.0" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.15.0"` else - GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.15.0" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.15.0"` fi # Put the nasty error message in config.log where it belongs echo "$GLIB_PKG_ERRORS" >&5 @@ -24655,20 +25261,26 @@ fi - GECKOS="xulrunner firefox mozilla-firefox seamonkey mozilla" + GECKOS="xulrunner firefox mozilla-firefox seamonkey mozilla iceape" gecko=$with_gecko if test -z "$with_gecko"; then for g in $GECKOS; do + if $PKG_CONFIG --exists $g-plugin; then + gecko=$g + break; + fi if $PKG_CONFIG --exists $g-xpcom; then gecko=$g break; fi done elif ! $PKG_CONFIG --exists $gecko-xpcom; then - { { echo "$as_me:$LINENO: error: Gecko \"$gecko\" not found" >&5 + if ! $PKG_CONFIG --exists $gecko-plugin; then + { { echo "$as_me:$LINENO: error: Gecko \"$gecko\" not found" >&5 echo "$as_me: error: Gecko \"$gecko\" not found" >&2;} { (exit 1); exit 1; }; } + fi fi if test -z "$gecko" -a "$enable_browser_plugins" = "autodetect"; then @@ -24692,7 +25304,7 @@ case "$gecko" in mozilla) MOZILLA_VERSION_MIN=1.7 ;; - seamonkey) MOZILLA_VERSION_MIN=1.0 ;; + seamonkey|iceape) MOZILLA_VERSION_MIN=1.0 ;; *firefox) MOZILLA_VERSION_MIN=1.0 ;; xulrunner) MOZILLA_VERSION_MIN=1.8 ;; esac @@ -24711,48 +25323,126 @@ # Check for mozilla modules, but keep the CFLAGS and LIBS in # separate vars if test "$enable_browser_plugins" = "yes" ; then + if $PKG_CONFIG --exists $MOZILLA-plugin; then + MOZILLA_VERSION_MIN=1.9 + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for MOZILLA_NOT_LINKED" >&5 +echo $ECHO_N "checking for MOZILLA_NOT_LINKED... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$MOZILLA_NOT_LINKED_CFLAGS"; then + pkg_cv_MOZILLA_NOT_LINKED_CFLAGS="$MOZILLA_NOT_LINKED_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxul \$MOZILLA-plugin >= \$MOZILLA_VERSION_MIN\"") >&5 + ($PKG_CONFIG --exists --print-errors "libxul $MOZILLA-plugin >= $MOZILLA_VERSION_MIN") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_MOZILLA_NOT_LINKED_CFLAGS=`$PKG_CONFIG --cflags "libxul $MOZILLA-plugin >= $MOZILLA_VERSION_MIN" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$MOZILLA_NOT_LINKED_LIBS"; then + pkg_cv_MOZILLA_NOT_LINKED_LIBS="$MOZILLA_NOT_LINKED_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxul \$MOZILLA-plugin >= \$MOZILLA_VERSION_MIN\"") >&5 + ($PKG_CONFIG --exists --print-errors "libxul $MOZILLA-plugin >= $MOZILLA_VERSION_MIN") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_MOZILLA_NOT_LINKED_LIBS=`$PKG_CONFIG --libs "libxul $MOZILLA-plugin >= $MOZILLA_VERSION_MIN" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +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 + MOZILLA_NOT_LINKED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxul $MOZILLA-plugin >= $MOZILLA_VERSION_MIN"` + else + MOZILLA_NOT_LINKED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxul $MOZILLA-plugin >= $MOZILLA_VERSION_MIN"` + fi + # Put the nasty error message in config.log where it belongs + echo "$MOZILLA_NOT_LINKED_PKG_ERRORS" >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + enable_browser_plugins=no +elif test $pkg_failed = untried; then + enable_browser_plugins=no +else + MOZILLA_NOT_LINKED_CFLAGS=$pkg_cv_MOZILLA_NOT_LINKED_CFLAGS + MOZILLA_NOT_LINKED_LIBS=$pkg_cv_MOZILLA_NOT_LINKED_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + : +fi + else pkg_failed=no { echo "$as_me:$LINENO: checking for MOZILLA_NOT_LINKED" >&5 echo $ECHO_N "checking for MOZILLA_NOT_LINKED... $ECHO_C" >&6; } -if test -n "$MOZILLA_NOT_LINKED_CFLAGS"; then - pkg_cv_MOZILLA_NOT_LINKED_CFLAGS="$MOZILLA_NOT_LINKED_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$MOZILLA_NOT_LINKED_CFLAGS"; then + pkg_cv_MOZILLA_NOT_LINKED_CFLAGS="$MOZILLA_NOT_LINKED_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA-xpcom >= \$MOZILLA_VERSION_MIN \\ - \$MOZILLA-plugin\"") >&5 + \$MOZILLA-plugin\"") >&5 ($PKG_CONFIG --exists --print-errors "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \ - $MOZILLA-plugin") 2>&5 + $MOZILLA-plugin") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_MOZILLA_NOT_LINKED_CFLAGS=`$PKG_CONFIG --cflags "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \ - $MOZILLA-plugin" 2>/dev/null` + $MOZILLA-plugin" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$MOZILLA_NOT_LINKED_LIBS"; then - pkg_cv_MOZILLA_NOT_LINKED_LIBS="$MOZILLA_NOT_LINKED_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$MOZILLA_NOT_LINKED_LIBS"; then + pkg_cv_MOZILLA_NOT_LINKED_LIBS="$MOZILLA_NOT_LINKED_LIBS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA-xpcom >= \$MOZILLA_VERSION_MIN \\ - \$MOZILLA-plugin\"") >&5 + \$MOZILLA-plugin\"") >&5 ($PKG_CONFIG --exists --print-errors "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \ - $MOZILLA-plugin") 2>&5 + $MOZILLA-plugin") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_MOZILLA_NOT_LINKED_LIBS=`$PKG_CONFIG --libs "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \ - $MOZILLA-plugin" 2>/dev/null` + $MOZILLA-plugin" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -24765,11 +25455,11 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - MOZILLA_NOT_LINKED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \ - $MOZILLA-plugin" 2>&1` + MOZILLA_NOT_LINKED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \ + $MOZILLA-plugin"` else - MOZILLA_NOT_LINKED_PKG_ERRORS=`$PKG_CONFIG --print-errors "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \ - $MOZILLA-plugin" 2>&1` + MOZILLA_NOT_LINKED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \ + $MOZILLA-plugin"` fi # Put the nasty error message in config.log where it belongs echo "$MOZILLA_NOT_LINKED_PKG_ERRORS" >&5 @@ -24786,6 +25476,7 @@ echo "${ECHO_T}yes" >&6; } : fi + fi fi # Check for other required modules, and merge CFLAGS, but not link # flags to avoid linking against -lxpcom -lplds4 -lplc4 -lnspr4 @@ -24795,61 +25486,65 @@ { echo "$as_me:$LINENO: checking for BROWSER_PLUGIN" >&5 echo $ECHO_N "checking for BROWSER_PLUGIN... $ECHO_C" >&6; } -if test -n "$BROWSER_PLUGIN_CFLAGS"; then - pkg_cv_BROWSER_PLUGIN_CFLAGS="$BROWSER_PLUGIN_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$BROWSER_PLUGIN_CFLAGS"; then + pkg_cv_BROWSER_PLUGIN_CFLAGS="$BROWSER_PLUGIN_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 - gnome-vfs-2.0 >= \$GNOMEVFS_REQS - gnome-vfs-module-2.0 >= \$GNOMEVFS_REQS - gthread-2.0 - totem-plparser-mini >= \$TOTEM_PLPARSER_REQS\"") >&5 + gnome-vfs-2.0 >= \$GNOMEVFS_REQS + gnome-vfs-module-2.0 >= \$GNOMEVFS_REQS + gthread-2.0 + totem-plparser-mini >= \$TOTEM_PLPARSER_REQS\"") >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 - gnome-vfs-2.0 >= $GNOMEVFS_REQS - gnome-vfs-module-2.0 >= $GNOMEVFS_REQS - gthread-2.0 - totem-plparser-mini >= $TOTEM_PLPARSER_REQS") 2>&5 + gnome-vfs-2.0 >= $GNOMEVFS_REQS + gnome-vfs-module-2.0 >= $GNOMEVFS_REQS + gthread-2.0 + totem-plparser-mini >= $TOTEM_PLPARSER_REQS") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_BROWSER_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 - gnome-vfs-2.0 >= $GNOMEVFS_REQS - gnome-vfs-module-2.0 >= $GNOMEVFS_REQS - gthread-2.0 - totem-plparser-mini >= $TOTEM_PLPARSER_REQS" 2>/dev/null` + gnome-vfs-2.0 >= $GNOMEVFS_REQS + gnome-vfs-module-2.0 >= $GNOMEVFS_REQS + gthread-2.0 + totem-plparser-mini >= $TOTEM_PLPARSER_REQS" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$BROWSER_PLUGIN_LIBS"; then - pkg_cv_BROWSER_PLUGIN_LIBS="$BROWSER_PLUGIN_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$BROWSER_PLUGIN_LIBS"; then + pkg_cv_BROWSER_PLUGIN_LIBS="$BROWSER_PLUGIN_LIBS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 - gnome-vfs-2.0 >= \$GNOMEVFS_REQS - gnome-vfs-module-2.0 >= \$GNOMEVFS_REQS - gthread-2.0 - totem-plparser-mini >= \$TOTEM_PLPARSER_REQS\"") >&5 + gnome-vfs-2.0 >= \$GNOMEVFS_REQS + gnome-vfs-module-2.0 >= \$GNOMEVFS_REQS + gthread-2.0 + totem-plparser-mini >= \$TOTEM_PLPARSER_REQS\"") >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 - gnome-vfs-2.0 >= $GNOMEVFS_REQS - gnome-vfs-module-2.0 >= $GNOMEVFS_REQS - gthread-2.0 - totem-plparser-mini >= $TOTEM_PLPARSER_REQS") 2>&5 + gnome-vfs-2.0 >= $GNOMEVFS_REQS + gnome-vfs-module-2.0 >= $GNOMEVFS_REQS + gthread-2.0 + totem-plparser-mini >= $TOTEM_PLPARSER_REQS") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_BROWSER_PLUGIN_LIBS=`$PKG_CONFIG --libs "glib-2.0 - gnome-vfs-2.0 >= $GNOMEVFS_REQS - gnome-vfs-module-2.0 >= $GNOMEVFS_REQS - gthread-2.0 - totem-plparser-mini >= $TOTEM_PLPARSER_REQS" 2>/dev/null` + gnome-vfs-2.0 >= $GNOMEVFS_REQS + gnome-vfs-module-2.0 >= $GNOMEVFS_REQS + gthread-2.0 + totem-plparser-mini >= $TOTEM_PLPARSER_REQS" 2>/dev/null` else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -24862,17 +25557,17 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 - gnome-vfs-2.0 >= $GNOMEVFS_REQS - gnome-vfs-module-2.0 >= $GNOMEVFS_REQS - gthread-2.0 - totem-plparser-mini >= $TOTEM_PLPARSER_REQS" 2>&1` + BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 + gnome-vfs-2.0 >= $GNOMEVFS_REQS + gnome-vfs-module-2.0 >= $GNOMEVFS_REQS + gthread-2.0 + totem-plparser-mini >= $TOTEM_PLPARSER_REQS"` else - BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 - gnome-vfs-2.0 >= $GNOMEVFS_REQS - gnome-vfs-module-2.0 >= $GNOMEVFS_REQS - gthread-2.0 - totem-plparser-mini >= $TOTEM_PLPARSER_REQS" 2>&1` + BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 + gnome-vfs-2.0 >= $GNOMEVFS_REQS + gnome-vfs-module-2.0 >= $GNOMEVFS_REQS + gthread-2.0 + totem-plparser-mini >= $TOTEM_PLPARSER_REQS"` fi # Put the nasty error message in config.log where it belongs echo "$BROWSER_PLUGIN_PKG_ERRORS" >&5 @@ -24892,6 +25587,10 @@ BROWSER_PLUGIN_CFLAGS="$MOZILLA_NOT_LINKED_CFLAGS $BROWSER_PLUGIN_CFLAGS" + # for xul 1.9 we have to link anyway + if test "$MOZILLA_VERSION_MIN" = 1.9; then + BROWSER_PLUGIN_LIBS="$MOZILLA_NOT_LINKED_LIBS $BROWSER_PLUGIN_LIBS" + fi # Earlier versions misdetect playlists @@ -24919,10 +25618,11 @@ { echo "$as_me:$LINENO: checking for DBUS" >&5 echo $ECHO_N "checking for DBUS... $ECHO_C" >&6; } -if test -n "$DBUS_CFLAGS"; then - pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$DBUS_CFLAGS"; then + pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\"") >&5 ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQS") 2>&5 ac_status=$? @@ -24932,13 +25632,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$DBUS_LIBS"; then - pkg_cv_DBUS_LIBS="$DBUS_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$DBUS_LIBS"; then + pkg_cv_DBUS_LIBS="$DBUS_LIBS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\"") >&5 ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQS") 2>&5 ac_status=$? @@ -24948,8 +25650,9 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -24962,9 +25665,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_REQS" 2>&1` + DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_REQS"` else - DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_REQS" 2>&1` + DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_REQS"` fi # Put the nasty error message in config.log where it belongs echo "$DBUS_PKG_ERRORS" >&5 @@ -25038,10 +25741,11 @@ { echo "$as_me:$LINENO: checking for SN" >&5 echo $ECHO_N "checking for SN... $ECHO_C" >&6; } -if test -n "$SN_CFLAGS"; then - pkg_cv_SN_CFLAGS="$SN_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$SN_CFLAGS"; then + pkg_cv_SN_CFLAGS="$SN_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" libstartup-notification-1.0 >= 0.8 \"") >&5 ($PKG_CONFIG --exists --print-errors " libstartup-notification-1.0 >= 0.8 ") 2>&5 ac_status=$? @@ -25051,13 +25755,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$SN_LIBS"; then - pkg_cv_SN_LIBS="$SN_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$SN_LIBS"; then + pkg_cv_SN_LIBS="$SN_LIBS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" libstartup-notification-1.0 >= 0.8 \"") >&5 ($PKG_CONFIG --exists --print-errors " libstartup-notification-1.0 >= 0.8 ") 2>&5 ac_status=$? @@ -25067,8 +25773,9 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -25081,9 +25788,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " libstartup-notification-1.0 >= 0.8 " 2>&1` + SN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " libstartup-notification-1.0 >= 0.8 "` else - SN_PKG_ERRORS=`$PKG_CONFIG --print-errors " libstartup-notification-1.0 >= 0.8 " 2>&1` + SN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " libstartup-notification-1.0 >= 0.8 "` fi # Put the nasty error message in config.log where it belongs echo "$SN_PKG_ERRORS" >&5 @@ -25108,10 +25815,18 @@ # Sets some variables, and check for xpidl if test "$enable_browser_plugins" = "yes" ; then - MOZILLA_PREFIX="`$PKG_CONFIG $MOZILLA-xpcom --variable=prefix`" - MOZILLA_LIBDIR="`$PKG_CONFIG $MOZILLA-xpcom --variable=libdir`" - MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-xpcom`" - MOZILLA_XPCOM_CFLAGS="-I`$PKG_CONFIG --variable=includedir $MOZILLA-xpcom`" + if $PKG_CONFIG --exists $MOZILLA-plugin; then + MOZILLA_PREFIX="`$PKG_CONFIG $MOZILLA-plugin --variable=prefix`" + MOZILLA_LIBDIR="`$PKG_CONFIG $MOZILLA-plugin --variable=sdkdir`/bin" + MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-plugin`" + MOZILLA_XPCOM_CFLAGS="`$PKG_CONFIG --cflags $MOZILLA-plugin` `$PKG_CONFIG --cflags libxul-unstable`" + else + MOZILLA_PREFIX="`$PKG_CONFIG $MOZILLA-plugin --variable=prefix`" + MOZILLA_LIBDIR="`$PKG_CONFIG $MOZILLA-plugin --variable=libdir`" + MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-xpcom`" + MOZILLA_XPCOM_CFLAGS="`$PKG_CONFIG --cflags $MOZILLA-xpcom`" + fi + MOZILLA_PLUGINDIR="${MOZILLA_PLUGINDIR:-"\${libdir}/mozilla/plugins"}" # Extract the first word of "xpidl", so it can be a program name with args. @@ -25219,7 +25934,11 @@ # Search for the idl include directory if test "$enable_browser_plugins" = "yes" ; then + if $PKG_CONFIG --exists libxul; then + MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir libxul`/unstable" + else MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir $MOZILLA-xpcom`" + fi if test "x$MOZILLA_IDLDIR" = "x"; then MOZILLA_IDLDIR="`echo $MOZILLA_LIBDIR | sed -e s!lib!share/idl!`" fi @@ -25265,8 +25984,14 @@ CPPFLAGS="$CPPFLAGS -I$MOZILLA_INCLUDE_ROOT" CXXFLAGS="$CXXFLAGS $MOZILLA_NOT_LINKED_CFLAGS" - LIBS="$LIBS -L$MOZILLA_LIBDIR -lxpcom -lxpcomglue_s" - LDFLAGS="$LDFLAGS -Wl,--rpath -Wl,$MOZILLA_LIBDIR" + if test $MOZILLA_VERSION_MIN = 1.9; then + CPPFLAGS="$CPPFLAGS -I$MOZILLA_INCLUDE_ROOT/unstable" + LIBS="$LIBS $MOZILLA_NOT_LINKED_LIBS" + LDFLAGS="$LDFLAGS -Wl,--rpath -Wl,$MOZILLA_LIBDIR" + else + LIBS="$LIBS -L$MOZILLA_LIBDIR -lxpcom -lxpcomglue_s" + LDFLAGS="$LDFLAGS -Wl,--rpath -Wl,$MOZILLA_LIBDIR" + fi { echo "$as_me:$LINENO: checking for libxpcomglue_s" >&5 echo $ECHO_N "checking for libxpcomglue_s... $ECHO_C" >&6; } @@ -25334,7 +26059,11 @@ if test "$have_libxpcomglue_s" = "yes"; then - LIBXPCOMGLUE_S="-L$MOZILLA_LIBDIR -lxpcomglue_s" + if test $MOZILLA_VERSION_MIN = 1.9; then + LIBXPCOMGLUE_S="$MOZILLA_NOT_LINKED_LIBS" + else + LIBXPCOMGLUE_S="-L$MOZILLA_LIBDIR -lxpcomglue_s" + fi else { echo "$as_me:$LINENO: WARNING: libxpcomglue_s not available; plugins may not be portable" >&5 echo "$as_me: WARNING: libxpcomglue_s not available; plugins may not be portable" >&2;} @@ -25424,7 +26153,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu __SAVE_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $MOZILLA_NOT_LINKED_CFLAGS -I$MOZILLA_INCLUDE_ROOT -I$MOZILLA_INCLUDE_ROOT/xpcom" + CPPFLAGS="$CPPFLAGS $MOZILLA_NOT_LINKED_CFLAGS -I$MOZILLA_INCLUDE_ROOT/xpcom -I$MOZILLA_INCLUDE_ROOT/unstable -I$MOZILLA_INCLUDE_ROOT/stable" @@ -25788,10 +26517,11 @@ { echo "$as_me:$LINENO: checking for NAUTILUS" >&5 echo $ECHO_N "checking for NAUTILUS... $ECHO_C" >&6; } -if test -n "$NAUTILUS_CFLAGS"; then - pkg_cv_NAUTILUS_CFLAGS="$NAUTILUS_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$NAUTILUS_CFLAGS"; then + pkg_cv_NAUTILUS_CFLAGS="$NAUTILUS_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0 libnautilus-extension\"") >&5 ($PKG_CONFIG --exists --print-errors "gtk+-2.0 gthread-2.0 libnautilus-extension") 2>&5 ac_status=$? @@ -25801,13 +26531,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$NAUTILUS_LIBS"; then - pkg_cv_NAUTILUS_LIBS="$NAUTILUS_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$NAUTILUS_LIBS"; then + pkg_cv_NAUTILUS_LIBS="$NAUTILUS_LIBS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0 libnautilus-extension\"") >&5 ($PKG_CONFIG --exists --print-errors "gtk+-2.0 gthread-2.0 libnautilus-extension") 2>&5 ac_status=$? @@ -25817,8 +26549,9 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -25831,9 +26564,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 gthread-2.0 libnautilus-extension" 2>&1` + NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 gthread-2.0 libnautilus-extension"` else - NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 gthread-2.0 libnautilus-extension" 2>&1` + NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 gthread-2.0 libnautilus-extension"` fi # Put the nasty error message in config.log where it belongs echo "$NAUTILUS_PKG_ERRORS" >&5 @@ -25887,10 +26620,11 @@ { echo "$as_me:$LINENO: checking for DBUS" >&5 echo $ECHO_N "checking for DBUS... $ECHO_C" >&6; } -if test -n "$DBUS_CFLAGS"; then - pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$DBUS_CFLAGS"; then + pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\"") >&5 ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQS") 2>&5 ac_status=$? @@ -25900,13 +26634,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$DBUS_LIBS"; then - pkg_cv_DBUS_LIBS="$DBUS_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$DBUS_LIBS"; then + pkg_cv_DBUS_LIBS="$DBUS_LIBS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\"") >&5 ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQS") 2>&5 ac_status=$? @@ -25916,8 +26652,9 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -25930,9 +26667,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_REQS" 2>&1` + DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_REQS"` else - DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_REQS" 2>&1` + DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_REQS"` fi # Put the nasty error message in config.log where it belongs echo "$DBUS_PKG_ERRORS" >&5 @@ -26300,10 +27037,11 @@ { echo "$as_me:$LINENO: checking for XVIDMODE" >&5 echo $ECHO_N "checking for XVIDMODE... $ECHO_C" >&6; } -if test -n "$XVIDMODE_CFLAGS"; then - pkg_cv_XVIDMODE_CFLAGS="$XVIDMODE_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$XVIDMODE_CFLAGS"; then + pkg_cv_XVIDMODE_CFLAGS="$XVIDMODE_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.1.1 xxf86vm >= 1.0.1\"") >&5 ($PKG_CONFIG --exists --print-errors "xrandr >= 1.1.1 xxf86vm >= 1.0.1") 2>&5 ac_status=$? @@ -26313,13 +27051,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$XVIDMODE_LIBS"; then - pkg_cv_XVIDMODE_LIBS="$XVIDMODE_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$XVIDMODE_LIBS"; then + pkg_cv_XVIDMODE_LIBS="$XVIDMODE_LIBS" + else + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.1.1 xxf86vm >= 1.0.1\"") >&5 ($PKG_CONFIG --exists --print-errors "xrandr >= 1.1.1 xxf86vm >= 1.0.1") 2>&5 ac_status=$? @@ -26329,8 +27069,9 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -26343,9 +27084,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XVIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xrandr >= 1.1.1 xxf86vm >= 1.0.1" 2>&1` + XVIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xrandr >= 1.1.1 xxf86vm >= 1.0.1"` else - XVIDMODE_PKG_ERRORS=`$PKG_CONFIG --print-errors "xrandr >= 1.1.1 xxf86vm >= 1.0.1" 2>&1` + XVIDMODE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xrandr >= 1.1.1 xxf86vm >= 1.0.1"` fi # Put the nasty error message in config.log where it belongs echo "$XVIDMODE_PKG_ERRORS" >&5 @@ -27558,9 +28299,6 @@ # AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" -INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' -prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" -INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' _ACEOF @@ -27573,7 +28311,6 @@ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; - "intltool") CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "totem.spec") CONFIG_FILES="$CONFIG_FILES totem.spec" ;; "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; @@ -27773,8 +28510,8 @@ POFILES!$POFILES$ac_delim POSUB!$POSUB$ac_delim MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim -INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim -INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim +INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim +INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -27816,6 +28553,9 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim +INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim +INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim INTLTOOL_PROP_RULE!$INTLTOOL_PROP_RULE$ac_delim INTLTOOL_OAF_RULE!$INTLTOOL_OAF_RULE$ac_delim @@ -27834,9 +28574,6 @@ INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim MSGMERGE!$MSGMERGE$ac_delim -INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim -INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim -INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim ALL_LINGUAS!$ALL_LINGUAS$ac_delim PKG_CONFIG!$PKG_CONFIG$ac_delim @@ -27867,6 +28604,8 @@ ECHO!$ECHO$ac_delim AR!$AR$ac_delim RANLIB!$RANLIB$ac_delim +DSYMUTIL!$DSYMUTIL$ac_delim +NMEDIT!$NMEDIT$ac_delim CXXCPP!$CXXCPP$ac_delim F77!$F77$ac_delim FFLAGS!$FFLAGS$ac_delim @@ -27911,8 +28650,6 @@ PYTHON_EXTRA_LIBS!$PYTHON_EXTRA_LIBS$ac_delim PYGTK_CFLAGS!$PYGTK_CFLAGS$ac_delim PYGTK_LIBS!$PYGTK_LIBS$ac_delim -PYGTK_DEFSDIR!$PYGTK_DEFSDIR$ac_delim -PYGTK_CODEGEN!$PYGTK_CODEGEN$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -27954,6 +28691,8 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +PYGTK_DEFSDIR!$PYGTK_DEFSDIR$ac_delim +PYGTK_CODEGEN!$PYGTK_CODEGEN$ac_delim PYGTK_H2DEF!$PYGTK_H2DEF$ac_delim NO_STRICT_ALIASING_CFLAGS!$NO_STRICT_ALIASING_CFLAGS$ac_delim ENABLE_PYTHON_TRUE!$ENABLE_PYTHON_TRUE$ac_delim @@ -28049,7 +28788,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 93; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 95; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -28619,23 +29358,6 @@ "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*) sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile esac ;; - "intltool":C) - -for file in intltool-extract intltool-merge intltool-update; do - sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ - -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ - -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ - < ${ac_aux_dir}/${file}.in > ${file}.out - if cmp -s ${file} ${file}.out 2>/dev/null; then - rm -f ${file}.out - else - mv -f ${file}.out ${file} - fi - chmod ugo+x ${file} - chmod u+w ${file} -done - - ;; "po/stamp-it":C) rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" >"po/stamp-it.tmp" --- totem-2.23.3.orig/config.guess +++ totem-2.23.3/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2008-01-08' +timestamp='2008-01-23' # 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 @@ -1484,9 +1484,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD and - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be --- totem-2.23.3.orig/Makefile.in +++ totem-2.23.3/Makefile.in @@ -112,6 +112,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -210,6 +211,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/debian/watch +++ totem-2.23.3/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://download.gnome.org/sources/totem/([\d\.]+)[02468]/totem-([\d\.]+)\.tar\.gz --- totem-2.23.3.orig/debian/totem-mozilla.links +++ totem-2.23.3/debian/totem-mozilla.links @@ -0,0 +1,20 @@ +/usr/lib/totem/default/libtotem-basic-plugin.so /usr/lib/mozilla/plugins/libtotem-basic-plugin.so +/usr/lib/totem/default/libtotem-basic-plugin.xpt /usr/lib/mozilla/plugins/libtotem-basic-plugin.xpt +/usr/lib/totem/default/libtotem-gmp-plugin.so /usr/lib/mozilla/plugins/libtotem-gmp-plugin.so +/usr/lib/totem/default/libtotem-gmp-plugin.xpt /usr/lib/mozilla/plugins/libtotem-gmp-plugin.xpt +/usr/lib/totem/default/libtotem-complex-plugin.so /usr/lib/mozilla/plugins/libtotem-complex-plugin.so +/usr/lib/totem/default/libtotem-complex-plugin.xpt /usr/lib/mozilla/plugins/libtotem-complex-plugin.xpt +/usr/lib/totem/default/libtotem-mully-plugin.so /usr/lib/mozilla/plugins/libtotem-mully-plugin.so +/usr/lib/totem/default/libtotem-mully-plugin.xpt /usr/lib/mozilla/plugins/libtotem-mully-plugin.xpt +/usr/lib/totem/default/libtotem-narrowspace-plugin.so /usr/lib/mozilla/plugins/libtotem-narrowspace-plugin.so +/usr/lib/totem/default/libtotem-narrowspace-plugin.xpt /usr/lib/mozilla/plugins/libtotem-narrowspace-plugin.xpt +/usr/lib/totem/default/libtotem-basic-plugin.so /usr/lib/xulrunner-addons/plugins/libtotem-basic-plugin.so +/usr/lib/totem/default/libtotem-basic-plugin.xpt /usr/lib/xulrunner-addons/plugins/libtotem-basic-plugin.xpt +/usr/lib/totem/default/libtotem-gmp-plugin.so /usr/lib/xulrunner-addons/plugins/libtotem-gmp-plugin.so +/usr/lib/totem/default/libtotem-gmp-plugin.xpt /usr/lib/xulrunner-addons/plugins/libtotem-gmp-plugin.xpt +/usr/lib/totem/default/libtotem-complex-plugin.so /usr/lib/xulrunner-addons/plugins/libtotem-complex-plugin.so +/usr/lib/totem/default/libtotem-complex-plugin.xpt /usr/lib/xulrunner-addons/plugins/libtotem-complex-plugin.xpt +/usr/lib/totem/default/libtotem-mully-plugin.so /usr/lib/xulrunner-addons/plugins/libtotem-mully-plugin.so +/usr/lib/totem/default/libtotem-mully-plugin.xpt /usr/lib/xulrunner-addons/plugins/libtotem-mully-plugin.xpt +/usr/lib/totem/default/libtotem-narrowspace-plugin.so /usr/lib/xulrunner-addons/plugins/libtotem-narrowspace-plugin.so +/usr/lib/totem/default/libtotem-narrowspace-plugin.xpt /usr/lib/xulrunner-addons/plugins/libtotem-narrowspace-plugin.xpt --- totem-2.23.3.orig/debian/test.html +++ totem-2.23.3/debian/test.html @@ -0,0 +1,51 @@ + + +Test + + +
+

PIMP

+

PIMP Internet Media Player

+ + + + + + + + + +
+ +
+ + + + + +
+ +
+ + --- totem-2.23.3.orig/debian/changelog +++ totem-2.23.3/debian/changelog @@ -0,0 +1,1252 @@ +totem (2.23.3-0ubuntu1) intrepid; urgency=low + + * New upstream version + * Sync on Debian + * debian/control.in: + - build depend on liblaunchpad-integration-dev + - don't build using libepc and galago those are in universe + - list Xb-Npp-xxx tags + - list totem-plugins-extra variant + - suggests gstreamer0.10-plugins-ugly and gstreamer0.10-ffmpeg + rather than recommends + - suggests gnome-app-install too + - updated maintainer information + - use firefox and not the debian iceweasel + * debian/patches/02_lpi.patch: + - launchpad-integration + * debian/patches/04_desktop_gettext_domain.patch: + - Add gettext domain to .desktop file to get language pack support. + * debian/patches/30_totem_xulrunner19.patch: + - build using xulrunner-1.9 + * debian/patches/60_build_libbaconvideowidget_statically.patch: + - don't build libbaconvideowidget dynamically to not create a conflict + between the variants + * debian/patches/70_autoconf.patch: + - updated + * debian/totem-mozilla.links: + - use xulrunner and not the debian iceweasel + * debian/rules: + - build the totem-plugins-extra variant and use the mozilla gecko + - symlink identic documentation files to win space + - updated translations template + + -- Sebastien Bacher Tue, 10 Jun 2008 16:38:58 +0200 + +totem (2.22.2-3) unstable; urgency=low + + * debian/control.in, + debian/rules: + + Disable vala support for now. It only builds a sample plugin anyway + and thus is rather useless. Fixes FTBFS with newer valac. + + -- Sebastian Dröge Thu, 22 May 2008 10:01:33 +0200 + +totem (2.22.2-2) unstable; urgency=low + + [ Sam Morris ] + * Only totem-xine can satisfactorily play DVDs and VCds (it can do + de-interlacing and menus), so update its .desktop files to reflect this. + This only affects nautilus 2.22, which has taken over the job of launching + progrems when media are inserted in GNOME 2.22. + + [ Josselin Mouette ] + * Build-depend on iceape-dev 1.1.9-5. + * Use the iceape gecko variant. This way it should work with both + gecko 1.8 and 1.9. Closes: #479344, #480809. + * 01_gecko_iceape.patch: support iceape as a valid gecko variant. + * 70_autoconf.patch: re-run autoconf on top of that. + * Require debhelper 5.0.51 for dh_icons. + * Build-depend on python-support; call dh_pysupport; depend on + ${python:Depends}. Adds correct dependencies for the python scripts + in totem-{gstreamer,xine} and the module in totem-plugins. + + -- Josselin Mouette Mon, 12 May 2008 15:04:36 +0200 + +totem (2.22.2-1) unstable; urgency=low + + * New upstream bugfix release. + + -- Sebastian Dröge Thu, 24 Apr 2008 12:10:38 +0200 + +totem (2.22.1-1) unstable; urgency=low + + * New upstream release. + * Add an update-alternative slave for audio-preview per flavor; LP: #199701; + see also Debian #472370. + + -- Loic Minier Mon, 24 Mar 2008 20:22:26 +0100 + +totem (2.22.0-2) unstable; urgency=high + + [ Emilio Pozuelo Monfort ] + * debian/control: + - Remove duplicated libepc-ui-dev build dependency. + + [ Loic Minier ] + * Merge below changes by Steve Langasek again; these were not applied to the + experimental branch; doh! + + [ Steve Langasek ] + * Auto-generate totem-{xine,gstreamer}.postinst from new + debian/totem-flavor.postinst.in in the install target + * Substitute the pkg-config variable into the generated postinst also, + so that the update-alternatives slave for the nautilus extension is + kept in sync with the ABI. + + -- Emilio Pozuelo Monfort Sun, 23 Mar 2008 20:20:36 +0100 + +totem (2.22.0-1) unstable; urgency=low + + [ Sam Morris ] + * New upstream development release. + - Build-depend on libepc-ui-dev 0.3 for publish plugin. + - Build-depend on libglib2.0-dev 2.15. + - Build-depend on libgnome-keyring-dev. + - Build-depend on libstartup-notification0-dev 0.8 for web browser plugin. + - Build-depend on libtrackerclient-dev for tracker plugin. + - Build-depend on python-gtk2-dev 2.12. + - Build-depend on valac, libvala-dev 0.1.16. + - Build-depend on libgtk2.0-dev 2.12.6. + - Drop build-dependency on libgnome-desktop-dev. + - Drop build-dependency on libgnome-settings-daemon-dev. + * totem-pl-parser library was split into a separate source package. + - Build-depend on libtotem-plparser-dev 2.21.90. + - Drop libtotem-parser7 and libtotem-plparser-dev packages. + - Drop 30_kfreebsd_gnu.patch. + * Drop 25_revert-xine-reqs-bump.patch: a new enough xine is new present in + unstable. Also drop 70_autoconf.patch as we no longer patch configure.in. + * Update totem-plugins description with entries for new plugins. + * Include check-dist.mk in rules file to prevent accidental uploads to + unstable. + + [ Emilio Pozuelo Monfort ] + * Fix Homepage field in debian/control. Thanks to Amaya Rodrigo. + Closes: #464354. + * Build-depend on libepc-ui-dev to build the Publisher plugin. + + [ Josselin Mouette ] + * Fix capitalization of GNOME and GStreamer. + + [ Sebastian Dröge ] + * debian/rules: + + Call dh_icons and dh_shlibdeps. + + Don't ship *.py[co], taken from the Ubuntu package. + + Don't hardcode nautilus-extension directory, taken from the + Ubuntu package. + + Upload to unstable, drop check-dist include. + * debian/control.in: + + Update build dependencies. + + Build depend on libgmyth-dev. + + -- Sebastian Dröge Thu, 13 Mar 2008 15:08:06 +0100 + +totem (2.20.3-1) unstable; urgency=low + + [ Loic Minier ] + * Let totem-common and totem-plugins replace totem-xine and -gstreamer. + + [ Josselin Mouette ] + * Fix totem-dbg's section, see #457534. + * totem-xine recommends libxine1-gnome. + + [ Sebastien Bacher ] + * use change from launchpad bug #177459 to fix bashim in the debian rules + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/patches/70_autoconf.patch: + - Regenerated for the new version. + * debian/control.in: + + Update Standards-Version to 3.7.3, no additional changes needed. + + Use Homepage field. + + -- Sebastian Dröge Mon, 07 Jan 2008 21:49:41 +0100 + +totem (2.20.1-1) unstable; urgency=low + + [ Loic Minier ] + * Cleanup whitespace. + + [ Josselin Mouette ] + * totem depends on totem-plugins. Closes: #445675. + * Conflict against totem-mozilla (<< 2.20.0-3). Closes: #448554. + * debian/bug/control: ship a bug control file in totem to correctly + report dependencies of totem-{gstreamer,xine}. + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/control: + - Build depend on Gtk >= 2.12.1 as per configure.in. + + debian/patches/60_gnome-doc-utils.patch: + - Dropped, upstream uses new enough gnome-doc-utils now. + + debian/patches/70_autoconf.patch: + - Regenerated for the new version. + + -- Josselin Mouette Sun, 25 Nov 2007 13:15:19 +0100 + +totem (2.20.0-3) unstable; urgency=low + + * Complete rework of debian/rules. + * Split data files in totem-common. + * Make totem-xine and totem-gstreamer installable together. + Closes: #402549. + * Move debugging symbols to totem-dbg. + * Move plugins to totem-plugins. + * Switch to quilt. + * Refresh patches. + * Fix menu files and ship them in both packages. + * 60_gnome-doc-utils.patch: regenerate help/Makefile.in with a newer + gnome-doc-utils.make that supports out-of-tree builds. + * Build-depend on libbluetooth-dev and libgalago-dev for the + corresponding plugins. + * Remove symbolic links in the firefox directory. + * Improve long package descriptions. + + -- Josselin Mouette Wed, 26 Sep 2007 22:36:06 +0200 + +totem (2.20.0-2) unstable; urgency=low + + [ Sebastian Dröge ] + * Upload to unstable. + * debian/control.in: + + Remove duplicated liblircclient-dev build dependency. + + [ Josselin Mouette ] + * libtotem-plparser7-dbg conflicts with libtotem-plparser1-dbg. + + -- Josselin Mouette Wed, 26 Sep 2007 00:41:46 +0200 + +totem (2.20.0-1) experimental; urgency=low + + * New upstream stable release: + + debian/control.in: + - Bump required versions of Gtk, GLib, GnomeVFS, GStreamer, + shared-mime-info. + - Build depend on vala. + - Build depend on python-gobject-dev and python-gtk2-dev. + - Build depend on libgnome-settings-daemon-dev. + - Build depend on liblircclient-dev. + - Bump soname of libtotem-plparser. + + debian/rules: + - Enable the vala bindings support. + + -- Sebastian Dröge Mon, 17 Sep 2007 07:12:48 +0200 + +totem (2.18.2-2) unstable; urgency=high + + * Depend on iso-codes; thanks Jan Alonzo. + * Recommend libxine1-ffmpeg; closes: #433166. + + -- Loic Minier Sun, 22 Jul 2007 15:06:24 +0200 + +totem (2.18.2-1) unstable; urgency=low + + [ Loic Minier ] + * Honor CFLAGS we set in rules, doh! + + [ Sven Arvidsson ] + * New patch, lirc_freeconfig, from upstream SVN, fix freeze on close + with lirc; thanks Philip Withnall (GNOME bug #427681); + (Closes: #418020) + + [ Loic Minier ] + * Excluse /usr/lib/totem/ and /usr/lib/nautilus/extensions- for + dh_makeshlibs as there are plugins in these dirs. + * Upload to unstable; drop check-dist include. + * New upstream stable release. + - New patch, 25_revert-xine-reqs, reverts the bump in Xine requirements + which was only added to pull a Xine bugfix. + - New patch, 70_autoconf, run autoconf. + - Drop patch 40_lirc_freeconfig, merged upstream. + * Wrap build-deps and deps. + * Fix some ${binary:Version} uses in Arch: all packages. + * Sprinkle some ${misc:Depends}. + * Bump up Debhelper compatibility level to 5. + + -- Loic Minier Fri, 01 Jun 2007 15:36:12 +0200 + +totem (2.18.1-1) experimental; urgency=low + + * Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + * New upstreeam release; no API change. + + -- Loic Minier Wed, 04 Apr 2007 17:26:55 +0200 + +totem (2.18.0-1) experimental; urgency=low + + * New upstream major stable release; with API additions. + - Pass --enable-xine to the Xine configure and drop the --enable-gstreamer + from the gstreamer configure. + - Prefer totem-gstreamer over totem-xine in the dependencies of totem. + - Bump up shlibs to >= 2.17.5. + - Configure with --disable-run-in-source-tree; change --enable-mozilla + --with-browser-plugins=xulrunner into --with-gecko=xulrunner. + - Bump up build-deps and existing deps to libglib2.0-dev >= 2.12.0, + libgtk2.0-dev >= 2.10.0, libgnomevfs2-dev >= 2.9.92, gnome-icon-theme >= + 2.15.90, libdbus-glib-1-dev >= 0.61, dbus >= 0.61, libxine-dev >= 1.1.4, + libgstreamer0.10-dev >= 0.10.6, libgstreamer-plugins-base0.10-dev >= + 0.10.7. + - Add a build-dep on libgnome2-dev >= 2.14.0. + - Add deps on gnome-icon-theme >= 2.15.90. + - Build-depend on gnome-doc-utils. + * Configure with --disable-scrollkeeper. + * Drop INSTALL_PROGRAM, dh_strip handles this. + * Cleanups. + * Let totem-gstreamer recommend gnome-control-center >= 2.15.90 for + gnome-sound-properties; conflict with gnome-control-center << 2.15.90 as + the bundled gnome-sound-properties is not aware of GStreamer profiles. + * Add a totem-gstreamer.README.Debian to document setting the output sink. + * Build-depend on librsvg2-dev and librsvg2-common >= 2.16.0-2 to make the + package autobuildable. + + -- Loic Minier Fri, 23 Mar 2007 11:53:24 +0100 + +totem (2.16.6-1) unstable; urgency=medium + + * New upstream stable release; bug fixes and translations. + - Drop patch 30_dlopen_noremove_dbus_glib, merged upstream. + + -- Loic Minier Mon, 19 Mar 2007 15:33:08 +0100 + +totem (2.16.5-3) unstable; urgency=medium + + [ Sebastien Bacher ] + * debian/patches/30_dlopen_noremove_dbus_glib.dpatch: + - fix "crash because NPPVpluginKeepLibraryInMemory is broken in gecko", + patch from Alexander Sack (GNOME bug #415389) + + [ Loic Minier ] + * Urgency medium. + + -- Loic Minier Thu, 8 Mar 2007 14:51:55 +0100 + +totem (2.16.5-2) unstable; urgency=low + + * Upload to unstable; drop dist-check. + + -- Loic Minier Sat, 3 Feb 2007 14:58:22 +0100 + +totem (2.16.5-1) experimental; urgency=low + + * New upstream stable release; bug fixes and translation updates; no API or + ABI change. + + -- Loic Minier Mon, 29 Jan 2007 17:55:00 +0100 + +totem (2.16.4-3) UNRELEASED; urgency=low + + [ Sven Arvidsson ] + * Add upstream ChangeLog, NEWS and README. (Closes: #404362) + * Remove unnecessary upstream TODO. + + [ Loic Minier ] + * Add a get-orig-source target to retrieve the upstream tarball. + + -- Loic Minier Sat, 13 Jan 2007 22:51:13 +0100 + +totem (2.16.4-2) unstable; urgency=low + + * Build-depend on libxtst-dev, thanks Sven Arvidsson + (closes: #315926). + + -- Josselin Mouette Thu, 30 Nov 2006 14:16:44 +0100 + +totem (2.16.4-1) unstable; urgency=low + + * New upstream stable release; no API change; fixes for session saving (now + correctly restored, closes: #399983, and with support for the width of the + sidebar), some translation cleanups. + + -- Loic Minier Wed, 29 Nov 2006 21:41:02 +0100 + +totem (2.16.3-3) unstable; urgency=high + + * Add symlinks in the iceweasel plugins directory; symlinks for the firefox + plugins dir are still installed for compatibility with local firefox debs + and backwards-compatibility. + * Update description to mention Iceweasel instead of Firefox. + + -- Loic Minier Tue, 21 Nov 2006 17:31:59 +0100 + +totem (2.16.3-2) unstable; urgency=low + + * Do not build-depend on libhal-dev for kfreebsd-i386 and kfreebsd-amd64; + build-depend on libcam-dev instead; thanks Petr Salinger; closes: #399091. + * Drop useless libnautilus-burn-dev build-dep; thanks Bastien Nocera. + + -- Loic Minier Sat, 18 Nov 2006 10:03:47 +0100 + +totem (2.16.3-1) unstable; urgency=low + + * New upstream release; no API change. + + -- Loic Minier Tue, 14 Nov 2006 17:38:27 +0100 + +totem (2.16.2-4) unstable; urgency=low + + * GNU/kFreeBSD support thanks Aurelien Jarno; closes: #391307. + - New dpatch, 30_kfreebsd_gnu, to use sys/cdio.h and sys/disklabel.h under + FreeBSD and mntent.h under Linux. + * Update 30_kfreebsd_gnu dpatch for totem 2.16.2. + + -- Loic Minier Mon, 6 Nov 2006 18:24:35 +0100 + +totem (2.16.2-3) unstable; urgency=low + + * Fix copyright to mention the LGPL for the Totem Playlist parser library, + "plparser", and the excemption for proprietary GStreamer plugins; thanks + Thadeu Lima de Souza Cascardo; closes: #396549. + + -- Loic Minier Wed, 1 Nov 2006 15:43:30 +0100 + +totem (2.16.2-2) unstable; urgency=low + + * Upload to unstable. + + -- Loic Minier Thu, 19 Oct 2006 11:57:54 +0200 + +totem (2.16.2-1) experimental; urgency=low + + * New upstream release; no API change. + + -- Loic Minier Mon, 2 Oct 2006 15:52:01 +0200 + +totem (2.16.1-1) experimental; urgency=low + + [ Guilherme de S. Pastore ] + * New upstream release. + * debian/watch: updated. + + [ Loic Minier ] + * Add debian/test.html, sample javascript integration of the gecko plugin. + * Re-add Firefox symlinks as these are required after all. + * New upstream release; with API additions. + - Bump libtotem-plaparser1 shlibs to >= 2.16.1. + - Install new plugin flavor, MullY. + + -- Loic Minier Fri, 8 Sep 2006 09:14:19 +0200 + +totem (1.5.92-1) experimental; urgency=low + + * Fix changelog of 1.5.91-1; hal 0.6 is not released yet, but upstream has a + safety check just in case it would break API/ABI. + * New upstream development release. + - Drop 10_dont-clean-totem-schemas-in dpatch, merged upstream. + + -- Loic Minier Fri, 25 Aug 2006 22:04:46 +0200 + +totem (1.5.91-2) experimental; urgency=low + + * Bump shlibs to libtotem-plparser1 >= 1.5.1. + * Pass "-L libtotem-plparser1" and "-l debian/libtotem-plparser1/usr/lib" + to dh_shlibdeps for the other packages to see the lib and use the shlibs. + + -- Loic Minier Sun, 13 Aug 2006 15:19:01 +0200 + +totem (1.5.91-1) experimental; urgency=low + + * New upstream development releases; with API additions. + - Target at experimental. + - Bump up libgstreamer0.10-dev and libgstreamer-plugins-base0.10-dev + build-deps to >= 0.10.1. + - Bump up libglib2.0-dev build-dep to >= 2.8.0. + - Bump up libxine-dev build-dep to >= 1.1.2. + - Add a build-dep on libgconf2-dev. + - Rename --with-mozilla configure flag to --with-browser-plugins. + - Add a build-dep on shared-mime-info (>= 0.17). + - Add a build-dep on libhal-dev (>= 0.5). + - Drop 09_maintainer-mode dpatch as upstream now calls + GNOME_MAINTAINER_MODE_DEFINES which requires AM_MAINTAINER_MODE. + - Drop 60_mandatory-relibtoolizing dpatch which isn't required anymore. + - Update symlinks and installation steps for the split in 4 distinct + plugins. + - New dpatch, 10_dont-clean-totem-schemas-in, to workaround an upstream + bug preventing two successive builds. + - Fixes playing of streams with mms:// URL lists. (Closes: #382603) + * Ship the *.xpt files as recommended by upstream. + * Only symlink the plugin in /usr/lib/mozilla as Firefox and XULRunner are + expected to look there too. + + -- Loic Minier Sun, 13 Aug 2006 14:28:00 +0200 + +totem (1.4.5-1) unstable; urgency=low + + * New upstream release; no API changes. + + -- Loic Minier Tue, 12 Sep 2006 10:41:57 +0200 + +totem (1.4.4-1) unstable; urgency=low + + [ Josselin Mouette ] + * Make the package binNMU-able by making the arch-all packages depend + only on >= ${Source-Version} arch-any packages. + * Make totem-mozilla depend on dbus. + + [ Loic Minier ] + * Use ${source:Version} and ${binary:Version} because of the totem-mozilla + Recommend; build-depend on dpkg-dev >= 1.13.19. + * Let totem-xine also Recommend totem-mozilla. + * New upstream release. + - Drop the 11_configure-drop-mozilla-link-flags dpatch, merged upstream. + - Update 60_mandatory-relibtoolizing dpatch. + - Fix the moves of the mozilla plugin since upstream now installs in + /usr/lib/mozilla/plugins, whatever the gecko engine. + + -- Loic Minier Tue, 8 Aug 2006 14:13:44 +0200 + +totem (1.4.3-1) unstable; urgency=low + + * Fix bashishm in mv "foo.{x,y}" snippet executed by $SHELL, thanks Julien + Danjou. (Closes: #377367) + * Drop 10_configure-force-xulrunner dpatch as --with-mozilla=xulrunner is + enough to select the appropriate Gecko. + * New upstream release. + - Update 60_mandatory-relibtoolizing dpatch. + + -- Loic Minier Thu, 13 Jul 2006 13:42:08 +0200 + +totem (1.4.2-1) experimental; urgency=low + + * Upload to experimental for now as the package is frozen in unstable due to + a big transition, but some users requested the fixed package. + * Set libtotem-plparser1-dbg Priority to extra. + [debian/control, debian/control.in] + * New dpatch, 09_maintainer-mode, to use AM_MAINTAINER_MODE for safety. + * Update 60_mandatory-relibtoolizing dpatch to also intltoolize as this is + required with intltool 0.35. (Closes: #372529) + * Bump up Standards-Version to 3.7.2. + * New upstream release. + - Lower libgnomevfs2-dev build-dep to >= 2.8.2 + - Bump up gstreamer0.10-plugins-base build-dep to >= 0.10.7. + - Drop 30_totem-mozilla-types dpatch, merged upstream. + - Update 60_mandatory-relibtoolizing dpatch. + * Build-depend on autotools-dev for the config.guess / config.sub update + snippet to work. + + -- Loic Minier Sat, 8 Jul 2006 21:34:16 +0200 + +totem (1.4.1-2) unstable; urgency=low + + * debian/patches/30_totem-mozilla-types.dpatch + - Added. Correct the Bool types used by the totem-mozilla plugin. Fixes the + mozilla plugin on big-endian architectures. + + -- Sjoerd Simons Sun, 4 Jun 2006 22:16:38 +0200 + +totem (1.4.1-1) unstable; urgency=low + + [ Guilherme de S. Pastore ] + * New upstream release. + * debian/patches: + - 00list: updated. + - 06_volume_icons_change.dpatch, 07_no_mms_to_mmsh_change.dpatch, + 08_aspect_ratio_fix.dpatch, + 09_play_protocol_not_listed_by_firefox.dpatch: removed, applied upstream. + + [ Loic Minier ] + * Update the mandatory relibtoolizing patch... + [debian/patches/60_mandatory-relibtoolizing.dpatch] + * Move common configure flags to COMMON_CONFIGURE_FLAGS and add + --disable-maintainer-mode to them. + [debian/rules] + * Recommend totem-mozilla and not totem-gstreamer-xul-plugin. + [debian/control, debian/control.in] + * Promote gstreamer0.10-plugins-ugly and gstreamer0.10-ffmpeg from Suggests + to Recommends. + [debian/control, debian/control.in] + * Remove what looks useless and now bogus deps on xlibs. (Closes: #370089) + [debian/control, debian/control.in] + + -- Loic Minier Thu, 25 May 2006 21:09:34 +0200 + +totem (1.4.0-1) unstable; urgency=low + + [ Gustavo Franco ] + * New upstream release. + * debian/control: + - intltool added in build-depends field + - libnautilus-burn-dev build-depends downgraded + - libtotem-plparser1 added, dropping libtotem-plparser0 (due to + SONAME change) + - gstreamer0.8 related dependencies bumped up to gstreamer0.10 + - Uploaders field sync with gnome-pkg-tools + - Standards-Version bumped up to 3.7.0 + * debian/rules: + - minor changes to fix the build (e.g: libtotem-plparser1 bits) + - fix '*.la' removal from all the binaries + - config.{guess,sub} unneeded copy removed from clean target + * debian/patches/01_totem_playlist_add_fix.dpatch dropped (merged upstream) + * debian/patches/08_firefox-plugin-fix.dpatch dropped (merged upstream) + * Patches merged from Ubuntu: + * debian/patches/06_volume_icons_change.dpatch: + - patch from CVS, don't use the mute icon for non muted volume + * debian/patches/07_no_mms_to_mmsh_change.dpatch: + - patch from CVS, to automatically change mms to mmsh + * debian/patches/08_aspect_ratio_fix.dpatch: + - patch from upstream CVS, work by j^ , fix the aspect + ratio setting usage + * debian/patches/09_play_protocol_not_listed_by_firefox.dpatch: + - patch from upstream, work by Gary Coady , fix the + playing of protocols not listed by firefox + + [ Gustavo Noronha Silva ] + * debian/patches/01_totem_playlist_add_fix.dpatch: + - patch by Thadeu Lima de Souza Cascardo + to fix crash on playlist add (Closes: #349357) + * debian/control.in, debian/rules: + - add xulrunner plugins for totem as new packages (Closes: #321400) + - added libxul-dev, and xulrunner (for xpidl) to Build-Deps + + [ Loic Minier ] + * Trash all *.a and *.la files not only from debian/totem-gstreamer/usr/lib, + but from debian/totem-gstreamer and debian/totem-xine altogether, except + for debian/totem-xine/usr/lib/*.a. + [debian/rules] + * Remove the now useless rm calls on "*a" files. + [debian/rules] + * Remove config.guess and config.sub updating patch as cdbs takes care of + this and hence fix clean target. + [debian/rules] + * Bump libgnomevfs2-dev build-dep to >= 2.9.92 per configure.ac. + [debian/control, debian/control.in] + * Fix config.sub / config.guess copying over, even if it's useless. + [debian/rules] + * Drop useless dh_installdirs calls. + [debian/rules] + * Remove *-xul packages in favor of a new totem-mozilla package, arch: all. + [debian/control, debian/control.in] + * Permit "| www-browser" in totem-mozilla's Recommends too. + [debian/control, debian/control.in] + * Add symlinks in /usr/lib/{firefox,mozilla,xulrunner}/plugins to + the mozilla plugin below /usr/lib/totem. + [debian/totem-mozilla.links] + * Install the mozilla plugin in /usr/lib/totem in totem-xine and + totem-gstreamer, drop anything else from /usr/lib/xulrunner. + [debian/rules] + * Add new patch to force usage of xulrunner, even if mozilla, firefox, or + seamonkey are available; WARNING: requires relibtoolizing. + [debian/patches/00list, + debian/patches/10_configure-force-xulrunner.dpatch] + * Add new patch to stop linling against mozilla libs (-lxpcom -lplds4 -lplc4 + -lnspr4) by splitting the PKG_CHECK_MODULES calls in configure.in; + WARNING: requires relibtoolizing. + [debian/patches/00list, + debian/patches/11_configure-drop-mozilla-link-flags.dpatch] + * Relibtoolize, as required by the preceding patches. + [debian/patches/00list, debian/patches/60_mandatory-relibtoolizing.dpatch] + * Use similar definitions as CDBS for DEB_MAKE_INVOKE and DEB_MAKE_ENVVARS + and use $(DEB_MAKE_INVOKE) instead of $(MAKE) to call make, fixes warnings + on schema installation. + [debian/rules] + + -- Loic Minier Sat, 6 May 2006 18:38:39 +0200 + +totem (1.2.1-4) unstable; urgency=low + + * Simple rebuild to get rid of references to Xcursor.la, and Xrender.la. + + -- Loic Minier Tue, 2 May 2006 16:09:22 +0200 + +totem (1.2.1-3) unstable; urgency=low + + * debian/patches/08_firefox-plugin-fix.dpatch: + - upstream patch to fix the firefox plugin crasher + + -- Sebastien Bacher Fri, 13 Jan 2006 00:12:49 +0100 + +totem (1.2.1-2) unstable; urgency=low + + * Upload to unstable. + + -- Gustavo Noronha Silva Mon, 9 Jan 2006 22:58:02 -0200 + +totem (1.2.1-1) experimental; urgency=low + + [ Loic Minier ] + * Update watch file. [debian/watch] + + [ Sjoerd Simons ] + * New upstream release + * Recommend gstreamer-theora and ffmpeg. + * Depend on llibmusicbrainz4-dev >= 2.1.1-4.1 to get the C++ transitioned + version. + * Build-Depend on libdbus-glib-1-dev so totem can disable gnome-screensaver + via dbus. + + -- Sjoerd Simons Tue, 20 Dec 2005 12:09:07 +0100 + +totem (1.2.0-1) experimental; urgency=low + + * New upstream release. + * Version the libmusicbrainz4-dev build-dep to >= 2.1.1-3.1 to get a + C++ transitionned version. [debian/control, debian/control.in] + * Drop hardcoded libtotem-plparser0 depends in totem-xine and + totem-gstreamer. [debian/control, debian/control.in] + * Menu icon fixes: [debian/totem-gstreamer.install, + debian/totem-gstreamer.menu, debian/totem-xine.install, + debian/totem-xine.menu, debian/totem.xpm] + - Convert the upstream PNG icon to XPM. + - Install totem.xpm in /usr/share/pixmaps for totem-xine and + totem-gstreamer. + - Update totem-gstreamer and totem-xine menu files. + * Only update config.guess and config.sub if we're in a tree with these + files. [debian/rules] + + -- Loic Minier Wed, 14 Sep 2005 13:03:01 +0200 + +totem (1.1.5-1) experimental; urgency=medium + + * Ship missing shlibs. + * New upstream release. + + -- Loic Minier Sun, 11 Sep 2005 11:37:42 +0200 + +totem (1.1.4-1) experimental; urgency=low + + * debian/control.in: + - new packages for libtotem-plparser. + - updated the Build-Depends. + - updated the Standards-Version. + * debian/rules: + - move libtotem-plparser files to the right place. + * debian/watch: + - updated. + + -- Sebastien Bacher Sat, 13 Aug 2005 14:24:36 +0200 + +totem (1.0.4-1) unstable; urgency=low + + * New upstream version: + - say that we support 3GPP files. + - avoid resizing on startup before we really show the window. + - fix a crash when 'Hide controls' is called while starting up. + - fix crashes when playing back some files with errors (xine-lib). + - fix hand icon not appearing on DVD menus in fullscreen (xine-lib). + - fix detection of still images with newer xine-lib. + + -- Sebastien Bacher Tue, 28 Jun 2005 12:14:31 +0200 + +totem (1.0.3-1) unstable; urgency=low + + * New upstream version. + + -- Sebastien Bacher Fri, 10 Jun 2005 01:08:45 +0200 + +totem (1.0.2-1) experimental; urgency=low + + * New upstream version. + + -- Sebastien Bacher Mon, 2 May 2005 18:38:08 +0200 + +totem (1.0.1-1) experimental; urgency=low + + * New upstream version. + * debian/control.in: + - updated the requirements. + * debian/patches/02_crashnull.dpatch, + debian/patches/10_vcd_hang.dpatch: + - the new version fixes that. + * debian/watch: + - updated. + + -- Sebastien Bacher Sat, 9 Apr 2005 17:39:02 +0200 + +totem (0.100-5) unstable; urgency=low + + * Rebuilt for the libhowl transition (Closes: #298872). + * debian/control.in: + - updated the gnome-vfs requirements. + + -- Sebastien Bacher Thu, 10 Mar 2005 19:14:51 +0100 + +totem (0.100-4) unstable; urgency=low + + * debian/patches/00list: + - list the new patch (Closes: #289470). + + -- Sebastien Bacher Wed, 16 Feb 2005 15:09:35 +0100 + +totem (0.100-3) unstable; urgency=low + + * debian/patches/02_crashnull.dpatch: + - updated with the patch from Josselin Mouette . + + -- Sebastien Bacher Sun, 13 Feb 2005 12:40:17 +0100 + +totem (0.100-2) unstable; urgency=low + + * debian/patches/01_gst-plugins-0.8.5.dpatch: + - removed, the new gst-plugins is in the archive now. + * debian/patches/02_crashnull.dpatch: + - added, fix the crash on system without any cdrom drive (Closes: #289470). + + -- Sebastien Bacher Thu, 10 Feb 2005 19:05:00 +0100 + +totem (0.100-1) unstable; urgency=low + + * New upstream release: + - implement session management support, remove automatic save/restore of + the current playlist (Closes: #255320). + - GStreamer DVD support. + - make Ctrl+arrows seek further in streams. + - turn the cursor into a hand when hovering a menu in a DVD (xine-lib). + - zoom in/out support (xine-lib). + - implement buffering (GStreamer). + - enable visualisation effects (GStreamer) (Closes: #269910). + - make the properties page work (GStreamer) and misc. fixes (all) + (Hoary: #1453). + - add Album metadata to the properties windows. + - hide the video properties if a file is an audio-only one. + - work-around a bug in GConf that caused playbacks + to be very dark (xine-lib). + - add 4.1-channel audio support. + - fix parsing of sub-directories, and .pls playlists with relative paths. + * debian/control.in: + - totem-gstreamer and totem-xine Provides totem (Closes: 287981). + - updated the descriptions about the subtitle (Closes: #285153). + * debian/patches/01_gst-plugins-0.8.5.dpatch: + - removed, this fix is in the new version. + * debian/watch: + - updated. + + -- Sebastien Bacher Sat, 8 Jan 2005 16:45:28 +0100 + +totem (0.99.22-1) unstable; urgency=low + + * New upstream release: + - show the popups in fullscreen (GStreamer). + - fix multiple volume icons appearing in the playlist. + - automatically load text subtitles (xine-lib). + - handle Drag'n'drop from Mozilla/Netscape. + - implement Drag from the Screenshot dialog to the file manager. + - make it possible to play a DVD from the hard-disk (xine-lib). + - fix getting the CD type when the drive doesn't implement it. + - add an error message when the audio device is busy (GStreamer). + - make drag'n'drop work again after double-clicking a playlist entry. + * debian/control.in: + - updated the Build-Depends and Depends. + * debian/patches/01_gst-plugins-0.8.5.dpatch: + - make the new version working well with gst-plugins 0.8.5. + + -- Sebastien Bacher Mon, 22 Nov 2004 15:57:25 +0100 + +totem (0.99.20-2) experimental; urgency=low + + * debian/control.in: + - Build-Depends on libgstreamer-plugins0.8-dev (Closes: #279038). + + -- Sebastien Bacher Sun, 31 Oct 2004 12:38:09 +0100 + +totem (0.99.20-1) experimental; urgency=low + + * New upstream release: + - fix a crash when closing Totem with non-file locations. + - set the current file chooser paths correctly. + - fix "Play Disc..." when the detected device is a symbolic link. + - fix detection of some DVDs, and speed-up disc type detection. + - add bitrate support to the GStreamer backend. + * debian/control.in: + - updated the Build-Depends. + + -- Sebastien Bacher Wed, 27 Oct 2004 19:27:57 +0200 + +totem (0.99.19-1) experimental; urgency=low + + * New upstream release. + * debian/control.in: + - updated the debhelper Build-Depends to get dh_desktop. + * debian/totem-gstreamer.postinst, debian/totem-xine.postinst: + - dh_desktop handles the mime update now. + * debian/patches/01_automake.dpatch: + - removed. + * debian/rules: + - use dh_desktop. + + -- Sebastien Bacher Sun, 17 Oct 2004 14:51:31 +0200 + +totem (0.99.17-2) experimental; urgency=low + + * debian/control.in: + - updated the Depends on nautilus-cd-burner (Closes: #275886). + + -- Sebastien Bacher Sun, 10 Oct 2004 22:28:12 +0200 + +totem (0.99.17-1) experimental; urgency=low + + * New upstream release: + - great overhaul of the GStreamer backend. + - fix parsing of Real Media and ASF playlists. + - support for writing m3u playlists, including relative paths. + * debian/control.in: + - updated the Build-Depends. + - updated the Standards-Version. + * debian/patches/01_automake.dpatch: + - run automake to fix the broken build for the gstreamer backend. + + -- Sebastien Bacher Thu, 7 Oct 2004 22:13:20 +0200 + +totem (0.99.16-1) unstable; urgency=low + + * New upstream release. + * debian/control.in: + - totem depends on totem-xine | totem-gstreamer (Closes: #270985). + * debian/patches/20_use_alternatives.dpatch: + - patch from Emil Soleyman-Zomalan to convert the + video-thumbnailer to an alternative. (Closes: #270222). + + -- Sebastien Bacher Fri, 17 Sep 2004 12:17:22 +0200 + +totem (0.99.15.1-2) unstable; urgency=low + + * debian/control.in: + - updated the Build-Depends on libgnomeui-dev (Closes: #263661). + + -- Sebastien Bacher Thu, 5 Aug 2004 16:59:26 +0200 + +totem (0.99.15.1-1) unstable; urgency=low + + * New upstream release. + - add a MimeType line to the desktop file (for the new MIME system). + * debian/control.in: + - updated the Build-Depends. + * debian/rules: + - added a call to dh_gconf. + * debian/totem-gstreamer.postinst, debian/totem-xine.postinst: + - removed schemas registration code, dh_gconf handles that. + - run update-desktop-database if available. + + -- Sebastien Bacher Sat, 24 Jul 2004 13:23:10 +0200 + +totem (0.99.13-1) unstable; urgency=low + + * New upstream release + - Handle Ctrl+P to show the playlist even in hidden controls mode + (Closes: #252604). + * debian/control.in + - Updated the totem-gstreamer description to remove references to xine + (Closes: #255420). + + -- Sebastien Bacher Sat, 3 Jul 2004 00:01:52 +0200 + +totem (0.99.12-2) unstable; urgency=low + + * Split the package, now we have: + - totem-xine using the xine backend. + - totem-gstreamer using the gstreamer backend (Closes: #246058). + - totem, dummy package depending on totem-xine (since it seems to be + a better default for the moment). + * debian/control.in: + - updated for the split. + * debian/patches: + - switched to dpatch. + * debian/rules: + - switched back to debhelper since cdbs doesn't support multibuild for + the moment. + * debina/template: + - removed debconf's template for the moment, gstreamer-media is not ready + to be a suitable alternative for thumbnails (Closes: #235857, #252941). + * debian/totem.1: + - removed, the manpage is included in the upstream tarball now. + + -- Sebastien Bacher Tue, 8 Jun 2004 15:16:34 +0200 + +totem (0.99.12-1) unstable; urgency=low + + * New upstream release + + turn off vanity's build. + + -- Sebastien Bacher Sun, 6 Jun 2004 03:12:19 +0200 + +totem (0.99.11-2) unstable; urgency=low + + * Upload in unstable. + + -- Sebastien Bacher Wed, 26 May 2004 23:53:54 +0200 + +totem (0.99.11-1) experimental; urgency=low + + * New upstream release. + * debian/patches/stock-icon.patch, debian/patches/totem-rwcrash-fix.patch: + + removed since included in new version. + * debian/control.in: + + updated Build-Depends. + + -- Sebastien Bacher Sat, 1 May 2004 23:28:02 +0200 + +totem (0.99.10-3) experimental; urgency=low + + * debian/patches/stock-icon.patch: + + patch from Michel Daenzer that makes all installed + icons loadable by totem (Closes: 243334). + + -- Sebastien Bacher Tue, 27 Apr 2004 00:21:22 +0200 + +totem (0.99.10-2) experimental; urgency=low + + * debian/patches/totem-rwcrash-fix.patch: + + new patch to fix a crasher. + + -- Sebastien Bacher Sun, 18 Apr 2004 17:30:38 +0200 + +totem (0.99.10-1) experimental; urgency=low + + * New upstream release. + * debian/control.in: + + updated Build-Depends. + * Included Brazilian Portuguese debconf template from Andre Luis Lopes + (Closes: #235384). + * Included new manpage from Andre Lehovich + (Closes: #241814). + + -- Sebastien Bacher Sun, 11 Apr 2004 00:46:20 +0200 + +totem (0.99.9-4) unstable; urgency=low + + * Fixed schemas registration (should fix the problem with colors). + + -- Sebastien Bacher Sun, 22 Feb 2004 19:57:11 +0100 + +totem (0.99.9-3) unstable; urgency=low + + * debian/patches/vcd_hang.patch: + + patch to fix hang on start with VCD plugin. + + -- Sebastien Bacher Tue, 17 Feb 2004 19:36:46 +0100 + +totem (0.99.9-2) unstable; urgency=low + + * GNOME team upload. + * [debian/control.in] Added build dependency on scrollkeeper. + (Closes: #232588) + + -- J.H.M. Dassen (Ray) Sat, 14 Feb 2004 10:10:04 +0100 + +totem (0.99.9-1) unstable; urgency=low + + * New upstream release + + fix bug with directory selection in the file selector (Closes: #225903). + + -- Sebastien Bacher Fri, 13 Feb 2004 19:47:26 +0100 + +totem (0.99.8-3) unstable; urgency=low + + * Rebuilt with xfree 4.2. + + -- Sebastien Bacher Sun, 18 Jan 2004 01:01:37 +0100 + +totem (0.99.8-2) unstable; urgency=low + + * Fixed a typo in the french debconf translation (Closes: #227311). + + -- Sebastien Bacher Sat, 17 Jan 2004 16:58:34 +0100 + +totem (0.99.8-1) unstable; urgency=low + + * New upstream release. + * debian/control: + + updated Build-Depends. + + updated for the GNOME Team. + * debian/rules: + + updated for the GNOME Team. + * Added french template (Closes: #218730). + * Changed the template to remove the "yes" from the description + (Closes: #218117). + + -- Sebastien Bacher Sun, 9 Nov 2003 14:03:46 +0100 + +totem (0.99.7-1) unstable; urgency=low + + * New upstream release. + * Added debconf option to use or not totem as the nautilus video thumbnailer. + (Closes: #212555). + + -- Sebastien Bacher Thu, 16 Oct 2003 01:01:24 +0200 + +totem (0.99.6-1) unstable; urgency=low + + * New upstream release. + + playlist improvements (Closes: #211833). + + fixed crash on eject (Closes: #211968). + + -- Sebastien Bacher Sun, 12 Oct 2003 18:34:48 +0200 + +totem (0.99.5-1) unstable; urgency=low + + * New upstream release + + disable xscreensaver (Closes: #208175). + + -- Sebastien Bacher Mon, 15 Sep 2003 17:55:44 +0200 + +totem (0.99.4-1) unstable; urgency=low + + * New upstream release. + + -- Sebastien Bacher Thu, 4 Sep 2003 15:41:46 +0200 + +totem (0.99.3-1) unstable; urgency=low + + * New upstream release. + * Switched to cdbs. + * Updated menu icon. + * Updated description (Closes: #207007). + + -- Sebastien Bacher Sun, 31 Aug 2003 19:53:10 +0200 + +totem (0.99.2-1) unstable; urgency=low + + * New upstream release. + - Fixed XFree86 lockup on start bug (Closes: #200101). + + -- Sebastien Bacher Sat, 5 Jul 2003 14:02:13 +0000 + +totem (0.99.1-2) unstable; urgency=low + + * Build with xfree 4.2 instead 4.3. (Closes: #199335). + + -- Sebastien Bacher Tue, 1 Jul 2003 23:49:57 +0200 + +totem (0.99.1-1) unstable; urgency=low + + * New upstream release. + + -- Sebastien Bacher Mon, 23 Jun 2003 11:49:55 +0200 + +totem (0.99.0-2) unstable; urgency=low + + * Added libgnome-desktop-dev to Build-Depends (Closes: #196224). + + -- Sebastien Bacher Thu, 5 Jun 2003 17:11:25 +0200 + +totem (0.99.0-1) unstable; urgency=low + + * New upstream release + - Fixed DVD/CD playing (Closes: #195090). + * Updated to standards version 3.5.10.0. + + -- Sebastien Bacher Sat, 31 May 2003 19:19:39 +0200 + +totem (0.98.0-1) unstable; urgency=low + + * New upstream relase. + + -- Sebastien Bacher Sun, 11 May 2003 21:13:06 +0200 + +totem (0.97.0-1) unstable; urgency=low + + * New upstream release. + - Fixed the thumbnailer (Closes: #188979). + + -- Sebastien Bacher Tue, 29 Apr 2003 22:13:05 +0200 + +totem (0.96.0-1) unstable; urgency=low + + * New upstream release. + * Changed section to gnome. + * Updated to standards version 3.5.9. + * Updated Description to add Author and Homepage. + * Added Depends on ${misc:Depends}. + * Updated Build-Depends. + + -- Sebastien Bacher Thu, 10 Apr 2003 11:17:49 +0200 + +totem (0.95.1-3) unstable; urgency=low + + * This time the schema file should be ok ... + + -- Sebastien Bacher Fri, 28 Mar 2003 21:54:13 +0100 + +totem (0.95.1-2) unstable; urgency=low + + * Fixed schema file (Closes: #185137). + + -- Sebastien Bacher Thu, 27 Mar 2003 17:09:15 +0100 + +totem (0.95.1-1) unstable; urgency=low + + * New upstream release. + + -- Sebastien Bacher Wed, 26 Feb 2003 23:43:07 +0100 + +totem (0.95.0-1) unstable; urgency=low + + * New upstream release. + * Updated to standards-version 3.5.8. + + -- Sebastien Bacher Wed, 26 Feb 2003 22:01:48 +0100 + +totem (0.90.0-5) unstable; urgency=low + + * Added "liblircclient-dev" and "libirman-dev" to Build-Depends (Closes: #182195). + + -- Sebastien Bacher Sun, 23 Feb 2003 17:47:25 +0100 + +totem (0.90.0-4) unstable; urgency=low + + * Apply patch to support playing straight from amazon (Closes: #181485). + + -- Sebastien Bacher Thu, 20 Feb 2003 17:19:18 +0100 + +totem (0.90.0-3) unstable; urgency=low + + * Register totem-video-thumbnail schemas (Closes: #179343). + + -- Sebastien Bacher Wed, 5 Feb 2003 01:13:54 +0100 + +totem (0.90.0-2) unstable; urgency=low + + * Update README file. + * Update Build-Depends. + * Remove obsolete depend on xine-dvdnav (Closes: #179160). + + -- Sebastien Bacher Fri, 31 Jan 2003 10:59:36 +0100 + +totem (0.90.0-1) unstable; urgency=low + + * New upstream release. + * Should close the FTBFS (Closes: #176530). + * Updated Build-Depends. + + -- Sebastien Bacher Wed, 29 Jan 2003 20:39:02 +0100 + +totem (0.13.1-1) unstable; urgency=low + + * New upstream release + * Updated xine-lib Depends. + * Totem doesn't use xine logo any more (Closes: #160429). + * Updated xpm icon for debian menu. + * Updated to standards-version 3.5.7. + + -- Sebastien Bacher Fri, 3 Jan 2003 12:34:20 +0100 + +totem (0.11.0-1) unstable; urgency=low + + * New upstream release (Closes: #161818). + + -- Sebastien Bacher Mon, 28 Oct 2002 13:02:10 +0100 + +totem (0.10.0-3) unstable; urgency=low + + * Added xine-dvdnav to Depends (and not to Build-Depends ...). + + -- Sebastien Bacher Fri, 25 Oct 2002 01:17:52 +0200 + +totem (0.10.0-2) unstable; urgency=low + + * Added xine-dvdnav to Build-Depends. + + -- Sebastien Bacher Sun, 20 Oct 2002 00:22:30 +0200 + +totem (0.10.0-1) unstable; urgency=low + + * New upstream release + + -- Sebastien Bacher Mon, 2 Sep 2002 19:14:31 +0200 + +totem (0.9.1-1) unstable; urgency=low + + * Initial Release. + + -- Sebastien Bacher Sat, 24 Aug 2002 15:12:51 +0200 + + --- totem-2.23.3.orig/debian/totem-flavor.postinst.in +++ totem-2.23.3/debian/totem-flavor.postinst.in @@ -0,0 +1,26 @@ +#! /bin/sh +set -e + +FLAVOUR=@FLAVOUR@ +PRIORITY=@PRIORITY@ +NAUTILUS_EXTDIR=@NAUTILUS_EXTDIR@ + +if [ "$1" = configure ]; then + update-alternatives --quiet --install \ + /usr/bin/gnome-video-thumbnailer gnome-video-thumbnailer \ + /usr/bin/totem-${FLAVOUR}-video-thumbnailer ${PRIORITY} + update-alternatives --quiet --install \ + /usr/bin/totem totem /usr/bin/totem-${FLAVOUR} ${PRIORITY} \ + --slave /usr/bin/totem-audio-preview totem-audio-preview \ + /usr/bin/totem-${FLAVOUR}-audio-preview \ + --slave /usr/bin/totem-video-indexer totem-video-indexer \ + /usr/bin/totem-${FLAVOUR}-video-indexer \ + --slave ${NAUTILUS_EXTDIR}/libtotem-properties-page.so \ + libtotem-properties-page.so \ + ${NAUTILUS_EXTDIR}/libtotem-properties-page.so.${FLAVOUR} \ + --slave /usr/lib/totem/default totem-default.dir /usr/lib/totem/${FLAVOUR} +fi + +#DEBHELPER# + +exit 0 --- totem-2.23.3.orig/debian/rules +++ totem-2.23.3/debian/rules @@ -0,0 +1,229 @@ +#!/usr/bin/make -f +#-*- makefile -*- + +#export DH_VERBOSE=1 + +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +DEB_VERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') +include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +STAMP_DIR := debian/stamp +BUILD_DIR := debian/build +PATCH_DIR := debian/patches + +COMPKG := totem-common +PLUGPKG := totem-plugins +PLUGEXTRAPKG := totem-plugins-extra + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +FLAVORS := xine gstreamer +PRIORITY_xine := 35 +PRIORITY_gstreamer := 40 +export PRIORITY_xine PRIORITY_gstreamer + +CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2) + +COMMON_CONFIGURE_FLAGS += \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=\$${prefix}/share/man \ + --disable-maintainer-mode \ + --with-gecko=mozilla \ + --disable-run-in-source-tree \ + --disable-scrollkeeper + +ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + COMMON_CONFIGURE_FLAGS += --build=$(DEB_BUILD_GNU_TYPE) +else + COMMON_CONFIGURE_FLAGS += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +endif + +xine_CONFIGURE_FLAGS := $(COMMON_CONFIGURE_FLAGS) \ + --libexecdir=\$${prefix}/lib/totem/xine \ + --enable-xine + +gstreamer_CONFIGURE_FLAGS := $(COMMON_CONFIGURE_FLAGS) \ + --libexecdir=\$${prefix}/lib/totem/gstreamer + +patch: $(STAMP_DIR)/patch-stamp +$(STAMP_DIR)/patch-stamp: + dh_testdir + mkdir -p $(STAMP_DIR) + QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null push -a || test $$? = 2 + touch $@ + +builddir = $(BUILD_DIR)/$* + +configure: $(addprefix $(STAMP_DIR)/configure-stamp-, $(FLAVORS)) +$(STAMP_DIR)/configure-stamp-%: $(STAMP_DIR)/patch-stamp + dh_testdir + mkdir -p $(builddir) + cd $(builddir) && \ + CFLAGS="$(CFLAGS)" $(CURDIR)/configure $($*_CONFIGURE_FLAGS) + touch $@ + +build: $(addprefix $(STAMP_DIR)/build-stamp-, $(FLAVORS)) +$(STAMP_DIR)/build-stamp-%: $(STAMP_DIR)/configure-stamp-% + dh_testdir + $(MAKE) -C $(builddir) + touch $@ + cd po; intltool-update -p + +installdir = $(CURDIR)/debian/totem-$* + +install-clean: + dh_testdir + dh_testroot + dh_clean -k + +install-%: $(STAMP_DIR)/build-stamp-% + GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \ + $(MAKE) -C $(builddir) install DESTDIR=$(installdir) + cd $(installdir)/usr/bin && for i in totem*; do \ + mv $$i totem-$*$${i#totem} ; done + cd $(installdir)/$$(pkg-config libnautilus-extension --variable=extensiondir) && \ + mv libtotem-properties-page.so libtotem-properties-page.so.$* + # hide the mozilla plugin in a specific directory + cd $(installdir)/usr/lib/mozilla/plugins && \ + mv *.so *.xpt $(installdir)/usr/lib/totem/$*/ + # drop anything else + rm -rf $(installdir)/usr/lib/xulrunner + # drop *.a and *.la files + find debian/totem-$*/usr/lib -mindepth 2 -name '*.a' -exec rm {} \; + find debian/totem-$*/usr/lib -name '*.la' -exec rm {} \; + echo gnome:Version=$(DEB_GNOME_VERSION) >> debian/totem-$*.substvars + echo gnome:NextVersion=$(DEB_GNOME_NEXTVERSION) >> debian/totem-$*.substvars + +TOTEM_XINE_ONLY_MIMES := x-content/video-dvd;x-content/video-vcd;x-content/video-svcd; + +install: install-clean $(addprefix install-, $(FLAVORS)) + dh_installdirs + mkdir -p debian/$(COMPKG)/usr + mv debian/totem-gstreamer/etc debian/$(COMPKG)/ + mv debian/totem-gstreamer/usr/share debian/$(COMPKG)/usr/ + mkdir -p debian/$(PLUGPKG)/usr/lib/totem + mv debian/totem-gstreamer/usr/lib/totem/plugins debian/$(PLUGPKG)/usr/lib/totem/ + find debian/$(PLUGPKG) -name '*.py[co]' -delete + mkdir -p debian/$(PLUGEXTRAPKG)/usr/lib/totem/plugins + mv debian/$(PLUGPKG)/usr/lib/totem/plugins/gromit debian/$(PLUGEXTRAPKG)/usr/lib/totem/plugins + mv debian/$(PLUGPKG)/usr/lib/totem/plugins/mythtv debian/$(PLUGEXTRAPKG)/usr/lib/totem/plugins + find debian/$(PLUGEXTRAPKG) -name '*.py[co]' -delete + cd debian/totem-xine && rm -rf etc usr/share usr/lib/totem/plugins +# Make both totems installable together + for f in $(FLAVORS); do \ + F=`echo $$f | sed -r 's/^([a-z])/\U\1/'` ; \ + mkdir -p debian/totem-$$f/usr/share/applications ; \ + ( sed -r "s/^Name(.*)$$/Name\1 ($$F)/" \ + debian/$(COMPKG)/usr/share/applications/totem.desktop \ + | sed -r "s,^(Exec=.*totem),\1-$$f," \ + | grep -v ^MimeType ; \ + echo NoDisplay=true ) \ + > debian/totem-$$f/usr/share/applications/totem-$$f.desktop ; \ + sed -e"s/@FLAVOUR@/$$f/" \ + -e"s/@PRIORITY@/$$(eval echo \$$PRIORITY_$$f)/" \ + -e"s,@NAUTILUS_EXTDIR@,$$(pkg-config libnautilus-extension --variable=extensiondir)," \ + < debian/totem-flavor.postinst.in \ + > debian/totem-$${f}.postinst ; \ + done + printf "\nTryExec=/usr/bin/totem" >> debian/$(COMPKG)/usr/share/applications/totem.desktop + + # only totem-xine can play DVDs and VCDs satisfactorily (for now) + grep -q '^MimeType=.*$(TOTEM_XINE_ONLY_MIMES)' debian/$(COMPKG)/usr/share/applications/totem.desktop + sed -i 's,$(TOTEM_XINE_ONLY_MIMES),,' debian/$(COMPKG)/usr/share/applications/totem.desktop + printf '\nMimeType=$(TOTEM_XINE_ONLY_MIMES)' >> debian/totem-xine/usr/share/applications/totem-xine.desktop + + dh_install + +clean:: + dh_testdir + dh_testroot + QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null pop -a -R || test $$? = 2 + rm -f $(foreach f,$(FLAVORS),debian/totem-$(f).postinst) + rm -rf .pc + rm -rf $(INSTALL_DIR) $(BUILD_DIR) $(STAMP_DIR) + -rm -f po/totem.pot + -test -r /usr/share/misc/config.sub && test -r config.sub && \ + cp -f /usr/share/misc/config.sub config.sub + -test -r /usr/share/misc/config.guess && test -r config.guess && \ + cp -f /usr/share/misc/config.guess config.guess + dh_clean + +binary: binary-arch binary-indep + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_installdocs -i -A NEWS README + dh_installchangelogs -i ChangeLog + dh_installman -i + dh_scrollkeeper -i + dh_gconf -i + dh_desktop -i + dh_icons -i + dh_compress -i + dh_link -i + dh_fixperms -i + : # symlink identical Gnome help files within packages + for p in $$(dh_listpackages -i); do \ + if [ -d debian/$$p/usr/share/gnome/help ]; then \ + (cd debian/$$p && LC_ALL=C fdupes -r1nq usr/share/gnome/help \ + | while read s; do \ + set -- $$(echo $$s | tr ' ' '\n' | sort); \ + f=$$1; shift; \ + for d; do \ + echo "symlinking duplicate Gnome help file $$d to $$f"; \ + rm $$d; ln -s /$$f $$d; \ + done; \ + done; \ + ); \ + dh_link -p$$p; \ + fi; \ + done + dh_pysupport -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir -a + dh_testroot -a + dh_installdocs -a -A NEWS README + dh_installmenu -a + dh_installchangelogs -a ChangeLog + dh_desktop -a + dh_icons -a + dh_compress -a + dh_link -a + : # symlink identical Gnome help files within packages + for p in $$(dh_listpackages -a); do \ + if [ -d debian/$$p/usr/share/gnome/help ]; then \ + (cd debian/$$p && LC_ALL=C fdupes -r1nq usr/share/gnome/help \ + | while read s; do \ + set -- $$(echo $$s | tr ' ' '\n' | sort); \ + f=$$1; shift; \ + for d; do \ + echo "symlinking duplicate Gnome help file $$d to $$f"; \ + rm $$d; ln -s /$$f $$d; \ + done; \ + done; \ + ); \ + dh_link -p$$p; \ + fi; \ + done + dh_fixperms -a + dh_strip -a --dbg-package=totem-dbg + dh_shlibdeps -a + dh_perl -a + dh_pysupport -a /usr/lib/totem/plugins/totem + dh_installdeb -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +.PHONY: patch configure build install clean install-clean binary-indep binary-arch binary --- totem-2.23.3.orig/debian/control +++ totem-2.23.3/debian/control @@ -0,0 +1,244 @@ +Source: totem +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Sebastien Bacher +Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort , Josselin Mouette , Loic Minier , Sebastian Dröge +Build-Depends: debhelper (>= 5.0.51~), + quilt, + python-support (>= 0.6), + libgmyth-dev (>= 0.3.0), + libgtk2.0-dev (>= 2.12.6), + libglib2.0-dev (>= 2.15), + libgnome-keyring-dev, + libgnomeui-dev (>= 2.6.1.1-4), + libglade2-dev (>= 2.4.0), + libgnomevfs2-dev (>= 2.16.0), + libstartup-notification0-dev (>= 0.8), + libtotem-plparser-dev (>= 2.21.90), + libtrackerclient-dev, + libxine-dev (>= 1.1.7), + liblircclient-dev (>= 0.6.6), + libirman-dev (>= 0.4.2), + gnome-pkg-tools (>= 0.10), + scrollkeeper, + libxml-parser-perl, + libgstreamer0.10-dev (>= 0.10.12), + libgstreamer-plugins-base0.10-dev (>= 0.10.12), + gstreamer0.10-tools (>= 0.10.12), + gstreamer0.10-plugins-base (>= 0.10.12), + gstreamer0.10-plugins-good, + librsvg2-dev (>= 2.16.0-2), + librsvg2-common (>= 2.16.0-2), + libnautilus-extension-dev, + iso-codes, + libmusicbrainz4-dev (>= 2.1.1-4.1), + gnome-icon-theme (>= 2.15.90), + libdbus-glib-1-dev (>= 0.61), + xulrunner-1.9-dev, + intltool, + autotools-dev, + dpkg-dev (>= 1.13.19), + libgconf2-dev, + shared-mime-info (>= 0.22), + libhal-dev (>= 0.5) [!kfreebsd-i386 !kfreebsd-amd64], + libcam-dev [kfreebsd-i386 kfreebsd-amd64], + libxtst-dev, + libgnome2-dev (>= 2.14.0), + libxrandr-dev (>= 1.1.1), + libxxf86vm-dev (>= 1.0.1), + libx11-dev, + liblaunchpad-integration-dev (>= 0.1.17), + gnome-doc-utils, + python-dev (>= 2.3), + python-gobject-dev, + python-gtk2-dev (>= 2.12), + libbluetooth-dev, +Standards-Version: 3.7.3 +Homepage: http://www.gnome.org/projects/totem/ + +Package: totem +Architecture: all +Depends: ${misc:Depends}, + totem-plugins (>= ${source:Version}), + totem-gstreamer (>= ${source:Version}) | totem-xine (>= ${source:Version}) +Suggests: totem-plugins-extra +Description: A simple media player for the GNOME desktop (dummy package) + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This dummy package installs Totem with the GStreamer backend by + default. + +Package: totem-xine +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends}, + gnome-icon-theme (>= 2.15.90), + iso-codes, + totem-common (>= ${gnome:Version}), + totem-common (<< ${gnome:NextVersion}) +Recommends: totem-mozilla (= ${source:Version}), + totem-plugins, + libxine1-ffmpeg, + libxine1-gnome +Conflicts: totem (<< 0.99.12-2), + totem-mozilla (<< 2.20.0-3) +Description: A simple media player for the GNOME desktop based on xine + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. It features : + . + * Shoutcast, m3u, asx, SMIL and ra playlists support + * DVD (with menus), VCD and Digital CD (with CDDB) playback + * TV-Out configuration with optional resolution switching + * 4.0, 5.0, 5.1 and stereo audio output + * Full-screen mode (move your mouse and you get nice controls) with + Xinerama, dual-head and RandR support + * Aspect ratio toggling, scaling based on the video's original size + * Full keyboard control + * Simple playlist with repeat mode and saving feature + * GNOME and Nautilus integration + * Screenshot of the current movie + * Brightness and Contrast control + * Visualisation plugin when playing audio-only files + * Video thumbnailer for nautilus + * Nautilus properties page + * Works on remote displays + * DVD, VCD and OGG/OGM subtitles with automatic language selection + * Extensible with plugins + +Package: totem-gstreamer +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends}, + gstreamer0.10-gnomevfs, + gstreamer0.10-plugins-base, + gstreamer0.10-alsa | gstreamer0.10-audiosink, + gstreamer0.10-plugins-good, + gstreamer0.10-x, + gnome-icon-theme (>= 2.15.90), + iso-codes, + totem-common (>= ${gnome:Version}), + totem-common (<< ${gnome:NextVersion}) +Conflicts: totem (<< 0.99.12-2), + gnome-control-center (<< 2.15.90), + totem-mozilla (<< 2.20.0-3) +Recommends: totem-mozilla (= ${source:Version}), + totem-plugins, + gnome-control-center (>= 2.15.90) +Suggests: gstreamer0.10-plugins-ugly, + gstreamer0.10-ffmpeg, + gnome-app-install +Description: A simple media player for the GNOME desktop based on GStreamer + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. It features : + . + * Shoutcast, m3u, asx, SMIL and ra playlists support + * DVD (with menus), VCD and Digital CD (with CDDB) playback + * TV-Out configuration with optional resolution switching + * 4.0, 5.0, 5.1 and stereo audio output + * Full-screen mode (move your mouse and you get nice controls) with + Xinerama, dual-head and RandR support + * Aspect ratio toggling, scaling based on the video's original size + * Full keyboard control + * Simple playlist with repeat mode and saving feature + * GNOME, Nautilus and GnomeVFS integration + * Screenshot of the current movie + * Brightness and Contrast control + * Visualisation plugin when playing audio-only files + * Video thumbnailer for nautilus + * Nautilus properties page + * Works on remote displays + * DVD, VCD and OGG/OGM subtitles with automatic language selection + * Extensible with plugins + +Package: totem-mozilla +Architecture: all +Section: web +Depends: ${misc:Depends}, + totem-gstreamer (>= ${source:Version}) | totem-xine (>= ${source:Version}), + dbus (>= 0.61) +Recommends: epiphany-browser | www-browser +XB-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a +XB-Npp-Name: Totem Mozilla plugin +XB-Npp-MimeType: video/quicktime, video/mp4, image/x-macpaint, image/x-quicktime, application/x-mplayer2, video/x-ms-asf-plugin, video/x-msvideo, video/x-ms-asf, video/x-ms-wmv, video/x-wmv, video/x-ms-wvx, video/x-ms-wm, application/ogg, video/mpeg, audio/wav, audio/x-wav, audio/mpeg +Description: Totem Mozilla plugin + This package contains the Totem Mozilla plugin, which will + enhance your Gecko-based browser to be able to display movie + clips. + . + This plugin should work for Firefox as well as XULRunner based browsers. + +Package: totem-common +Architecture: all +Depends: ${misc:Depends} +Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3) +Description: Data files for the Totem media player + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package contains common data files and translations. + +Package: totem-dbg +Architecture: any +Section: libdevel +Priority: extra +Depends: totem-gstreamer (= ${binary:Version}) | totem-xine (= ${binary:Version}), + ${misc:Depends} +Conflicts: libtotem-plparser1-dbg, libtotem-plparser7-dbg +Description: Debugging symbols for the Totem media player + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package contains detached debugging symbols. + +Package: totem-plugins +Architecture: any +Depends: totem-gstreamer (= ${binary:Version}) | totem-xine (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, + ${python:Depends}, + python-gdata +Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3) +Suggests: gromit +Description: Plugins for the Totem media player + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package contains a set of recommended plugins for Totem, which + allow to: + . + * Control Totem with an Infrared remote control + * Control Totem with the keyboard's media player keys + * Keep the Totem window on top of the screen + * Display movie properties + * Deactivate the screensaver when a movie is playing + * Skip to a defined time in the movie + * Set the away status in the instant messenger when a movie is + playing + * Control totem with a mobile phone using the Bluetooth protocol + * Share the current playlist via HTTP + * Search, browse for and play videos from YouTube + * Search for videos using tracker + . + Additional plugins can be written in C, Python or Vala. + +Package: totem-plugins-extra +Architecture: any +Depends: totem-gstreamer (= ${binary:Version}) | totem-xine (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Recommends: gromit +Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3), totem-plugins (<< 2.22.0-0ubuntu3) +Description: Extra plugins for the Totem media player + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package contains an extra set plugins for Totem, which allow to: + . + * A live TV and recordings viewer + * Annotate the screen with the Gromit tool + . + Additional plugins can be written in C, Python or Vala. --- totem-2.23.3.orig/debian/totem-common.install +++ totem-2.23.3/debian/totem-common.install @@ -0,0 +1 @@ +debian/totem.xpm usr/share/pixmaps --- totem-2.23.3.orig/debian/compat +++ totem-2.23.3/debian/compat @@ -0,0 +1 @@ +5 --- totem-2.23.3.orig/debian/totem-gstreamer.prerm +++ totem-2.23.3/debian/totem-gstreamer.prerm @@ -0,0 +1,14 @@ +#! /bin/sh +set -e + +FLAVOUR=gstreamer + +if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then + update-alternatives --quiet --remove gnome-video-thumbnailer \ + /usr/bin/totem-${FLAVOUR}-video-thumbnailer + update-alternatives --quiet --remove totem /usr/bin/totem-${FLAVOUR} +fi + +#DEBHELPER# + +exit 0 --- totem-2.23.3.orig/debian/totem.install +++ totem-2.23.3/debian/totem.install @@ -0,0 +1 @@ +debian/bug/control /usr/share/bug/totem/ --- totem-2.23.3.orig/debian/control.in +++ totem-2.23.3/debian/control.in @@ -0,0 +1,244 @@ +Source: totem +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Sebastien Bacher +Uploaders: @GNOME_TEAM@ +Build-Depends: debhelper (>= 5.0.51~), + quilt, + python-support (>= 0.6), + libgmyth-dev (>= 0.3.0), + libgtk2.0-dev (>= 2.12.6), + libglib2.0-dev (>= 2.15), + libgnome-keyring-dev, + libgnomeui-dev (>= 2.6.1.1-4), + libglade2-dev (>= 2.4.0), + libgnomevfs2-dev (>= 2.16.0), + libstartup-notification0-dev (>= 0.8), + libtotem-plparser-dev (>= 2.21.90), + libtrackerclient-dev, + libxine-dev (>= 1.1.7), + liblircclient-dev (>= 0.6.6), + libirman-dev (>= 0.4.2), + gnome-pkg-tools (>= 0.10), + scrollkeeper, + libxml-parser-perl, + libgstreamer0.10-dev (>= 0.10.12), + libgstreamer-plugins-base0.10-dev (>= 0.10.12), + gstreamer0.10-tools (>= 0.10.12), + gstreamer0.10-plugins-base (>= 0.10.12), + gstreamer0.10-plugins-good, + librsvg2-dev (>= 2.16.0-2), + librsvg2-common (>= 2.16.0-2), + libnautilus-extension-dev, + iso-codes, + libmusicbrainz4-dev (>= 2.1.1-4.1), + gnome-icon-theme (>= 2.15.90), + libdbus-glib-1-dev (>= 0.61), + xulrunner-1.9-dev, + intltool, + autotools-dev, + dpkg-dev (>= 1.13.19), + libgconf2-dev, + shared-mime-info (>= 0.22), + libhal-dev (>= 0.5) [!kfreebsd-i386 !kfreebsd-amd64], + libcam-dev [kfreebsd-i386 kfreebsd-amd64], + libxtst-dev, + libgnome2-dev (>= 2.14.0), + libxrandr-dev (>= 1.1.1), + libxxf86vm-dev (>= 1.0.1), + libx11-dev, + liblaunchpad-integration-dev (>= 0.1.17), + gnome-doc-utils, + python-dev (>= 2.3), + python-gobject-dev, + python-gtk2-dev (>= 2.12), + libbluetooth-dev, +Standards-Version: 3.7.3 +Homepage: http://www.gnome.org/projects/totem/ + +Package: totem +Architecture: all +Depends: ${misc:Depends}, + totem-plugins (>= ${source:Version}), + totem-gstreamer (>= ${source:Version}) | totem-xine (>= ${source:Version}) +Suggests: totem-plugins-extra +Description: A simple media player for the GNOME desktop (dummy package) + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This dummy package installs Totem with the GStreamer backend by + default. + +Package: totem-xine +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends}, + gnome-icon-theme (>= 2.15.90), + iso-codes, + totem-common (>= ${gnome:Version}), + totem-common (<< ${gnome:NextVersion}) +Recommends: totem-mozilla (= ${source:Version}), + totem-plugins, + libxine1-ffmpeg, + libxine1-gnome +Conflicts: totem (<< 0.99.12-2), + totem-mozilla (<< 2.20.0-3) +Description: A simple media player for the GNOME desktop based on xine + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. It features : + . + * Shoutcast, m3u, asx, SMIL and ra playlists support + * DVD (with menus), VCD and Digital CD (with CDDB) playback + * TV-Out configuration with optional resolution switching + * 4.0, 5.0, 5.1 and stereo audio output + * Full-screen mode (move your mouse and you get nice controls) with + Xinerama, dual-head and RandR support + * Aspect ratio toggling, scaling based on the video's original size + * Full keyboard control + * Simple playlist with repeat mode and saving feature + * GNOME and Nautilus integration + * Screenshot of the current movie + * Brightness and Contrast control + * Visualisation plugin when playing audio-only files + * Video thumbnailer for nautilus + * Nautilus properties page + * Works on remote displays + * DVD, VCD and OGG/OGM subtitles with automatic language selection + * Extensible with plugins + +Package: totem-gstreamer +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends}, + gstreamer0.10-gnomevfs, + gstreamer0.10-plugins-base, + gstreamer0.10-alsa | gstreamer0.10-audiosink, + gstreamer0.10-plugins-good, + gstreamer0.10-x, + gnome-icon-theme (>= 2.15.90), + iso-codes, + totem-common (>= ${gnome:Version}), + totem-common (<< ${gnome:NextVersion}) +Conflicts: totem (<< 0.99.12-2), + gnome-control-center (<< 2.15.90), + totem-mozilla (<< 2.20.0-3) +Recommends: totem-mozilla (= ${source:Version}), + totem-plugins, + gnome-control-center (>= 2.15.90) +Suggests: gstreamer0.10-plugins-ugly, + gstreamer0.10-ffmpeg, + gnome-app-install +Description: A simple media player for the GNOME desktop based on GStreamer + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. It features : + . + * Shoutcast, m3u, asx, SMIL and ra playlists support + * DVD (with menus), VCD and Digital CD (with CDDB) playback + * TV-Out configuration with optional resolution switching + * 4.0, 5.0, 5.1 and stereo audio output + * Full-screen mode (move your mouse and you get nice controls) with + Xinerama, dual-head and RandR support + * Aspect ratio toggling, scaling based on the video's original size + * Full keyboard control + * Simple playlist with repeat mode and saving feature + * GNOME, Nautilus and GnomeVFS integration + * Screenshot of the current movie + * Brightness and Contrast control + * Visualisation plugin when playing audio-only files + * Video thumbnailer for nautilus + * Nautilus properties page + * Works on remote displays + * DVD, VCD and OGG/OGM subtitles with automatic language selection + * Extensible with plugins + +Package: totem-mozilla +Architecture: all +Section: web +Depends: ${misc:Depends}, + totem-gstreamer (>= ${source:Version}) | totem-xine (>= ${source:Version}), + dbus (>= 0.61) +Recommends: epiphany-browser | www-browser +XB-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a +XB-Npp-Name: Totem Mozilla plugin +XB-Npp-MimeType: video/quicktime, video/mp4, image/x-macpaint, image/x-quicktime, application/x-mplayer2, video/x-ms-asf-plugin, video/x-msvideo, video/x-ms-asf, video/x-ms-wmv, video/x-wmv, video/x-ms-wvx, video/x-ms-wm, application/ogg, video/mpeg, audio/wav, audio/x-wav, audio/mpeg +Description: Totem Mozilla plugin + This package contains the Totem Mozilla plugin, which will + enhance your Gecko-based browser to be able to display movie + clips. + . + This plugin should work for Firefox as well as XULRunner based browsers. + +Package: totem-common +Architecture: all +Depends: ${misc:Depends} +Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3) +Description: Data files for the Totem media player + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package contains common data files and translations. + +Package: totem-dbg +Architecture: any +Section: libdevel +Priority: extra +Depends: totem-gstreamer (= ${binary:Version}) | totem-xine (= ${binary:Version}), + ${misc:Depends} +Conflicts: libtotem-plparser1-dbg, libtotem-plparser7-dbg +Description: Debugging symbols for the Totem media player + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package contains detached debugging symbols. + +Package: totem-plugins +Architecture: any +Depends: totem-gstreamer (= ${binary:Version}) | totem-xine (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, + ${python:Depends}, + python-gdata +Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3) +Suggests: gromit +Description: Plugins for the Totem media player + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package contains a set of recommended plugins for Totem, which + allow to: + . + * Control Totem with an Infrared remote control + * Control Totem with the keyboard's media player keys + * Keep the Totem window on top of the screen + * Display movie properties + * Deactivate the screensaver when a movie is playing + * Skip to a defined time in the movie + * Set the away status in the instant messenger when a movie is + playing + * Control totem with a mobile phone using the Bluetooth protocol + * Share the current playlist via HTTP + * Search, browse for and play videos from YouTube + * Search for videos using tracker + . + Additional plugins can be written in C, Python or Vala. + +Package: totem-plugins-extra +Architecture: any +Depends: totem-gstreamer (= ${binary:Version}) | totem-xine (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Recommends: gromit +Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3), totem-plugins (<< 2.22.0-0ubuntu3) +Description: Extra plugins for the Totem media player + Totem is a simple yet featureful media player for GNOME which can read + a large number of file formats. + . + This package contains an extra set plugins for Totem, which allow to: + . + * A live TV and recordings viewer + * Annotate the screen with the Gromit tool + . + Additional plugins can be written in C, Python or Vala. --- totem-2.23.3.orig/debian/totem-gstreamer.README.Debian +++ totem-2.23.3/debian/totem-gstreamer.README.Debian @@ -0,0 +1,9 @@ +---[ Configuring the output sink + +You can choose your preferred output sink by using gnome-sound-properties (in +the gnome-control-center package), or by editing the GConf key: + /system/gstreamer/0.10/default/musicaudiosink + +The default is to detect your output sink automagically. + + --- totem-2.23.3.orig/debian/totem.xpm +++ totem-2.23.3/debian/totem.xpm @@ -0,0 +1,295 @@ +/* XPM */ +static char *totem32[] = { +/* columns rows colors chars-per-pixel */ +"32 32 257 2", +" c #0036002D0033", +". c #0CF205BE054F", +"X c #0A69088E07CC", +"o c #0B9D0AF70B7E", +"O c #0ECF0F7C1132", +"+ c #0F9B10BD12FF", +"@ c #1054026800A8", +"# c #11D608FB06F2", +"$ c #14860D040B1D", +"% c #11A211D60E03", +"& c #1843117C0E83", +"* c #14FA13561411", +"= c #192014C41318", +"- c #1C561B2C16E8", +"; c #1E0F1A701A4F", +": c #21711E3C1E37", +"> c #35A80ED1065D", +", c #269A24682344", +"< c #293724DE24F4", +"1 c #2C532A6B2C09", +"2 c #318E2ACC2599", +"3 c #34AC2C292B48", +"4 c #378234762B68", +"5 c #3AF2363B2EC1", +"6 c #3AC3396D2CF3", +"7 c #368E33DA35D6", +"8 c #3C1C30B9351E", +"9 c #3C56394D3A23", +"0 c #411939DC3767", +"q c #5C8F296C24A3", +"w c #64622F0E1EB1", +"e c #6C3D2F022631", +"r c #73AF2EA72E2E", +"t c #79783FA73260", +"y c #49A044363EE0", +"u c #50B84BD33B0E", +"i c #765643D233CC", +"p c #424942484258", +"a c #48BB47A94871", +"s c #4B45494E4A58", +"d c #4CF9443D41CB", +"f c #55E24790468B", +"g c #537C49E545CC", +"h c #5AF05A0A415E", +"j c #597F56BA5301", +"k c #5F735A5558B1", +"l c #5B3F5B40562C", +"z c #661C5D7E5420", +"x c #68805D5956EF", +"c c #6C6B5B825C68", +"v c #7A8A556E4A0F", +"b c #6FBD69DA576D", +"n c #6D206BD46025", +"m c #63E164AA6A7D", +"M c #67DD6BCB7E26", +"N c #774E6BAB64BA", +"B c #7DF96FEB7031", +"V c #771973BF64F9", +"C c #75AA77846F32", +"Z c #7CAB74E2738A", +"A c #7FAD7BA679CB", +"S c #8ADF392725FE", +"D c #86E53C0039C8", +"F c #8CAF39983584", +"G c #86E13D3F376D", +"H c #8F2743CF393A", +"J c #8435508E3E97", +"K c #ABCF52003F09", +"L c #82B260394D6E", +"P c #95075EF74BF6", +"I c #827680605D44", +"U c #9F1E6D7D5C19", +"Y c #842B6AD16418", +"T c #841276DA6CEB", +"R c #81427C5B79D8", +"E c #8E9A785C70AB", +"W c #89947C7970E2", +"Q c #8B477CEA7D44", +"! c #93E070E16588", +"~ c #989178B873FA", +"^ c #ACCE58C547CE", +"/ c #B19F56994769", +"( c #B1A95C2643A8", +") c #B1DB5C9D4944", +"_ c #A3D86F875AA0", +"` c #BD4366315105", +"' c #BDA66B6953CE", +"] c #A17E6D8A614A", +"[ c #A59873C460E0", +"{ c #A53F7AB56C16", +"} c #C266684D584A", +"| c #C34F7E885D15", +" . c #CB4F78755490", +".. c #CB7175415E7A", +"X. c #CC82795C5564", +"o. c #D32C799C5D55", +"O. c #D9D57CE15ED3", +"+. c #C86179CA60A4", +"@. c #D31F7FD761E1", +"#. c #DF128021615F", +"$. c #8D1E89C062AE", +"%. c #8B158240644A", +"&. c #8F698D067CF6", +"*. c #934B8FAB670C", +"=. c #95B8874A7EB6", +"-. c #92ED9185685A", +";. c #95E3940B6B66", +":. c #99A992BF6D31", +">. c #9DA195D27124", +",. c #9E3394B67E10", +"<. c #9DF09A1E73F1", +"1. c #A59183A2729B", +"2. c #A6F890067FBC", +"3. c #A2639E2579B9", +"4. c #A9EB9B967C5F", +"5. c #A8F5A3E57F8F", +"6. c #CF7184796493", +"7. c #C2A18FFE792B", +"8. c #D3EA8190660D", +"9. c #DA358CC06DBD", +"0. c #D8CD8FA2753E", +"q. c #DBA18D4970B5", +"w. c #E3CA8E556F30", +"e. c #E1799BDD7EB5", +"r. c #EDB198647DF7", +"t. c #F1168F777D4F", +"y. c #8681894C815E", +"u. c #882A8EC08BB2", +"i. c #895E84268109", +"p. c #85A88ABB9E6A", +"a. c #8E8990509D2D", +"s. c #90DB8D69877D", +"d. c #869793A4A938", +"f. c #899A97BBAE09", +"g. c #949297FEA2AD", +"h. c #958B9B91A817", +"j. c #927D9B4DB63B", +"k. c #A0C88EC282A1", +"l. c #A73B98778929", +"z. c #AC0B9CC38D04", +"x. c #ADBC9EB89298", +"c. c #B7259CF39ADE", +"v. c #AF2EA82985BE", +"b. c #AE05A0CB9036", +"n. c #AE57A8AD8524", +"m. c #AA8BA8EA9914", +"M. c #B2CFA1348418", +"N. c #B7EEAF828E9C", +"B. c #BD24A6EC8E99", +"V. c #B89BA7AC9772", +"C. c #B8D3A85297EA", +"Z. c #BBAFAA7E99F5", +"A. c #B885B3F49694", +"S. c #ABB4A73DB09D", +"D. c #AA1AB0F1ABE9", +"F. c #B8A0AEEAA9BA", +"G. c #B92AA566AA14", +"H. c #BB66AA23A799", +"J. c #BD45B04FB37E", +"K. c #B841B582AD8F", +"L. c #B636B5D4B2DE", +"P. c #B666BD6FB52B", +"I. c #C03CB3EEB380", +"U. c #BE05BAB8B6A7", +"Y. c #C3879B929C15", +"T. c #DB769C8C82C2", +"R. c #C82BAE189976", +"E. c #C2FAB4279E51", +"W. c #C1ECAC69ABAA", +"Q. c #C526B317A246", +"!. c #C247BEA6A672", +"~. c #CBBBB672A67D", +"^. c #CEE3B14BAF8C", +"/. c #CBFCBC4FA570", +"(. c #CDFCBC71AAC5", +"). c #C647BE76BD02", +"_. c #D42AAD2DAA8C", +"`. c #D845B12BAEBA", +"'. c #D1CBBF6FADA0", +"]. c #DBECBD6FAEC5", +"[. c #D4C2B6A6B341", +"{. c #D6ECB9C6B381", +"}. c #DBAEBEA1B27E", +"|. c #E79C99E18123", +" X c #F692936C80D0", +".X c #ED32A38E89FC", +"XX c #E604AD28978E", +"oX c #FBE9A88088AD", +"OX c #FB8DAC608C1F", +"+X c #F422A9CD96BF", +"@X c #FD4BAE7A933D", +"#X c #F5FEBA729DD4", +"$X c #FFFFB0E6959C", +"%X c #FAB0B38A9C1A", +"&X c #F359B3AC95B4", +"*X c #E1BFB573B114", +"=X c #C5C1C35EADDD", +"-X c #C3BFC664B7A9", +";X c #C482C700BCDD", +":X c #C4F4CA67BF81", +">X c #C959C7C3B44D", +",X c #CCD8CB81BB8B", +" w i L P _ ] ~ M o YXYXYXYXYXYXYXYXYXYXYXYXYXYX", +"p > S ( ' 8.r.@X$X`.j.+ YXYXYXYXYXYXYXYXYXYXYXYXYXYX", +"p . e ) ' ` +.q.q.0.G.p.O YXYXYXYXYXYXYXYXYXYXYXYXYXYX", +"p . H ' 8.o. .6.9.e.S.a.o YXYXYXYXYXYXYXYXYXYXYXYXYXYX", +"p # H ` w.OX&X#X#X+XI.g.+ YXYXYXYXYXYXYXYXYXYXYX", +"p . F ( 8.oX0XcX%Xt._.g.+ X ; 8 d y 4 = . YXYXYXYXYXYXYXYX", +"p . r F K o.|.XX..` Y.d.1 z k.c.5X1Xz.W z , YXYXYXYXYXYX", +"p . . . $ $ $ @ # ; s F.gX8X[.pX1XZ.Z.'.,.6 o YXYXYXYXYX", +"p @ > w i L P _ L f W.LXPXfX}.5X1XZ.Q. S ) ' @.r.|.! G.bXbXLXSX7X}.{.Z.(.N.;.-.%.2 YXYXYXYX", +"p . e ) ' ` ..9._ s.LXLXbXbXZXgX5X>XE.E.<.-.4.R.E * YXYXYXYX", +"p . H ' 8.8.X.| L E.SXPXPXAXLXIXKXHXjXA.>.B.].sX6Xp YXYXYX", +"< . G ^ 6.e.T.7.Y ~.7X9XgXZXIXuXi.Z K.rXX=X!.V o YXYXYX", +"YXYXYXYXYXYXYXYXYX 0 l.V.Z.Q./.2XeXU.L.kXJXzXlXhXyXwXl o YXYXYX", +"YXYXYXYXYXYXYXYXYX * T E.(.XyXlXgX9Xx.< . YXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYX - h *.M.4XnXiX:X!.eXlXlXx.5 o YXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXYX * u k.7XCXuXqX!.,X).Q 3 . YXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXYXYX X 3 N m.P.D.&.n p * X YXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXYXYX o ; - * = O X YXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX YXYXYXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX" +}; --- totem-2.23.3.orig/debian/totem-gstreamer.menu +++ totem-2.23.3/debian/totem-gstreamer.menu @@ -0,0 +1,6 @@ +?package(totem-gstreamer):\ +needs="X11"\ +section="Applications/Video"\ +title="totem (GStreamer)"\ +icon="/usr/share/pixmaps/totem.xpm"\ +command="/usr/bin/totem-gstreamer" --- totem-2.23.3.orig/debian/copyright +++ totem-2.23.3/debian/copyright @@ -0,0 +1,59 @@ +This package was debianized by Sebastien Bacher on +Sat, 24 Aug 2002 15:12:51 +0200. + +It was downloaded from http://www.hadess.net/totem.php3 + +Upstream Author: Bastien Nocera + +License: + + Totem is distributed under the GPL by default, with a special excemption + clause added: + + This package 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 package 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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + + The excemption clause is: + The Totem project hereby grants permission for non-GPL compatible GStreamer + plugins to be used and distributed together with GStreamer and Totem. This + permission is above and beyond the permissions granted by the GPL licensei + by which Totem is covered. If you modify this code, you may. extend this + exception to your version of the code, but you are not obligated. to do + so. If you do not wish to do so, delete this exception statement from. + your version. + + The Totem Playlist parser library, "pl-parser", is licensed under the terms of + the LGPL. This includes the files starting with totem-pl-parser* in the src + directory. See for + details. + + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This package 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. --- totem-2.23.3.orig/debian/totem-xine.menu +++ totem-2.23.3/debian/totem-xine.menu @@ -0,0 +1,6 @@ +?package(totem-xine):\ +needs="X11"\ +section="Applications/Video"\ +title="totem (Xine)"\ +icon="/usr/share/pixmaps/totem.xpm"\ +command="/usr/bin/totem-xine" --- totem-2.23.3.orig/debian/totem-xine.prerm +++ totem-2.23.3/debian/totem-xine.prerm @@ -0,0 +1,14 @@ +#! /bin/sh +set -e + +FLAVOUR=xine + +if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then + update-alternatives --quiet --remove gnome-video-thumbnailer \ + /usr/bin/totem-${FLAVOUR}-video-thumbnailer + update-alternatives --quiet --remove totem /usr/bin/totem-${FLAVOUR} +fi + +#DEBHELPER# + +exit 0 --- totem-2.23.3.orig/debian/patches/70_autoconf.patch +++ totem-2.23.3/debian/patches/70_autoconf.patch @@ -0,0 +1,813 @@ +Generated with aclocal && autoconf && rm -rf autom4te.cache + +Index: totem-2.23.3/aclocal.m4 +=================================================================== +--- totem-2.23.3.orig/aclocal.m4 2008-06-10 16:50:49.000000000 +0200 ++++ totem-2.23.3/aclocal.m4 2008-06-10 16:54:52.000000000 +0200 +@@ -714,6 +714,10 @@ + DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS" + AC_SUBST(DISTCHECK_CONFIGURE_FLAGS) + ++dnl disable scrollkeeper automatically for distcheck ++DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS" ++AC_SUBST(DISTCHECK_CONFIGURE_FLAGS) ++ + AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) + ]) + +@@ -1106,6 +1110,8 @@ + + _LT_REQUIRED_DARWIN_CHECKS + ++_LT_REQUIRED_DARWIN_CHECKS ++ + AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) + AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], + enable_win32_dll=yes, enable_win32_dll=no) +@@ -2629,6 +2635,18 @@ + dynamic_linker='NetBSD ld.elf_so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -2816,6 +2834,13 @@ + [lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + ++AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], ++[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) ++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], ++[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) ++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++ + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +@@ -4910,6 +4935,11 @@ + _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` + fi + ++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= ++if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then ++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` ++fi ++ + # PORTME: override above test on systems where it is broken + ifelse([$1],[CXX], + [case $host_os in +@@ -5531,6 +5561,10 @@ + # library + compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) + ++# The directories searched by this compiler when creating a shared ++# library ++compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) ++ + # The library search path used internally by the compiler when linking + # a shared library. + compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) +Index: totem-2.23.3/configure +=================================================================== +--- totem-2.23.3.orig/configure 2008-06-10 16:50:53.000000000 +0200 ++++ totem-2.23.3/configure 2008-06-10 16:54:57.000000000 +0200 +@@ -6771,6 +6771,9 @@ + DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS" + + ++DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS" ++ ++ + if test "$gdu_cv_have_gdu" = "yes"; then + HAVE_GNOME_DOC_UTILS_TRUE= + HAVE_GNOME_DOC_UTILS_FALSE='#' +@@ -8025,7 +8028,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 8028 "configure"' > conftest.$ac_ext ++ echo '#line 8031 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -10043,6 +10046,318 @@ + esac + + ++ ++ case $host_os in ++ rhapsody* | darwin*) ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. ++set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_DSYMUTIL+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$DSYMUTIL"; then ++ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # 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_DSYMUTIL="${ac_tool_prefix}dsymutil" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++DSYMUTIL=$ac_cv_prog_DSYMUTIL ++if test -n "$DSYMUTIL"; then ++ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 ++echo "${ECHO_T}$DSYMUTIL" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_DSYMUTIL"; then ++ ac_ct_DSYMUTIL=$DSYMUTIL ++ # Extract the first word of "dsymutil", so it can be a program name with args. ++set dummy dsymutil; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_DSYMUTIL"; then ++ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # 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_ac_ct_DSYMUTIL="dsymutil" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL ++if test -n "$ac_ct_DSYMUTIL"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 ++echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_ct_DSYMUTIL" = x; then ++ DSYMUTIL=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ DSYMUTIL=$ac_ct_DSYMUTIL ++ fi ++else ++ DSYMUTIL="$ac_cv_prog_DSYMUTIL" ++fi ++ ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. ++set dummy ${ac_tool_prefix}nmedit; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_NMEDIT+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$NMEDIT"; then ++ ac_cv_prog_NMEDIT="$NMEDIT" # 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_NMEDIT="${ac_tool_prefix}nmedit" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++NMEDIT=$ac_cv_prog_NMEDIT ++if test -n "$NMEDIT"; then ++ { echo "$as_me:$LINENO: result: $NMEDIT" >&5 ++echo "${ECHO_T}$NMEDIT" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_NMEDIT"; then ++ ac_ct_NMEDIT=$NMEDIT ++ # Extract the first word of "nmedit", so it can be a program name with args. ++set dummy nmedit; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_NMEDIT"; then ++ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # 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_ac_ct_NMEDIT="nmedit" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT ++if test -n "$ac_ct_NMEDIT"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 ++echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_ct_NMEDIT" = x; then ++ NMEDIT=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ NMEDIT=$ac_ct_NMEDIT ++ fi ++else ++ NMEDIT="$ac_cv_prog_NMEDIT" ++fi ++ ++ ++ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 ++echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } ++if test "${lt_cv_apple_cc_single_mod+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_apple_cc_single_mod=no ++ if test -z "${LT_MULTI_MODULE}"; then ++ # By default we will add the -single_module flag. You can override ++ # by either setting the environment variable LT_MULTI_MODULE ++ # non-empty at configure time, or by adding -multi_module to the ++ # link flags. ++ echo "int foo(void){return 1;}" > conftest.c ++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++ -dynamiclib ${wl}-single_module conftest.c ++ if test -f libconftest.dylib; then ++ lt_cv_apple_cc_single_mod=yes ++ rm -rf libconftest.dylib* ++ fi ++ rm conftest.c ++ fi ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 ++echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } ++ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 ++echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } ++if test "${lt_cv_ld_exported_symbols_list+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_ld_exported_symbols_list=no ++ save_LDFLAGS=$LDFLAGS ++ echo "_main" > conftest.sym ++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++ lt_cv_ld_exported_symbols_list=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ lt_cv_ld_exported_symbols_list=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++ LDFLAGS="$save_LDFLAGS" ++ ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 ++echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } ++ case $host_os in ++ rhapsody* | darwin1.[0123]) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; ++ darwin1.*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ darwin*) ++ # if running on 10.5 or later, the deployment target defaults ++ # to the OS version, if on x86, and 10.4, the deployment ++ # target defaults to 10.4. Don't you love it? ++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in ++ 10.0,*86*-darwin8*|10.0,*-darwin[91]*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ 10.[012]*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ 10.*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ esac ++ ;; ++ esac ++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then ++ _lt_dar_single_mod='$single_module' ++ fi ++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then ++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' ++ else ++ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" ++ fi ++ if test "$DSYMUTIL" != ":"; then ++ _lt_dsymutil="~$DSYMUTIL \$lib || :" ++ else ++ _lt_dsymutil= ++ fi ++ ;; ++ esac ++ ++ + enable_dlopen=no + enable_win32_dll=no + +@@ -10136,11 +10451,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:10139: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:10454: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:10143: \$? = $ac_status" >&5 ++ echo "$as_me:10458: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -10426,11 +10741,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:10429: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:10744: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:10433: \$? = $ac_status" >&5 ++ echo "$as_me:10748: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -10530,11 +10845,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:10533: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:10848: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:10537: \$? = $ac_status" >&5 ++ echo "$as_me:10852: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -12067,6 +12382,18 @@ + dynamic_linker='NetBSD ld.elf_so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -12263,6 +12590,21 @@ + + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ++fi ++ ++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ++fi ++ ++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++ + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +@@ -12907,7 +13249,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5) ++ (eval echo "\"\$as_me:15762: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15415: \$? = $ac_status" >&5 ++ echo "$as_me:15766: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -15512,11 +15863,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15515: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15866: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:15519: \$? = $ac_status" >&5 ++ echo "$as_me:15870: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -16045,6 +16396,18 @@ + dynamic_linker='NetBSD ld.elf_so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -16241,6 +16604,21 @@ + + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ++fi ++ ++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ++fi ++ ++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++ + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +@@ -16577,6 +16955,10 @@ + # library + compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX + ++# The directories searched by this compiler when creating a shared ++# library ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX ++ + # The library search path used internally by the compiler when linking + # a shared library. + compiler_lib_search_path=$lt_compiler_lib_search_path_CXX +@@ -17110,11 +17492,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17113: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17495: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17117: \$? = $ac_status" >&5 ++ echo "$as_me:17499: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -17214,11 +17596,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17217: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17599: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:17221: \$? = $ac_status" >&5 ++ echo "$as_me:17603: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -18679,6 +19061,18 @@ + dynamic_linker='NetBSD ld.elf_so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -18875,6 +19269,21 @@ + + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ++fi ++ ++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ++fi ++ ++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++ + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +@@ -19211,6 +19620,10 @@ + # library + compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77 + ++# The directories searched by this compiler when creating a shared ++# library ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77 ++ + # The library search path used internally by the compiler when linking + # a shared library. + compiler_lib_search_path=$lt_compiler_lib_search_path_F77 +@@ -19434,11 +19847,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:19437: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:19850: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:19441: \$? = $ac_status" >&5 ++ echo "$as_me:19854: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -19724,11 +20137,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:19727: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:20140: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:19731: \$? = $ac_status" >&5 ++ echo "$as_me:20144: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -19828,11 +20241,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:19831: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:20244: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:19835: \$? = $ac_status" >&5 ++ echo "$as_me:20248: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -21313,6 +21726,18 @@ + dynamic_linker='NetBSD ld.elf_so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -21509,6 +21934,21 @@ + + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ++fi ++ ++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ++fi ++ ++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++ + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +@@ -21845,6 +22285,10 @@ + # library + compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ + ++# The directories searched by this compiler when creating a shared ++# library ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ ++ + # The library search path used internally by the compiler when linking + # a shared library. + compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ +@@ -22331,6 +22775,10 @@ + # library + compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC + ++# The directories searched by this compiler when creating a shared ++# library ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC ++ + # The library search path used internally by the compiler when linking + # a shared library. + compiler_lib_search_path=$lt_compiler_lib_search_path_RC --- totem-2.23.3.orig/debian/patches/60_build_libbaconvideowidget_statically.patch +++ totem-2.23.3/debian/patches/60_build_libbaconvideowidget_statically.patch @@ -0,0 +1,157 @@ +Index: totem-2.23.3/src/backend/Makefile.am +=================================================================== +--- totem-2.23.3.orig/src/backend/Makefile.am 2008-06-10 16:50:33.000000000 +0200 ++++ totem-2.23.3/src/backend/Makefile.am 2008-06-10 16:50:41.000000000 +0200 +@@ -1,6 +1,6 @@ + noinst_PROGRAMS = bvw-test + +-lib_LTLIBRARIES = libbaconvideowidget.la ++noinst_LTLIBRARIES = libbaconvideowidget.la + + bvw_test_SOURCES = bvw-test.c + +Index: totem-2.23.3/src/backend/Makefile.in +=================================================================== +--- totem-2.23.3.orig/src/backend/Makefile.in 2008-06-10 16:50:30.000000000 +0200 ++++ totem-2.23.3/src/backend/Makefile.in 2008-06-10 16:50:57.000000000 +0200 +@@ -53,15 +53,7 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(libdir)" +-libLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(lib_LTLIBRARIES) ++LTLIBRARIES = $(noinst_LTLIBRARIES) + am__DEPENDENCIES_1 = + libbaconvideowidget_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +@@ -156,6 +148,7 @@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ + DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -254,6 +247,7 @@ + NAUTILUSDIR = @NAUTILUSDIR@ + NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ + NAUTILUS_LIBS = @NAUTILUS_LIBS@ ++NMEDIT = @NMEDIT@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + NVTV_CFLAGS = @NVTV_CFLAGS@ + NVTV_LIBS = @NVTV_LIBS@ +@@ -370,7 +364,7 @@ + target_alias = @target_alias@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-lib_LTLIBRARIES = libbaconvideowidget.la ++noinst_LTLIBRARIES = libbaconvideowidget.la + bvw_test_SOURCES = bvw-test.c + bvw_test_CPPFLAGS = \ + -I$(top_srcdir)/plparse \ +@@ -454,35 +448,17 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-libLTLIBRARIES: $(lib_LTLIBRARIES) +- @$(NORMAL_INSTALL) +- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +- if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-libLTLIBRARIES: +- @$(NORMAL_UNINSTALL) +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ +- done + +-clean-libLTLIBRARIES: +- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++clean-noinstLTLIBRARIES: ++ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) ++ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libbaconvideowidget.la: $(libbaconvideowidget_la_OBJECTS) $(libbaconvideowidget_la_DEPENDENCIES) +- $(libbaconvideowidget_la_LINK) -rpath $(libdir) $(libbaconvideowidget_la_OBJECTS) $(libbaconvideowidget_la_LIBADD) $(LIBS) ++ $(libbaconvideowidget_la_LINK) $(libbaconvideowidget_la_OBJECTS) $(libbaconvideowidget_la_LIBADD) $(LIBS) + + clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; for p in $$list; do \ +@@ -688,9 +664,6 @@ + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) + installdirs: +- for dir in "$(DESTDIR)$(libdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -720,7 +693,7 @@ + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + clean: clean-am + +-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ ++clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ + clean-noinstPROGRAMS mostlyclean-am + + distclean: distclean-am +@@ -743,7 +716,7 @@ + + install-dvi: install-dvi-am + +-install-exec-am: install-libLTLIBRARIES ++install-exec-am: + + install-html: install-html-am + +@@ -775,23 +748,23 @@ + + ps-am: + +-uninstall-am: uninstall-libLTLIBRARIES ++uninstall-am: + + .MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +- clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS ctags \ +- distclean distclean-compile distclean-generic \ ++ clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ ++ ctags distclean distclean-compile distclean-generic \ + distclean-libtool 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-libLTLIBRARIES install-man install-pdf \ +- install-pdf-am install-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags uninstall uninstall-am uninstall-libLTLIBRARIES ++ tags uninstall uninstall-am + + $(DISABLE_DEPRECATED) \ + $(AM_CPPFLAGS) --- totem-2.23.3.orig/debian/patches/30_totem_xulrunner19.patch +++ totem-2.23.3/debian/patches/30_totem_xulrunner19.patch @@ -0,0 +1,166 @@ +Summary: + +Fix configure.in to detect xulrunner-1.9 as gecko=mozilla 1.9 + - update configure.in: + +Instructions: + +1. Drop this into debian/patches directory of totem package and add the filename +used into the debian/patches/series file such that it gets applied _before_ the +autoconf patch. +2. Update autoconf patch by: QUILT_PATCHES=debian/patches quilt push -a; autoconf; quilt refresh --diffstat -U --no-timestamps +3. Build as usually (e.g. dpkg-buildpackage -rfakeroot -b) + +Tested Package Versions: + + totem >= 2.21.2-0ubuntu2, build: OK, works: OK (asac) + +--- + configure.in | 77 ++++++++++++++++++++++++++++++++++++++++++++--------------- + 1 file changed, 58 insertions(+), 19 deletions(-) + +Index: totem-2.23.3/configure.in +=================================================================== +--- totem-2.23.3.orig/configure.in 2008-06-10 16:47:29.000000000 +0200 ++++ totem-2.23.3/configure.in 2008-06-10 16:47:29.000000000 +0200 +@@ -592,13 +592,19 @@ + if test -z "$with_gecko"; then + dnl Autodetect gecko + for g in $GECKOS; do ++ if $PKG_CONFIG --exists $g-plugin; then ++ gecko=$g ++ break; ++ fi + if $PKG_CONFIG --exists $g-xpcom; then + gecko=$g + break; + fi + done + elif ! $PKG_CONFIG --exists $gecko-xpcom; then +- AC_MSG_ERROR([Gecko "$gecko" not found]) ++ if ! $PKG_CONFIG --exists $gecko-plugin; then ++ AC_MSG_ERROR([Gecko "$gecko" not found]) ++ fi + fi + + if test -z "$gecko" -a "$enable_browser_plugins" = "autodetect"; then +@@ -636,24 +642,35 @@ + # Check for mozilla modules, but keep the CFLAGS and LIBS in + # separate vars + if test "$enable_browser_plugins" = "yes" ; then +- PKG_CHECK_MODULES([MOZILLA_NOT_LINKED], +- [$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \ +- $MOZILLA-plugin],, +- [enable_browser_plugins=no]) ++ if $PKG_CONFIG --exists $MOZILLA-plugin; then ++ MOZILLA_VERSION_MIN=1.9 ++ PKG_CHECK_MODULES([MOZILLA_NOT_LINKED], ++ [libxul $MOZILLA-plugin >= $MOZILLA_VERSION_MIN],, ++ [enable_browser_plugins=no]) ++ else ++ PKG_CHECK_MODULES([MOZILLA_NOT_LINKED], ++ [$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \ ++ $MOZILLA-plugin],, ++ [enable_browser_plugins=no]) ++ fi + fi + # Check for other required modules, and merge CFLAGS, but not link + # flags to avoid linking against -lxpcom -lplds4 -lplc4 -lnspr4 + if test "$enable_browser_plugins" = "yes" ; then + PKG_CHECK_MODULES([BROWSER_PLUGIN], + [glib-2.0 +- gnome-vfs-2.0 >= $GNOMEVFS_REQS +- gnome-vfs-module-2.0 >= $GNOMEVFS_REQS +- gthread-2.0 +- totem-plparser-mini >= $TOTEM_PLPARSER_REQS], ++ gnome-vfs-2.0 >= $GNOMEVFS_REQS ++ gnome-vfs-module-2.0 >= $GNOMEVFS_REQS ++ gthread-2.0 ++ totem-plparser-mini >= $TOTEM_PLPARSER_REQS], + [],[enable_browser_plugins=no]) + + BROWSER_PLUGIN_CFLAGS="$MOZILLA_NOT_LINKED_CFLAGS $BROWSER_PLUGIN_CFLAGS" + AC_SUBST([BROWSER_PLUGIN_CFLAGS]) ++ # for xul 1.9 we have to link anyway ++ if test "$MOZILLA_VERSION_MIN" = 1.9; then ++ BROWSER_PLUGIN_LIBS="$MOZILLA_NOT_LINKED_LIBS $BROWSER_PLUGIN_LIBS" ++ fi + AC_SUBST([BROWSER_PLUGIN_LIBS]) + + # Earlier versions misdetect playlists +@@ -685,10 +702,18 @@ + + # Sets some variables, and check for xpidl + if test "$enable_browser_plugins" = "yes" ; then +- MOZILLA_PREFIX="`$PKG_CONFIG $MOZILLA-xpcom --variable=prefix`" +- MOZILLA_LIBDIR="`$PKG_CONFIG $MOZILLA-xpcom --variable=libdir`" +- MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-xpcom`" +- MOZILLA_XPCOM_CFLAGS="-I`$PKG_CONFIG --variable=includedir $MOZILLA-xpcom`" ++ if $PKG_CONFIG --exists $MOZILLA-plugin; then ++ MOZILLA_PREFIX="`$PKG_CONFIG $MOZILLA-plugin --variable=prefix`" ++ MOZILLA_LIBDIR="`$PKG_CONFIG $MOZILLA-plugin --variable=sdkdir`/bin" ++ MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-plugin`" ++ MOZILLA_XPCOM_CFLAGS="`$PKG_CONFIG --cflags $MOZILLA-plugin` `$PKG_CONFIG --cflags libxul-unstable`" ++ else ++ MOZILLA_PREFIX="`$PKG_CONFIG $MOZILLA-plugin --variable=prefix`" ++ MOZILLA_LIBDIR="`$PKG_CONFIG $MOZILLA-plugin --variable=libdir`" ++ MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-xpcom`" ++ MOZILLA_XPCOM_CFLAGS="`$PKG_CONFIG --cflags $MOZILLA-xpcom`" ++ fi ++ + MOZILLA_PLUGINDIR="${MOZILLA_PLUGINDIR:-"\${libdir}/mozilla/plugins"}" + + AC_PATH_PROG([MOZILLA_XPIDL], [xpidl], [no], [$MOZILLA_LIBDIR:$PATH]) +@@ -710,8 +735,12 @@ + + # Search for the idl include directory + if test "$enable_browser_plugins" = "yes" ; then +- dnl This only works on gecko 1.8 +- MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir $MOZILLA-xpcom`" ++ dnl This only works on gecko 1.9 and 1.8 ++ if $PKG_CONFIG --exists libxul; then ++ MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir libxul`/unstable" ++ else ++ MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir $MOZILLA-xpcom`" ++ fi + dnl Fallback for older versions + if test "x$MOZILLA_IDLDIR" = "x"; then + MOZILLA_IDLDIR="`echo $MOZILLA_LIBDIR | sed -e s!lib!share/idl!`" +@@ -743,8 +772,14 @@ + + CPPFLAGS="$CPPFLAGS -I$MOZILLA_INCLUDE_ROOT" + CXXFLAGS="$CXXFLAGS $MOZILLA_NOT_LINKED_CFLAGS" +- LIBS="$LIBS -L$MOZILLA_LIBDIR -lxpcom -lxpcomglue_s" +- LDFLAGS="$LDFLAGS -Wl,--rpath -Wl,$MOZILLA_LIBDIR" ++ if test $MOZILLA_VERSION_MIN = 1.9; then ++ CPPFLAGS="$CPPFLAGS -I$MOZILLA_INCLUDE_ROOT/unstable" ++ LIBS="$LIBS $MOZILLA_NOT_LINKED_LIBS" ++ LDFLAGS="$LDFLAGS -Wl,--rpath -Wl,$MOZILLA_LIBDIR" ++ else ++ LIBS="$LIBS -L$MOZILLA_LIBDIR -lxpcom -lxpcomglue_s" ++ LDFLAGS="$LDFLAGS -Wl,--rpath -Wl,$MOZILLA_LIBDIR" ++ fi + + AC_MSG_CHECKING([for libxpcomglue_s]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +@@ -765,7 +800,11 @@ + AC_LANG_POP([C++]) + + if test "$have_libxpcomglue_s" = "yes"; then +- LIBXPCOMGLUE_S="-L$MOZILLA_LIBDIR -lxpcomglue_s" ++ if test $MOZILLA_VERSION_MIN = 1.9; then ++ LIBXPCOMGLUE_S="$MOZILLA_NOT_LINKED_LIBS" ++ else ++ LIBXPCOMGLUE_S="-L$MOZILLA_LIBDIR -lxpcomglue_s" ++ fi + else + AC_MSG_WARN([libxpcomglue_s not available; plugins may not be portable]) + fi +@@ -797,7 +836,7 @@ + if test "$enable_browser_plugins" = "yes"; then + AC_LANG_PUSH([C++]) + __SAVE_CPPFLAGS=$CPPFLAGS +- CPPFLAGS="$CPPFLAGS $MOZILLA_NOT_LINKED_CFLAGS -I$MOZILLA_INCLUDE_ROOT -I$MOZILLA_INCLUDE_ROOT/xpcom" ++ CPPFLAGS="$CPPFLAGS $MOZILLA_NOT_LINKED_CFLAGS -I$MOZILLA_INCLUDE_ROOT/xpcom -I$MOZILLA_INCLUDE_ROOT/unstable -I$MOZILLA_INCLUDE_ROOT/stable" + + AC_CHECK_HEADERS([nsTArray.h]) + --- totem-2.23.3.orig/debian/patches/series +++ totem-2.23.3/debian/patches/series @@ -0,0 +1,7 @@ +01_gecko_iceape.patch +02_lpi.patch +04_desktop_gettext_domain.patch +20_use_alternatives.patch +30_totem_xulrunner19.patch +60_build_libbaconvideowidget_statically.patch +70_autoconf.patch --- totem-2.23.3.orig/debian/patches/01_gecko_iceape.patch +++ totem-2.23.3/debian/patches/01_gecko_iceape.patch @@ -0,0 +1,22 @@ +Index: totem-2.22.2/configure.in +=================================================================== +--- totem-2.22.2.orig/configure.in 2008-05-12 15:02:18.940935777 +0200 ++++ totem-2.22.2/configure.in 2008-05-12 15:10:37.900429391 +0200 +@@ -584,7 +584,7 @@ if test "$enable_browser_plugins" != "no + # backward compat + AC_ARG_WITH([mozilla],[],[with_gecko=$withval]) + +- GECKOS="xulrunner firefox mozilla-firefox seamonkey mozilla" ++ GECKOS="xulrunner firefox mozilla-firefox seamonkey mozilla iceape" + gecko=$with_gecko + + if test -z "$with_gecko"; then +@@ -615,7 +615,7 @@ if test "$enable_browser_plugins" != "no + + case "$gecko" in + mozilla) MOZILLA_VERSION_MIN=1.7 ;; +- seamonkey) MOZILLA_VERSION_MIN=1.0 ;; ++ seamonkey|iceape) MOZILLA_VERSION_MIN=1.0 ;; + *firefox) MOZILLA_VERSION_MIN=1.0 ;; + xulrunner) MOZILLA_VERSION_MIN=1.8 ;; + esac --- totem-2.23.3.orig/debian/patches/04_desktop_gettext_domain.patch +++ totem-2.23.3/debian/patches/04_desktop_gettext_domain.patch @@ -0,0 +1,10 @@ +# Description: add translation domain +# UbuntuSpecific: language pack change +# +--- a/data/totem.desktop.in.in.in 2008-02-27 12:20:20.000000000 +0100 ++++ b/data/totem.desktop.in.in.in 2008-02-27 12:24:13.000000000 +0100 +@@ -14,3 +14,4 @@ + X-GNOME-Bugzilla-OtherBinaries=totem-video-indexer;totem-video-thumbnailer;totem-audio-preview; + X-GNOME-Bugzilla-ExtraInfoScript=@FULL_LIBEXECDIR@/totem/totem-bugreport.py + StartupNotify=true ++X-Ubuntu-Gettext-Domain=totem --- totem-2.23.3.orig/debian/patches/20_use_alternatives.patch +++ totem-2.23.3/debian/patches/20_use_alternatives.patch @@ -0,0 +1,13 @@ +Index: totem-2.20.0/data/schemas.sh +=================================================================== +--- totem-2.20.0.orig/data/schemas.sh 2007-08-26 01:05:12.000000000 +0200 ++++ totem-2.20.0/data/schemas.sh 2007-09-25 14:54:52.714252335 +0200 +@@ -1,7 +1,7 @@ + #!/bin/sh + + OWNER=totem +-COMMAND="$2/totem-video-thumbnailer -s %s %u %o" ++COMMAND="$2/gnome-video-thumbnailer -s %s %u %o" + + . `dirname $0`/mime-functions.sh + --- totem-2.23.3.orig/debian/patches/02_lpi.patch +++ totem-2.23.3/debian/patches/02_lpi.patch @@ -0,0 +1,53 @@ +# Description: launchpad integration changes +# UbuntuSpecific: ubuntu launchpad integration +# +Index: totem-2.23.3/configure.in +=================================================================== +--- totem-2.23.3.orig/configure.in 2008-06-10 16:46:46.000000000 +0200 ++++ totem-2.23.3/configure.in 2008-06-10 16:47:08.000000000 +0200 +@@ -234,11 +234,11 @@ + dnl Also check if we're going to be using GTK+ only + if test x$ENABLE_GTK = "xno" ; then + # FIXME: use gmodule-no-export instead! +- PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES) ++ PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS launchpad-integration gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES) + HAVE_GNOME=yes + else + # FIXME: use gmodule-no-export instead! +- PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES) ++ PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS launchpad-integration gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES) + AC_DEFINE(USE_STABLE_LIBGNOMEUI, 1, [defined if we don't have GNOME]) + AC_DEFINE(HAVE_GTK_ONLY, 1, [defined if GNOME isn't used]) + HAVE_GNOME=no +Index: totem-2.23.3/data/totem.ui +=================================================================== +--- totem-2.23.3.orig/data/totem.ui 2008-03-25 10:24:53.000000000 +0100 ++++ totem-2.23.3/data/totem.ui 2008-06-10 16:46:46.000000000 +0200 +@@ -499,6 +499,7 @@ + + + ++ + + + +Index: totem-2.23.3/src/totem-menu.c +=================================================================== +--- totem-2.23.3.orig/src/totem-menu.c 2008-04-24 17:23:53.000000000 +0200 ++++ totem-2.23.3/src/totem-menu.c 2008-06-10 16:46:46.000000000 +0200 +@@ -26,6 +26,8 @@ + #include + #include + ++#include ++ + #include "totem-menu.h" + #include "totem.h" + #include "totem-interface.h" +@@ -1393,5 +1395,6 @@ + totem->languages_ui_id = gtk_ui_manager_new_merge_id (totem->ui_manager); + totem->subtitles_action_group = NULL; + totem->subtitles_ui_id = gtk_ui_manager_new_merge_id (totem->ui_manager); ++ launchpad_integration_add_ui(totem->ui_manager, "ui/tmw-menubar/help/LaunchpadItems"); + } + --- totem-2.23.3.orig/debian/bug/control +++ totem-2.23.3/debian/bug/control @@ -0,0 +1 @@ +report-with: totem-gstreamer totem-xine --- totem-2.23.3.orig/data/Makefile.in +++ totem-2.23.3/data/Makefile.in @@ -117,6 +117,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -215,6 +216,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/data/icons/Makefile.in +++ totem-2.23.3/data/icons/Makefile.in @@ -94,6 +94,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -192,6 +193,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/data/icons/16x16/Makefile.in +++ totem-2.23.3/data/icons/16x16/Makefile.in @@ -92,6 +92,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -190,6 +191,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/data/icons/48x48/Makefile.in +++ totem-2.23.3/data/icons/48x48/Makefile.in @@ -92,6 +92,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -190,6 +191,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/data/icons/scalable/Makefile.in +++ totem-2.23.3/data/icons/scalable/Makefile.in @@ -92,6 +92,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -190,6 +191,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/data/icons/24x24/Makefile.in +++ totem-2.23.3/data/icons/24x24/Makefile.in @@ -92,6 +92,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -190,6 +191,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/data/icons/32x32/Makefile.in +++ totem-2.23.3/data/icons/32x32/Makefile.in @@ -92,6 +92,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -190,6 +191,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/data/icons/22x22/Makefile.in +++ totem-2.23.3/data/icons/22x22/Makefile.in @@ -92,6 +92,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -190,6 +191,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/src/Makefile.in +++ totem-2.23.3/src/Makefile.in @@ -264,6 +264,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -362,6 +363,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/src/plugins/Makefile.in +++ totem-2.23.3/src/plugins/Makefile.in @@ -143,6 +143,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -241,6 +242,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/src/plugins/gromit/Makefile.in +++ totem-2.23.3/src/plugins/gromit/Makefile.in @@ -115,6 +115,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -213,6 +214,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/src/plugins/tracker/Makefile.in +++ totem-2.23.3/src/plugins/tracker/Makefile.in @@ -117,6 +117,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -215,6 +216,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/src/plugins/mythtv/Makefile.in +++ totem-2.23.3/src/plugins/mythtv/Makefile.in @@ -119,6 +119,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -217,6 +218,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/src/plugins/youtube/Makefile.in +++ totem-2.23.3/src/plugins/youtube/Makefile.in @@ -97,6 +97,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -195,6 +196,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/src/plugins/thumbnail/Makefile.in +++ totem-2.23.3/src/plugins/thumbnail/Makefile.in @@ -115,6 +115,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -213,6 +214,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/src/plugins/screensaver/Makefile.in +++ totem-2.23.3/src/plugins/screensaver/Makefile.in @@ -117,6 +117,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -215,6 +216,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/src/plugins/media-player-keys/Makefile.in +++ totem-2.23.3/src/plugins/media-player-keys/Makefile.in @@ -121,6 +121,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -219,6 +220,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/src/plugins/properties/Makefile.in +++ totem-2.23.3/src/plugins/properties/Makefile.in @@ -128,6 +128,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -226,6 +227,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/src/plugins/sample-vala/Makefile.in +++ totem-2.23.3/src/plugins/sample-vala/Makefile.in @@ -118,6 +118,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -216,6 +217,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/src/plugins/totem/Makefile.in +++ totem-2.23.3/src/plugins/totem/Makefile.in @@ -92,6 +92,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -190,6 +191,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/src/plugins/sidebar-test/Makefile.in +++ totem-2.23.3/src/plugins/sidebar-test/Makefile.in @@ -116,6 +116,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -214,6 +215,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/src/plugins/bemused/Makefile.in +++ totem-2.23.3/src/plugins/bemused/Makefile.in @@ -115,6 +115,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -213,6 +214,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/src/plugins/galago/Makefile.in +++ totem-2.23.3/src/plugins/galago/Makefile.in @@ -116,6 +116,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -214,6 +215,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/src/plugins/sample-python/Makefile.in +++ totem-2.23.3/src/plugins/sample-python/Makefile.in @@ -82,6 +82,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -180,6 +181,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/src/plugins/lirc/Makefile.in +++ totem-2.23.3/src/plugins/lirc/Makefile.in @@ -116,6 +116,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -214,6 +215,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/src/plugins/ontop/Makefile.in +++ totem-2.23.3/src/plugins/ontop/Makefile.in @@ -115,6 +115,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -213,6 +214,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/src/plugins/skipto/Makefile.in +++ totem-2.23.3/src/plugins/skipto/Makefile.in @@ -118,6 +118,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -216,6 +217,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/src/plugins/publish/Makefile.in +++ totem-2.23.3/src/plugins/publish/Makefile.in @@ -118,6 +118,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -216,6 +217,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/help/Makefile.in +++ totem-2.23.3/help/Makefile.in @@ -119,6 +119,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -217,6 +218,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/help/bg/Makefile.in +++ totem-2.23.3/help/bg/Makefile.in @@ -147,6 +147,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -245,6 +246,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/lib/Makefile.in +++ totem-2.23.3/lib/Makefile.in @@ -108,6 +108,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -206,6 +207,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/bindings/Makefile.in +++ totem-2.23.3/bindings/Makefile.in @@ -96,6 +96,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -194,6 +195,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/bindings/vala/Makefile.in +++ totem-2.23.3/bindings/vala/Makefile.in @@ -85,6 +85,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -183,6 +184,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/bindings/python/Makefile.in +++ totem-2.23.3/bindings/python/Makefile.in @@ -109,6 +109,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -207,6 +208,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/browser-plugin/Makefile.in +++ totem-2.23.3/browser-plugin/Makefile.in @@ -326,6 +326,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -424,6 +425,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@ --- totem-2.23.3.orig/browser-plugin/idl/Makefile.in +++ totem-2.23.3/browser-plugin/idl/Makefile.in @@ -105,6 +105,7 @@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -203,6 +204,7 @@ NAUTILUSDIR = @NAUTILUSDIR@ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@ NAUTILUS_LIBS = @NAUTILUS_LIBS@ +NMEDIT = @NMEDIT@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ NVTV_CFLAGS = @NVTV_CFLAGS@ NVTV_LIBS = @NVTV_LIBS@