diff -Nru liboggz-1.1.0/aclocal.m4 liboggz-1.1.1/aclocal.m4 --- liboggz-1.1.0/aclocal.m4 2009-10-08 09:18:31.000000000 +0000 +++ liboggz-1.1.1/aclocal.m4 2010-04-29 01:39:45.000000000 +0000 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10.1 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(AC_AUTOCONF_VERSION, [2.61],, -[m4_warning([this file was generated for autoconf 2.61. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, +[m4_warning([this file was generated for autoconf 2.65. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -395,12 +395,12 @@ # lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) # --------------------------------------------------- m4_define([lt_decl_varnames_tagged], -[_$0(m4_quote(m4_default([$1], [[, ]])), - m4_quote(m4_if([$2], [], - m4_quote(lt_decl_tag_varnames), - m4_quote(m4_shift($@)))), - m4_split(m4_normalize(m4_quote(_LT_TAGS))))]) -m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)]) +[m4_assert([$# <= 2])dnl +_$0(m4_quote(m4_default([$1], [[, ]])), + m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), + m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) +m4_define([_lt_decl_varnames_tagged], +[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) # lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) @@ -960,10 +960,10 @@ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on + darwin*) # darwin 5.x on # 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? + # 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' ;; @@ -1005,7 +1005,11 @@ _LT_TAGVAR(whole_archive_flag_spec, $1)='' _LT_TAGVAR(link_all_deplibs, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" - if test "$GCC" = "yes"; then + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=echo _LT_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_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" @@ -1527,7 +1531,7 @@ lt_cv_sys_max_cmd_len=-1; ;; - cygwin* | mingw*) + cygwin* | mingw* | cegcc*) # On Win9x/ME, this test blows up -- it succeeds, but takes # about 5 minutes as the teststring grows exponentially. # Worse, since 9x/ME are not pre-emptively multitasking, @@ -1695,10 +1699,6 @@ # endif #endif -#ifdef __cplusplus -extern "C" void exit (int); -#endif - void fnord() { int i=42;} int main () { @@ -1714,7 +1714,7 @@ else puts (dlerror ()); - exit (status); + return status; }] _LT_EOF if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then @@ -1753,7 +1753,7 @@ lt_cv_dlopen_self=yes ;; - mingw* | pw32*) + mingw* | pw32* | cegcc*) lt_cv_dlopen="LoadLibrary" lt_cv_dlopen_libs= ;; @@ -2050,6 +2050,7 @@ [AC_REQUIRE([AC_CANONICAL_HOST])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_OBJDUMP])dnl m4_require([_LT_DECL_SED])dnl AC_MSG_CHECKING([dynamic linker characteristics]) m4_if([$1], @@ -2214,14 +2215,14 @@ # libtool to hard-code these into programs ;; -cygwin* | mingw* | pw32*) +cygwin* | mingw* | pw32* | cegcc*) version_type=windows shrext_cmds=".dll" need_version=no need_lib_prefix=no case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) + yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -2244,7 +2245,7 @@ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ;; - mingw*) + mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` @@ -2459,7 +2460,7 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -2682,7 +2683,7 @@ version_type=linux need_lib_prefix=no need_version=no - library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -2706,7 +2707,7 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi - + if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" fi @@ -2983,6 +2984,7 @@ # -- PORTME fill in with the dynamic library characteristics m4_defun([_LT_CHECK_MAGIC_METHOD], [m4_require([_LT_DECL_EGREP]) +m4_require([_LT_DECL_OBJDUMP]) AC_CACHE_CHECK([how to recognize dependent libraries], lt_cv_deplibs_check_method, [lt_cv_file_magic_cmd='$MAGIC_CMD' @@ -3033,6 +3035,12 @@ fi ;; +cegcc) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; + darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; @@ -3091,7 +3099,7 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -3344,7 +3352,7 @@ aix*) symcode='[[BCDT]]' ;; -cygwin* | mingw* | pw32*) +cygwin* | mingw* | pw32* | cegcc*) symcode='[[ABCDGISTW]]' ;; hpux*) @@ -3590,7 +3598,7 @@ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | cygwin* | os2* | pw32*) + mingw* | cygwin* | os2* | pw32* | cegcc*) # 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). # Although the cygwin gcc ignores -fPIC, still need this for old-style @@ -3617,10 +3625,11 @@ fi ;; hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. case $host_cpu in - hppa*64*|ia64*) + hppa*64*) ;; *) _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' @@ -3711,19 +3720,26 @@ ;; esac ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; - icpc* | ecpc* ) - # Intel C++ + ecpc* ) + # old Intel C++ for x86_64 which still supported -KPIC. _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; + icpc* ) + # Intel C++, used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; pgCC* | pgcpp*) # Portland Group C++ compiler _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' @@ -3889,7 +3905,7 @@ # PIC is the default for these OSes. ;; - mingw* | cygwin* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2* | cegcc*) # 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). # Although the cygwin gcc ignores -fPIC, still need this for old-style @@ -3905,10 +3921,11 @@ ;; hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. case $host_cpu in - hppa*64*|ia64*) + hppa*64*) # +Z the default ;; *) @@ -3958,7 +3975,7 @@ fi ;; - mingw* | cygwin* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2* | cegcc*) # 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). m4_if([$1], [GCJ], [], @@ -3987,13 +4004,27 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in - icc* | ecc* | ifort*) + # old Intel for x86_64 which still supported -KPIC. + ecc*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + # Lahey Fortran 8.1. + lf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' + _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' + ;; pgcc* | pgf77* | pgf90* | pgf95*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -4175,7 +4206,7 @@ pw32*) _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ;; - cygwin* | mingw*) + cygwin* | mingw* | cegcc*) _LT_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) @@ -4230,7 +4261,7 @@ extract_expsyms_cmds= case $host_os in - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. @@ -4245,6 +4276,9 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4266,6 +4300,7 @@ fi supports_anon_versioning=no case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... @@ -4317,7 +4352,7 @@ fi ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' @@ -4357,7 +4392,7 @@ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@ -4383,6 +4418,9 @@ tmp_addflag=' -i_dynamic -nofor_main' ;; ifc* | ifort*) # Intel Fortran compiler tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + _LT_TAGVAR(whole_archive_flag_spec, $1)= + tmp_sharedflag='--shared' ;; xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; @@ -4615,6 +4653,7 @@ fi fi + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. _LT_TAGVAR(always_export_symbols, $1)=yes @@ -4669,7 +4708,7 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is @@ -4773,7 +4812,7 @@ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' @@ -5554,6 +5593,7 @@ fi fi + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to # export. @@ -5612,7 +5652,7 @@ esac ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' @@ -5832,7 +5872,7 @@ _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -6993,6 +7033,18 @@ ]) +# _LT_DECL_OBJDUMP +# -------------- +# If we don't have a new enough Autoconf to choose the best objdump +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_OBJDUMP], +[AC_CHECK_TOOL(OBJDUMP, objdump, false) +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) +AC_SUBST([OBJDUMP]) +]) + + # _LT_DECL_SED # ------------ # Check for a fully-functional sed program, that truncates @@ -7453,7 +7505,7 @@ [enable_win32_dll=yes case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32*) +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) AC_CHECK_TOOL(AS, as, false) AC_CHECK_TOOL(DLLTOOL, dlltool, false) AC_CHECK_TOOL(OBJDUMP, objdump, false) @@ -7694,14 +7746,14 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. -# Written by Gary V. Vaughan, 2004 +# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 5 ltsugar.m4 +# serial 6 ltsugar.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) @@ -7757,14 +7809,14 @@ # Produce a SEP delimited list of all paired combinations of elements of # PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list # has the form PREFIXmINFIXSUFFIXn. +# Needed until we can rely on m4_combine added in Autoconf 2.62. m4_define([lt_combine], -[m4_if([$2], [], [], - [m4_if([$4], [], [], - [lt_join(m4_quote(m4_default([$1], [[, ]])), - lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_prefix, [$2], - [m4_foreach(_Lt_suffix, lt_car([m4_shiftn(3, $@)]), - [_Lt_prefix[]$3[]_Lt_suffix ])])))))])])dnl -]) +[m4_if(m4_eval([$# > 3]), [1], + [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl +[[m4_foreach([_Lt_prefix], [$2], + [m4_foreach([_Lt_suffix], + ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, + [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) # lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) @@ -7827,15 +7879,15 @@ # Generated from ltversion.in. -# serial 2976 ltversion.m4 +# serial 3017 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.2.4]) -m4_define([LT_PACKAGE_REVISION], [1.2976]) +m4_define([LT_PACKAGE_VERSION], [2.2.6b]) +m4_define([LT_PACKAGE_REVISION], [1.3017]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.4' -macro_revision='1.2976' +[macro_version='2.2.6b' +macro_revision='1.3017' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) @@ -8091,7 +8143,7 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -8103,10 +8155,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.10' +[am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10.1], [], +m4_if([$1], [1.11.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -8120,12 +8172,12 @@ # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10.1])dnl +[AM_AUTOMAKE_VERSION([1.11.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -8182,14 +8234,14 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 +# serial 9 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -8202,6 +8254,7 @@ AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl _AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl if $2; then $1_TRUE= $1_FALSE='#' @@ -8215,14 +8268,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 +# serial 10 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -8279,6 +8332,16 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) + for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -8296,7 +8359,17 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -8306,19 +8379,23 @@ break fi ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; none) break ;; esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ >/dev/null 2>conftest.err && grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -8375,57 +8452,68 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 3 +#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[for mf in $CONFIG_FILES; do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" +[{ + # Autoconf 2.62 quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done done -done +} ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -8457,13 +8545,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008 Free Software Foundation, Inc. +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 13 +# serial 16 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -8480,7 +8568,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.60])dnl +[AC_PREREQ([2.62])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -8531,8 +8619,8 @@ AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl AC_REQUIRE([AM_PROG_MKDIR_P])dnl # We need awk for the "check" target. The system "awk" is bad on # some platforms. @@ -8540,23 +8628,36 @@ AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -]) + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl +]) +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl +]) + +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) # When config.status generates a header, we must update the stamp-h file. @@ -8580,7 +8681,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -8591,7 +8692,14 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi AC_SUBST(install_sh)]) # Copyright (C) 2003, 2005 Free Software Foundation, Inc. @@ -8617,13 +8725,13 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # AM_MAKE_INCLUDE() # ----------------- @@ -8632,7 +8740,7 @@ [am_make=${MAKE-make} cat > confinc << 'END' am__doit: - @echo done + @echo this is the am__doit target .PHONY: am__doit END # If we don't find an include directive, just comment out the code. @@ -8642,24 +8750,24 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac # Now try BSD make style include. if test "$am__include" = "#"; then echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac fi AC_SUBST([am__include]) AC_SUBST([am__quote]) @@ -8669,14 +8777,14 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# serial 6 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -8693,7 +8801,14 @@ AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi # Use eval to expand $SHELL if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " @@ -8731,13 +8846,13 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -8754,7 +8869,7 @@ # ---------------------------------- # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) # ------------------------------------------- @@ -8764,14 +8879,14 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # AM_SANITY_CHECK # --------------- @@ -8780,16 +8895,29 @@ # Just in case sleep 1 echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; +esac + # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` if test "$[*]" = "X"; then # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` + set X `ls -t "$srcdir/configure" conftest.file` fi rm -f conftest.file if test "$[*]" != "X $srcdir/configure conftest.file" \ @@ -8842,18 +8970,25 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 2 + # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) +# AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + # Check how to create a tarball. -*- Autoconf -*- # Copyright (C) 2004, 2005 Free Software Foundation, Inc. @@ -8950,163 +9085,6 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -dnl By default, many hosts won't let programs access large files; -dnl one must use special compiler options to get large-file access to work. -dnl For more details about this brain damage please see: -dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html - -dnl Written by Paul Eggert . - -dnl Internal subroutine of AC_SYS_EXTRA_LARGEFILE. -dnl AC_SYS_EXTRA_LARGEFILE_FLAGS(FLAGSNAME) -AC_DEFUN([AC_SYS_EXTRA_LARGEFILE_FLAGS], - [AC_CACHE_CHECK([for $1 value to request large file support], - ac_cv_sys_largefile_$1, - [ac_cv_sys_largefile_$1=`($GETCONF LFS_$1) 2>/dev/null` || { - ac_cv_sys_largefile_$1=no - ifelse($1, CFLAGS, - [case "$host_os" in - # IRIX 6.2 and later require cc -n32. -changequote(, )dnl - irix6.[2-9]* | irix6.1[0-9]* | irix[7-9].* | irix[1-9][0-9]*) -changequote([, ])dnl - if test "$GCC" != yes; then - ac_cv_sys_largefile_CFLAGS=-n32 - fi - ac_save_CC="$CC" - CC="$CC $ac_cv_sys_largefile_CFLAGS" - AC_TRY_LINK(, , , ac_cv_sys_largefile_CFLAGS=no) - CC="$ac_save_CC" - esac]) - }])]) - -dnl Internal subroutine of AC_SYS_EXTRA_LARGEFILE. -dnl AC_SYS_EXTRA_LARGEFILE_SPACE_APPEND(VAR, VAL) -AC_DEFUN([AC_SYS_EXTRA_LARGEFILE_SPACE_APPEND], - [case $2 in - no) ;; - ?*) - case "[$]$1" in - '') $1=$2 ;; - *) $1=[$]$1' '$2 ;; - esac ;; - esac]) - -dnl Internal subroutine of AC_SYS_EXTRA_LARGEFILE. -dnl AC_SYS_EXTRA_LARGEFILE_MACRO_VALUE(C-MACRO, CACHE-VAR, COMMENT, CODE-TO-SET-DEFAULT) -AC_DEFUN([AC_SYS_EXTRA_LARGEFILE_MACRO_VALUE], - [AC_CACHE_CHECK([for $1], $2, - [$2=no -changequote(, )dnl - $4 - for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do - case "$ac_flag" in - -D$1) - $2=1 ;; - -D$1=*) - $2=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;; - esac - done -changequote([, ])dnl - ]) - if test "[$]$2" != no; then - AC_DEFINE_UNQUOTED([$1], [$]$2, [$3]) - fi]) - -AC_DEFUN([AC_SYS_EXTRA_LARGEFILE], - [AC_REQUIRE([AC_CANONICAL_HOST]) - AC_ARG_ENABLE(largefile, - [ --disable-largefile omit support for large files]) - if test "$enable_largefile" != no; then - AC_CHECK_TOOL(GETCONF, getconf) - AC_SYS_EXTRA_LARGEFILE_FLAGS(CFLAGS) - AC_SYS_EXTRA_LARGEFILE_FLAGS(LDFLAGS) - AC_SYS_EXTRA_LARGEFILE_FLAGS(LIBS) - - for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do - case "$ac_flag" in - no) ;; - -D_FILE_OFFSET_BITS=*) ;; - -D_LARGEFILE_SOURCE | -D_LARGEFILE_SOURCE=*) ;; - -D_LARGE_FILES | -D_LARGE_FILES=*) ;; - -D?* | -I?*) - AC_SYS_EXTRA_LARGEFILE_SPACE_APPEND(CPPFLAGS, "$ac_flag") ;; - *) - AC_SYS_EXTRA_LARGEFILE_SPACE_APPEND(CFLAGS, "$ac_flag") ;; - esac - done - AC_SYS_EXTRA_LARGEFILE_SPACE_APPEND(LDFLAGS, "$ac_cv_sys_largefile_LDFLAGS") - AC_SYS_EXTRA_LARGEFILE_SPACE_APPEND(LIBS, "$ac_cv_sys_largefile_LIBS") - AC_SYS_EXTRA_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, - ac_cv_sys_file_offset_bits, - [Number of bits in a file offset, on hosts where this is settable.]) - [case "$host_os" in - # HP-UX 10.20 and later - hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*) - ac_cv_sys_file_offset_bits=64 ;; - esac] - AC_SYS_EXTRA_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, - ac_cv_sys_largefile_source, - [Define to make fseeko etc. visible, on some hosts.], - [case "$host_os" in - # HP-UX 10.20 and later - hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*) - ac_cv_sys_largefile_source=1 ;; - esac]) - AC_SYS_EXTRA_LARGEFILE_MACRO_VALUE(_LARGE_FILES, - ac_cv_sys_large_files, - [Define for large files, on AIX-style hosts.], - [case "$host_os" in - # AIX 4.2 and later - aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*) - ac_cv_sys_large_files=1 ;; - esac]) - fi - ]) - - -dnl as-ac-expand.m4 0.2.0 -dnl autostars m4 macro for expanding directories using configure's prefix -dnl thomas@apestaart.org - -dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR) -dnl example -dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir) -dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local - -AC_DEFUN([AS_AC_EXPAND], -[ - EXP_VAR=[$1] - FROM_VAR=[$2] - - dnl first expand prefix and exec_prefix if necessary - prefix_save=$prefix - exec_prefix_save=$exec_prefix - - dnl if no prefix given, then use /usr/local, the default prefix - if test "x$prefix" = "xNONE"; then - prefix="$ac_default_prefix" - fi - dnl if no exec_prefix given, then use prefix - if test "x$exec_prefix" = "xNONE"; then - exec_prefix=$prefix - fi - - full_var="$FROM_VAR" - dnl loop until it doesn't change anymore - while true; do - new_full_var="`eval echo $full_var`" - if test "x$new_full_var" = "x$full_var"; then break; fi - full_var=$new_full_var - done - - dnl clean up - full_var=$new_full_var - AC_SUBST([$1], "$full_var") - - dnl restore prefix and exec_prefix - prefix=$prefix_save - exec_prefix=$exec_prefix_save -]) - +m4_include([m4/ac-sys-extra-largefile.m4]) +m4_include([m4/as-ac-expand.m4]) m4_include([acinclude.m4]) diff -Nru liboggz-1.1.0/ChangeLog liboggz-1.1.1/ChangeLog --- liboggz-1.1.0/ChangeLog 2009-10-08 09:17:52.000000000 +0000 +++ liboggz-1.1.1/ChangeLog 2010-04-29 01:42:57.000000000 +0000 @@ -1,3 +1,12 @@ +Thu Apr 29 10:42:26 JST 2010 Conrad Parker + + * Version 1.1.1 + + This is a maintenance release of the current 1.1.x series, containing fixes + for Mozilla bugs #498380, #496063, #487519, #559338 and Debian bug #557537. + Additionally, vorbiscomment parsing was modified to tolerate comments which + lack a value, ie. of form "KEY=" and "KEY". + Thu Oct 8 16:48:47 JST 2009 Conrad Parker * Version 1.1.0 diff -Nru liboggz-1.1.0/config.guess liboggz-1.1.1/config.guess --- liboggz-1.1.0/config.guess 2009-06-17 05:24:21.000000000 +0000 +++ liboggz-1.1.1/config.guess 2009-07-23 20:36:54.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2008-01-23' +timestamp='2009-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -170,7 +170,7 @@ arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null + | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -324,6 +324,9 @@ case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; @@ -331,7 +334,20 @@ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -640,7 +656,7 @@ # => hppa64-hp-hpux11.23 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null + grep -q __LP64__ then HP_ARCH="hppa2.0w" else @@ -796,7 +812,7 @@ x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T | authenticamd) + EM64T | authenticamd | genuineintel) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) @@ -806,6 +822,9 @@ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we @@ -866,40 +885,17 @@ m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - mips:Linux:*:*) + mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU - #undef mips - #undef mipsel + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel + CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 + CPU=${UNAME_MACHINE} #else CPU= #endif @@ -931,10 +927,13 @@ EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null + objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -982,17 +981,6 @@ elf32-i386) TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -1058,7 +1046,7 @@ i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; i*86:*DOS:*:*) @@ -1102,8 +1090,11 @@ pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 @@ -1141,6 +1132,16 @@ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit ;; @@ -1153,7 +1154,7 @@ rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; SM[BE]S:UNIX_SV:*:*) @@ -1216,6 +1217,9 @@ BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1324,6 +1328,9 @@ i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff -Nru liboggz-1.1.0/config.h.in liboggz-1.1.1/config.h.in --- liboggz-1.1.0/config.h.in 2009-10-08 09:19:10.000000000 +0000 +++ liboggz-1.1.1/config.h.in 2010-04-29 01:39:50.000000000 +0000 @@ -1,5 +1,8 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Define if building universal (internal helper macro) */ +#undef AC_APPLE_UNIVERSAL_BUILD + /* Define if the compiler implements enums as signed values. */ #undef ALLOW_SIGNED_ENUMS @@ -79,6 +82,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION @@ -103,9 +109,17 @@ /* Version number of package */ #undef VERSION -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ -#undef WORDS_BIGENDIAN +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +# undef WORDS_BIGENDIAN +# endif +#endif /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS diff -Nru liboggz-1.1.0/config.sub liboggz-1.1.1/config.sub --- liboggz-1.1.0/config.sub 2009-06-17 05:24:21.000000000 +0000 +++ liboggz-1.1.1/config.sub 2009-07-23 20:36:54.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2008-01-16' +timestamp='2009-06-11' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -122,6 +122,7 @@ case $maybe_os in nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -152,6 +153,9 @@ os= basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 @@ -249,13 +253,16 @@ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep \ + | maxq | mb | microblaze | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64vr | mips64vrel \ + | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ @@ -268,6 +275,7 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | moxie \ | mt \ | msp430 \ | nios | nios2 \ @@ -277,7 +285,7 @@ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ | score \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -286,7 +294,7 @@ | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) + | z8k | z80) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) @@ -329,14 +337,17 @@ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ + | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ @@ -358,20 +369,20 @@ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-*) + | z8k-* | z80-*) ;; # Recognize the basic CPU types without company name, with glob match. xtensa*) @@ -439,6 +450,10 @@ basic_machine=m68k-apollo os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple os=-aux @@ -455,10 +470,18 @@ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` os=-linux ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; c90) basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -526,6 +549,10 @@ basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp @@ -1128,6 +1155,10 @@ basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -1166,7 +1197,7 @@ we32k) basic_machine=we32k-att ;; - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) @@ -1236,10 +1267,11 @@ # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ @@ -1248,7 +1280,7 @@ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ + | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1388,6 +1420,9 @@ -zvmoe) os=-zvmoe ;; + -dicos*) + os=-dicos + ;; -none) ;; *) @@ -1585,7 +1620,7 @@ -sunos*) vendor=sun ;; - -aix*) + -cnk*|-aix*) vendor=ibm ;; -beos*) diff -Nru liboggz-1.1.0/configure liboggz-1.1.1/configure --- liboggz-1.1.0/configure 2009-10-08 09:18:37.000000000 +0000 +++ liboggz-1.1.1/configure 2010-04-29 01:39:45.000000000 +0000 @@ -1,60 +1,83 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61. +# Generated by GNU Autoconf 2.65. +# # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# +# # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi @@ -63,20 +86,18 @@ # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) -as_nl=' -' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -87,32 +108,270 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +if test "x$CONFIG_SHELL" = x; then + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } + +exitcode=0 +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes +else + as_have_required=no +fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + as_found=: + case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi + done;; + esac + as_found=false done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } +IFS=$as_save_IFS + + + if test "x$CONFIG_SHELL" != x; then : + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, +$0: including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." + fi + exit 1 +fi +fi +fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS + +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + + +} # as_fn_mkdir_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with status $?, using 1 if that was 0. +as_fn_error () +{ + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + fi + $as_echo "$as_me: error: $1" >&2 + as_fn_exit $as_status +} # as_fn_error -# Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -126,13 +385,17 @@ as_basename=false fi +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -# Name of the executable. as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -147,417 +410,131 @@ } s/.*/./; q'` -# CDPATH. -$as_unset CDPATH +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits -if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes -else - as_have_required=no -fi + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit } -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null fi - -if as_func_ret_success; then - : +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' + fi else - exitcode=1 - echo as_func_ret_success failed. + as_ln_s='cp -p' fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false fi -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' else - exitcode=1 - echo positional parameters were not saved. + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' fi +as_executable_p=$as_test_x -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : -else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - case $as_dir in - /*) - for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" - done;; - esac -done -IFS=$as_save_IFS +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac -fi +# Check that we are running under the correct shell. +SHELL=${CONFIG_SHELL-/bin/sh} -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = "$1" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -fi - - - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } -fi - - -fi - -fi - - - -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell autoconf@gnu.org about your system, - echo including any error possibly output before this - echo message -} - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; -esac - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir -fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - - - -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} - -case X$lt_ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` - ;; +case X$lt_ECHO in +X*--fallback-echo) + # Remove one level of quotation (which was required for Make). + ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` + ;; esac ECHO=${lt_ECHO-echo} @@ -698,7 +675,8 @@ -exec 7<&0 &1 +test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -716,7 +694,6 @@ subdirs= MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME= @@ -724,6 +701,7 @@ PACKAGE_VERSION= PACKAGE_STRING= PACKAGE_BUGREPORT= +PACKAGE_URL= ac_unique_file="src/liboggz/oggz.c" # Factoring default headers for most tests. @@ -762,146 +740,171 @@ # include #endif" -ac_subst_vars='SHELL -PATH_SEPARATOR -PACKAGE_NAME -PACKAGE_TARNAME -PACKAGE_VERSION -PACKAGE_STRING -PACKAGE_BUGREPORT -exec_prefix -prefix -program_transform_name -bindir -sbindir -libexecdir -datarootdir -datadir -sysconfdir -sharedstatedir -localstatedir -includedir -oldincludedir -docdir -infodir -htmldir -dvidir -pdfdir -psdir -libdir -localedir -mandir -DEFS -ECHO_C -ECHO_N -ECHO_T -LIBS -build_alias -host_alias -target_alias -build -build_cpu -build_vendor -build_os -host -host_cpu -host_vendor -host_os -target -target_cpu -target_vendor -target_os -INSTALL_PROGRAM -INSTALL_SCRIPT -INSTALL_DATA -am__isrc -CYGPATH_W -PACKAGE -VERSION -ACLOCAL -AUTOCONF -AUTOMAKE -AUTOHEADER -MAKEINFO -install_sh -STRIP -INSTALL_STRIP_PROGRAM -mkdir_p -AWK -SET_MAKE -am__leading_dot -AMTAR -am__tar -am__untar -CC -CFLAGS -LDFLAGS -CPPFLAGS -ac_ct_CC -EXEEXT -OBJEXT -DEPDIR -am__include -am__quote -AMDEP_TRUE -AMDEP_FALSE -AMDEPBACKSLASH -CCDEPMODE -am__fastdepCC_TRUE -am__fastdepCC_FALSE -CPP -LN_S -LIBTOOL -SED -GREP -EGREP -FGREP -LD -DUMPBIN -ac_ct_DUMPBIN -NM -AR -RANLIB -lt_ECHO -DSYMUTIL -NMEDIT -LIPO -OTOOL -OTOOL64 -ACLOCAL_AMFLAGS -HAVE_PKG_CONFIG -HAVE_DOXYGEN -HAVE_DOXYGEN_TRUE -HAVE_DOXYGEN_FALSE -HAVE_MAN2HTML -HAVE_MAN2HTML_TRUE -HAVE_MAN2HTML_FALSE -HAVE_VALGRIND -VALGRIND_ENVIRONMENT -GETOPT_LIBS -OGGZ_CONFIG_READ_TRUE -OGGZ_CONFIG_READ_FALSE -OGGZ_CONFIG_WRITE_TRUE -OGGZ_CONFIG_WRITE_FALSE -PKG_CONFIG -OGG_CFLAGS -OGG_LIBS -HAVE_OGG_TRUE -HAVE_OGG_FALSE -GETCONF -TYPEOF_OGGZ_OFF_T -PRI_OGGZ_OFF_T -SIZEOF_OGGZ_OFF_T -OGGZ_OFF_MAX -LIBDIR -INCLUDEDIR -BINDIR -DOCDIR -SHLIB_VERSION_ARG -SHARED_VERSION_INFO +ac_subst_vars='am__EXEEXT_FALSE +am__EXEEXT_TRUE +LTLIBOBJS LIBOBJS -LTLIBOBJS' +SHARED_VERSION_INFO +SHLIB_VERSION_ARG +DOCDIR +BINDIR +INCLUDEDIR +LIBDIR +OGGZ_OFF_MAX +SIZEOF_OGGZ_OFF_T +PRI_OGGZ_OFF_T +TYPEOF_OGGZ_OFF_T +GETCONF +HAVE_OGG_FALSE +HAVE_OGG_TRUE +OGG_LIBS +OGG_CFLAGS +PKG_CONFIG +OGGZ_CONFIG_WRITE_FALSE +OGGZ_CONFIG_WRITE_TRUE +OGGZ_CONFIG_READ_FALSE +OGGZ_CONFIG_READ_TRUE +GETOPT_LIBS +VALGRIND_ENVIRONMENT +HAVE_VALGRIND +HAVE_MAN2HTML_FALSE +HAVE_MAN2HTML_TRUE +HAVE_MAN2HTML +HAVE_DOXYGEN_FALSE +HAVE_DOXYGEN_TRUE +HAVE_DOXYGEN +HAVE_PKG_CONFIG +ACLOCAL_AMFLAGS +OTOOL64 +OTOOL +LIPO +NMEDIT +DSYMUTIL +lt_ECHO +RANLIB +AR +OBJDUMP +NM +ac_ct_DUMPBIN +DUMPBIN +LD +FGREP +EGREP +GREP +SED +LIBTOOL +LN_S +CPP +am__fastdepCC_FALSE +am__fastdepCC_TRUE +CCDEPMODE +AMDEPBACKSLASH +AMDEP_FALSE +AMDEP_TRUE +am__quote +am__include +DEPDIR +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +am__untar +am__tar +AMTAR +am__leading_dot +SET_MAKE +AWK +mkdir_p +MKDIR_P +INSTALL_STRIP_PROGRAM +STRIP +install_sh +MAKEINFO +AUTOHEADER +AUTOMAKE +AUTOCONF +ACLOCAL +VERSION +PACKAGE +CYGPATH_W +am__isrc +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM +target_os +target_vendor +target_cpu +target +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_URL +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' ac_subst_files='' +ac_user_opts=' +enable_option_checking +enable_dependency_tracking +enable_shared +enable_static +with_pic +enable_fast_install +with_gnu_ld +enable_libtool_lock +enable_valgrind_testing +enable_experimental +enable_read +enable_write +with_ogg +with_ogg_libraries +with_ogg_includes +enable_oggtest +enable_largefile +enable_gcc_werror +' ac_precious_vars='build_alias host_alias target_alias @@ -919,6 +922,8 @@ # Initialize some variables set by options. ac_init_help= ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= # The variables have the same names as the options, with # dashes changed to underlines. cache_file=/dev/null @@ -1017,13 +1022,20 @@ datarootdir=$ac_optarg ;; -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=no ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; -docdir | --docdir | --docdi | --doc | --do) ac_prev=docdir ;; @@ -1036,13 +1048,20 @@ dvidir=$ac_optarg ;; -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=\$ac_optarg ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -1233,22 +1252,36 @@ ac_init_version=: ;; -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=\$ac_optarg ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=no ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; --x) # Obsolete; use --with-x. @@ -1268,25 +1301,25 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) as_fn_error "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information." ;; *=*) ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error "invalid variable name: \`$ac_envvar'" ;; + esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; @@ -1295,23 +1328,36 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + as_fn_error "missing argument to $ac_option" +fi + +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac fi -# Be sure to have absolute directory names. +# Check all directory arguments for consistency. for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ libdir localedir mandir do eval ac_val=\$$ac_var + # Remove trailing slashes. + case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. case $ac_val in [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } + as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1325,7 +1371,7 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes @@ -1341,23 +1387,21 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { echo "$as_me: error: Working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } + as_fn_error "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } + as_fn_error "pwd does not report name of working directory" # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$0" || -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X"$0" | + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1384,13 +1428,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } + as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1438,9 +1480,9 @@ Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1450,25 +1492,25 @@ For better control, use the options below. Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -1490,6 +1532,7 @@ cat <<\_ACEOF Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-dependency-tracking speeds up one-time build @@ -1527,7 +1570,7 @@ LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor PKG_CONFIG path to pkg-config utility @@ -1537,6 +1580,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. +Report bugs to the package provider. _ACEOF ac_status=$? fi @@ -1544,15 +1588,17 @@ if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -1588,7 +1634,7 @@ echo && $SHELL "$ac_srcdir/configure" --help=recursive else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1598,599 +1644,1173 @@ if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.61 +generated by GNU Autoconf 2.65 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF exit fi -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -It was created by $as_me, which was -generated by GNU Autoconf 2.61. Invocation command line was +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - $ $0 $@ + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval -_ACEOF -exec 5>>config.log +} # ac_fn_c_try_compile + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () { -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` +} # ac_fn_c_try_cpp -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - -_ASUNAME - -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" -done -IFS=$as_save_IFS - -} >&5 - -cat >&5 <<_ACEOF +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + 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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval -## ----------- ## -## Core tests. ## -## ----------- ## +} # ac_fn_c_try_link +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> _ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +} # ac_fn_c_check_header_compile -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; - 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - esac - done -done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Use '\'' to represent an apostrophe within the trap. -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval - cat <<\_ASBOX -## ---------------- ## -## Cache variables. ## -## ---------------- ## -_ASBOX - echo - # The following way of writing the cache mishandles newlines in values, -( - for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac - done - (set) 2>&1 | - case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - sed -n \ - "s/'\''/'\''\\\\'\'''\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" - ;; #( - *) - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) - echo +} # ac_fn_c_try_run - cat <<\_ASBOX -## ----------------- ## -## Output variables. ## -## ----------------- ## -_ASBOX - echo - for ac_var in $ac_subst_vars - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - echo "$ac_var='\''$ac_val'\''" - done | sort - echo +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 - if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## -## File substitutions. ## -## ------------------- ## -_ASBOX - echo - for ac_var in $ac_subst_files - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ - if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## -## confdefs.h. ## -## ----------- ## -_ASBOX - echo - cat confdefs.h - echo - fi - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -done -ac_signal=0 +#ifdef __STDC__ +# include +#else +# include +#endif -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -f -r conftest* confdefs.h +#undef $2 -# Predefined preprocessor variables. +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" +int +main () +{ +return $2 (); + ; + return 0; +} _ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +} # ac_fn_c_check_func -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> _ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> _ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF - +} # ac_fn_c_check_header_mongrel -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +# ac_fn_c_check_type LINENO TYPE VAR INCLUDES +# ------------------------------------------- +# Tests whether TYPE exists after having included INCLUDES, setting cache +# variable VAR accordingly. +ac_fn_c_check_type () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof ($2)) + return 0; + ; + return 0; +} _ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof (($2))) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : - -# Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. -if test -n "$CONFIG_SITE"; then - set x "$CONFIG_SITE" -elif test "x$prefix" != xNONE; then - set x "$prefix/share/config.site" "$prefix/etc/config.site" else - set x "$ac_default_prefix/share/config.site" \ - "$ac_default_prefix/etc/config.site" + eval "$3=yes" fi -shift -for ac_site_file -do - if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" - fi -done - -if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi -else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +} # ac_fn_c_check_type +# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES +# -------------------------------------------- +# Tries to find the compile-time value of EXPR in a program that includes +# INCLUDES, setting VAR accordingly. Returns whether the value could be +# computed +ac_fn_c_compute_int () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) >= 0)]; +test_array [0] = 0 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=0 ac_mid=0 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +test_array [0] = 0 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid; break +else + as_fn_arith $ac_mid + 1 && ac_lo=$as_val + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) < 0)]; +test_array [0] = 0 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=-1 ac_mid=-1 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) >= $ac_mid)]; +test_array [0] = 0 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=$ac_mid; break +else + as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + ac_lo= ac_hi= +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +test_array [0] = 0 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid +else + as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in #(( +?*) eval "$3=\$ac_lo"; ac_retval=0 ;; +'') ac_retval=1 ;; +esac + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +static long int longval () { return $2; } +static unsigned long int ulongval () { return $2; } +#include +#include +int +main () +{ + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (($2) < 0) + { + long int i = longval (); + if (i != ($2)) + return 1; + fprintf (f, "%ld", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ($2)) + return 1; + fprintf (f, "%lu", i); + } + /* Do not output a trailing newline, as this causes \r\n confusion + on some platforms. */ + return ferror (f) || fclose (f) != 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + echo >>conftest.val; read $3 config.log <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. +It was created by $as_me, which was +generated by GNU Autoconf 2.65. Invocation command line was + $ $0 $@ +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` -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 - +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` +_ASUNAME +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + $as_echo "PATH: $as_dir" + done +IFS=$as_save_IFS +} >&5 +cat >&5 <<_ACEOF -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } -fi -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. +## ----------- ## +## Core tests. ## +## ----------- ## +_ACEOF -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } - -{ echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6; } -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } -fi -{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; -esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. +# Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. +ac_configure_args= +ac_configure_args0= +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 +do + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) + as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done +done +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo -{ echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6; } -if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build -else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } -fi + cat <<\_ASBOX +## ---------------- ## +## Cache variables. ## +## ---------------- ## +_ASBOX + echo + # The following way of writing the cache mishandles newlines in values, +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + (set) 2>&1 | + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + sed -n \ + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( + *) + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) + echo -fi -{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; -esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + cat <<\_ASBOX +## ----------------- ## +## Output variables. ## +## ----------------- ## +_ASBOX + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +## ------------------- ## +## File substitutions. ## +## ------------------- ## +_ASBOX + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi -{ echo "$as_me:$LINENO: checking target system type" >&5 -echo $ECHO_N "checking target system type... $ECHO_C" >&6; } -if test "${ac_cv_target+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "x$target_alias" = x; then - ac_cv_target=$ac_cv_host -else - ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} - { (exit 1); exit 1; }; } -fi + if test -s confdefs.h; then + cat <<\_ASBOX +## ----------- ## +## confdefs.h. ## +## ----------- ## +_ASBOX + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal +done +ac_signal=0 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5 -echo "${ECHO_T}$ac_cv_target" >&6; } -case $ac_cv_target in -*-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 -echo "$as_me: error: invalid value of canonical target" >&2;} - { (exit 1); exit 1; }; };; -esac -target=$ac_cv_target -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_target -shift -target_cpu=$1 -target_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -target_os=$* -IFS=$ac_save_IFS -case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -f -r conftest* confdefs.h +$as_echo "/* confdefs.h */" > confdefs.h -# The aliases save the names the user supplied, while $host etc. -# will get canonicalized. -test -n "$target_alias" && - test "$program_prefix$program_suffix$program_transform_name" = \ - NONENONEs,x,x, && - program_prefix=${target_alias}- +# Predefined preprocessor variables. -am__api_version='1.10' +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - done - done - ;; -esac -done -IFS=$as_save_IFS +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + + +# Let the site file select an alternate cache file if it wants to. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE +if test -n "$CONFIG_SITE"; then + ac_site_file1=$CONFIG_SITE +elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site +else + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site +fi +for ac_site_file in "$ac_site_file1" "$ac_site_file2" +do + test "x$ac_site_file" = xNONE && continue + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" + fi +done + +if test -r "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file +fi + +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 +fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## + +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 + + + + + + +ac_aux_dir= +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + for ac_t in install-sh install.sh shtool; do + if test -f "$ac_dir/$ac_t"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/$ac_t -c" + break 2 + fi + done +done +if test -z "$ac_aux_dir"; then + as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 +fi + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + + +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if test "${ac_cv_build+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if test "${ac_cv_host+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 +$as_echo_n "checking target system type... " >&6; } +if test "${ac_cv_target+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test "x$target_alias" = x; then + ac_cv_target=$ac_cv_host +else + ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || + as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 +$as_echo "$ac_cv_target" >&6; } +case $ac_cv_target in +*-*-*) ;; +*) as_fn_error "invalid value of canonical target" "$LINENO" 5;; +esac +target=$ac_cv_target +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_target +shift +target_cpu=$1 +target_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +target_os=$* +IFS=$ac_save_IFS +case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac + + +# The aliases save the names the user supplied, while $host etc. +# will get canonicalized. +test -n "$target_alias" && + test "$program_prefix$program_suffix$program_transform_name" = \ + NONENONEs,x,x, && + program_prefix=${target_alias}- + +am__api_version='1.11' + +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } +if test -z "$INSTALL"; then +if test "${ac_cv_path_install+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + fi + done + done + ;; +esac + + done +IFS=$as_save_IFS + +rm -rf conftest.one conftest.two conftest.dir + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. INSTALL=$ac_install_sh fi fi -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -2200,21 +2820,34 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) + as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; +esac +case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) + as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; +esac + # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` if test "$*" = "X"; then # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` + set X `ls -t "$srcdir/configure" conftest.file` fi rm -f conftest.file if test "$*" != "X $srcdir/configure conftest.file" \ @@ -2224,11 +2857,8 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&5 -echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "ls -t appears to fail. Make sure there is not a broken +alias in your environment" "$LINENO" 5 fi test "$2" = conftest.file @@ -2237,52 +2867,162 @@ # Ok. : else - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! -Check your system clock" >&5 -echo "$as_me: error: newly created file is older than distributed files! -Check your system clock" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. test "$program_suffix" != NONE && program_transform_name="s&\$&$program_suffix&;$program_transform_name" -# Double any \ or $. echo might interpret backslashes. +# Double any \ or $. # By default was `s,x,x', remove it if useless. -cat <<\_ACEOF >conftest.sed -s/[\\$]/&&/g;s/;s,x,x,$// -_ACEOF -program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm -f conftest.sed +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi # Use eval to expand $SHELL if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " else am_missing_run= - { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 -echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } -if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin -do - IFS=$as_save_IFS +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi + +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # 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_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # 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_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } +if test -z "$MKDIR_P"; then + if test "${ac_cv_path_mkdir+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do + for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( @@ -2294,11 +3034,12 @@ esac done done -done + done IFS=$as_save_IFS fi + test -d ./--version && rmdir ./--version if test "${ac_cv_path_mkdir+set}" = set; then MKDIR_P="$ac_cv_path_mkdir -p" else @@ -2306,12 +3047,11 @@ # value for MKDIR_P within a source directory, because that will # break other packages using the cache if that directory is # removed, or if the value is a relative name. - test -d ./--version && rmdir ./--version MKDIR_P="$ac_install_sh -d" fi fi -{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 -echo "${ECHO_T}$MKDIR_P" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } mkdir_p="$MKDIR_P" case $mkdir_p in @@ -2323,10 +3063,10 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; 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_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_AWK+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. @@ -2336,36 +3076,37 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi test -n "$AWK" && break done -{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } -set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF SHELL = /bin/sh @@ -2382,12 +3123,12 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } SET_MAKE= else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -2406,9 +3147,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2424,7 +3163,7 @@ # Define the identity of the package. PACKAGE=liboggz - VERSION=1.1.0 + VERSION=1.1.1 cat >>confdefs.h <<_ACEOF @@ -2452,112 +3191,6 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} - -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -if test "$cross_compiling" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # 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_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; 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_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # 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_STRIP="strip" - 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_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - 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 - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. @@ -2602,10 +3235,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; 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_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2615,25 +3248,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2642,10 +3275,10 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; 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_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -2655,25 +3288,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -2681,12 +3314,8 @@ 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;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2699,10 +3328,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; 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_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2712,25 +3341,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2739,10 +3368,10 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; 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_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2753,18 +3382,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -2783,11 +3412,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2798,10 +3427,10 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; 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_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2811,25 +3440,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2842,10 +3471,10 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; 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_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -2855,25 +3484,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2885,12 +3514,8 @@ 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;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2900,51 +3525,37 @@ fi -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "no acceptable C compiler found in \$PATH +See \`config.log' for more details." "$LINENO" 5; } # Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -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_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -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_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" 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_compiler -V >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2956,42 +3567,38 @@ } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.out" +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -# -# List of possible output files, starting from the most likely. -# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) -# only as a last resort. b.out is created by i960 compilers. -ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' -# -# The IRIX 6 linker writes into existing files which may not be -# executable, retaining their permissions. Remove them first so a -# subsequent execution test works. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + ac_rmfiles= for ac_file in $ac_files do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; * ) ac_rmfiles="$ac_rmfiles $ac_file";; esac done rm -f $ac_rmfiles -if { (ac_try="$ac_link_default" +if { { ac_try="$ac_link_default" 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_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -3001,14 +3608,14 @@ do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; [ab].out ) # We found the default executable, but exeext='' is most # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -3027,78 +3634,42 @@ else ac_file='' fi - -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } -if test -z "$ac_file"; then - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } -fi - +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ as_fn_set_status 77 +as_fn_error "C compiler cannot create executables +See \`config.log' for more details." "$LINENO" 5; }; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } ac_exeext=$ac_cv_exeext -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (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_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - fi -fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - -rm -f a.out a.exe conftest$ac_cv_exeext b.out +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } -{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6; } - -{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } -if { (ac_try="$ac_link" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +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_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -3106,154 +3677,182 @@ for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` break;; * ) break;; esac done else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." "$LINENO" 5; } +fi +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } -if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - +#include int main () { +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF -rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { 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_compile") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest.$ac_cv_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6; } -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if test "${ac_cv_objext+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main () { -#ifndef __GNUC__ - choke me -#endif ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.o conftest.obj +if { { ac_try="$ac_compile" 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_compile") 2>conftest.er1 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 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_objext; then - ac_compiler_gnu=yes + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_compiler_gnu=no +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot compute suffix of object files: cannot compile +See \`config.log' for more details." "$LINENO" 5; } +fi +rm -f conftest.$ac_cv_objext conftest.$ac_ext fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if test "${ac_cv_c_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes +else + ac_compiler_gnu=no +fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -GCC=`test $ac_compiler_gnu = yes && echo yes` +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if test "${ac_cv_prog_cc_g+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3264,34 +3863,11 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3302,35 +3878,12 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3341,42 +3894,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -3392,18 +3921,14 @@ CFLAGS= fi fi -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -3460,31 +3985,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -3495,17 +3998,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; xno) - { echo "$as_me:$LINENO: result: unsupported" >&5 -echo "${ECHO_T}unsupported" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3520,44 +4025,44 @@ am_make=${MAKE-make} cat > confinc << 'END' am__doit: - @echo done + @echo this is the am__doit target .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 +$as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac # Now try BSD make style include. if test "$am__include" = "#"; then echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac fi -{ echo "$as_me:$LINENO: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } rm -f confinc confmf # Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then +if test "${enable_dependency_tracking+set}" = set; then : enableval=$enable_dependency_tracking; fi @@ -3577,10 +4082,10 @@ depcc="$CC" am_compiler_list= -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up @@ -3605,6 +4110,11 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -3622,7 +4132,17 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -3632,19 +4152,23 @@ break fi ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; none) break ;; esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ >/dev/null 2>conftest.err && grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -3668,8 +4192,8 @@ fi fi -{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type if @@ -3688,15 +4212,15 @@ 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 -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test "${ac_cv_prog_CPP+set}" = set; then : + $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" @@ -3710,11 +4234,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -3723,76 +4243,34 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then +if $ac_preproc_ok; then : break fi @@ -3804,8 +4282,8 @@ else ac_cv_prog_CPP=$CPP fi -{ echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -3815,11 +4293,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -3828,83 +4302,40 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : +if $ac_preproc_ok; then : + else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." "$LINENO" 5; } fi ac_ext=c @@ -3913,102 +4344,24 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - done - done - ;; -esac -done -IFS=$as_save_IFS - - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +$as_echo_n "checking whether ln -s works... " >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +$as_echo "no, using $LN_S" >&6; } fi -{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } -set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF SHELL = /bin/sh @@ -4025,25 +4378,25 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } SET_MAKE= else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi case `pwd` in *\ * | *\ *) - { echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; esac -macro_version='2.2.4' -macro_revision='1.2976' +macro_version='2.2.6b' +macro_revision='1.3017' @@ -4059,51 +4412,46 @@ ltmain="$ac_aux_dir/ltmain.sh" -{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } -if test "${ac_cv_path_SED+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if test "${ac_cv_path_SED+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ for ac_i in 1 2 3 4 5 6 7; do ac_script="$ac_script$as_nl$ac_script" done - echo "$ac_script" | sed 99q >conftest.sed - $as_unset ac_script || ac_script= - # Extract the first word of "sed gsed" to use in msg output -if test -z "$SED"; then -set dummy sed gsed; ac_prog_name=$2 -if test "${ac_cv_path_SED+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then ac_path_SED_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue - # Check for GNU ac_path_SED and select it if it is found. + for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue +# Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in *GNU*) ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; *) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - echo '' >> "conftest.nl" + $as_echo '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_SED_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_SED="$ac_path_SED" @@ -4115,31 +4463,21 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_SED_found && break 3 + $ac_path_SED_found && break 3 + done + done done -done - -done IFS=$as_save_IFS - - -fi - -SED="$ac_cv_path_SED" -if test -z "$SED"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -fi - + if test -z "$ac_cv_path_SED"; then + as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi else ac_cv_path_SED=$SED fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 -echo "${ECHO_T}$ac_cv_path_SED" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed @@ -4156,45 +4494,40 @@ -{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Extract the first word of "grep ggrep" to use in msg output -if test -z "$GREP"; then -set dummy grep ggrep; ac_prog_name=$2 -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if test "${ac_cv_path_GREP+set}" = set; then : + $as_echo_n "(cached) " >&6 else + if test -z "$GREP"; then ac_path_GREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue - # Check for GNU ac_path_GREP and select it if it is found. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +# Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in *GNU*) ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; *) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - echo 'GREP' >> "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_GREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_GREP="$ac_path_GREP" @@ -4206,77 +4539,61 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_GREP_found && break 3 + $ac_path_GREP_found && break 3 + done + done done -done - -done IFS=$as_save_IFS - - -fi - -GREP="$ac_cv_path_GREP" -if test -z "$GREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - + if test -z "$ac_cv_path_GREP"; then + as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else ac_cv_path_GREP=$GREP fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -echo "${ECHO_T}$ac_cv_path_GREP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 then ac_cv_path_EGREP="$GREP -E" else - # Extract the first word of "egrep" to use in msg output -if test -z "$EGREP"; then -set dummy egrep; ac_prog_name=$2 -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + if test -z "$EGREP"; then ac_path_EGREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue - # Check for GNU ac_path_EGREP and select it if it is found. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +# Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in *GNU*) ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; *) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - echo 'EGREP' >> "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_EGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_EGREP="$ac_path_EGREP" @@ -4288,78 +4605,62 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_EGREP_found && break 3 + $ac_path_EGREP_found && break 3 + done + done done -done - -done IFS=$as_save_IFS - - -fi - -EGREP="$ac_cv_path_EGREP" -if test -z "$EGREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - + if test -z "$ac_cv_path_EGREP"; then + as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else ac_cv_path_EGREP=$EGREP fi - fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" -{ echo "$as_me:$LINENO: checking for fgrep" >&5 -echo $ECHO_N "checking for fgrep... $ECHO_C" >&6; } -if test "${ac_cv_path_FGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +$as_echo_n "checking for fgrep... " >&6; } +if test "${ac_cv_path_FGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 then ac_cv_path_FGREP="$GREP -F" else - # Extract the first word of "fgrep" to use in msg output -if test -z "$FGREP"; then -set dummy fgrep; ac_prog_name=$2 -if test "${ac_cv_path_FGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + if test -z "$FGREP"; then ac_path_FGREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in fgrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue - # Check for GNU ac_path_FGREP and select it if it is found. + for ac_prog in fgrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue +# Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in *GNU*) ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; *) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - echo 'FGREP' >> "conftest.nl" + $as_echo 'FGREP' >> "conftest.nl" "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_FGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_FGREP="$ac_path_FGREP" @@ -4371,33 +4672,22 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_FGREP_found && break 3 + $ac_path_FGREP_found && break 3 + done + done done -done - -done IFS=$as_save_IFS - - -fi - -FGREP="$ac_cv_path_FGREP" -if test -z "$FGREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - + if test -z "$ac_cv_path_FGREP"; then + as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else ac_cv_path_FGREP=$FGREP fi - fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5 -echo "${ECHO_T}$ac_cv_path_FGREP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +$as_echo "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" @@ -4422,7 +4712,7 @@ # Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then +if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no @@ -4431,8 +4721,8 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -4461,14 +4751,14 @@ ;; esac elif test "$with_gnu_ld" = yes; then - { echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } else - { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${lt_cv_path_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test "${lt_cv_path_LD+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -z "$LD"; then lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR @@ -4498,19 +4788,17 @@ LD="$lt_cv_path_LD" if test -n "$LD"; then - { echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +$as_echo "$LD" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if test "${lt_cv_prog_gnu_ld+set}" = set; then : + $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 +$as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -4534,10 +4822,10 @@ -{ echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 -echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; } -if test "${lt_cv_path_NM+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 +$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +if test "${lt_cv_path_NM+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$NM"; then # Let the user override the test. @@ -4583,8 +4871,8 @@ : ${lt_cv_path_NM=no} fi fi -{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 -echo "${ECHO_T}$lt_cv_path_NM" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 +$as_echo "$lt_cv_path_NM" >&6; } if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" else @@ -4594,10 +4882,10 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; 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_DUMPBIN+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_DUMPBIN+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$DUMPBIN"; then ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. @@ -4607,25 +4895,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi DUMPBIN=$ac_cv_prog_DUMPBIN if test -n "$DUMPBIN"; then - { echo "$as_me:$LINENO: result: $DUMPBIN" >&5 -echo "${ECHO_T}$DUMPBIN" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 +$as_echo "$DUMPBIN" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4638,10 +4926,10 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; 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_DUMPBIN+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DUMPBIN"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. @@ -4651,25 +4939,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN if test -n "$ac_ct_DUMPBIN"; then - { echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 -echo "${ECHO_T}$ac_ct_DUMPBIN" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 +$as_echo "$ac_ct_DUMPBIN" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4681,12 +4969,8 @@ 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;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DUMPBIN=$ac_ct_DUMPBIN @@ -4705,34 +4989,34 @@ -{ echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 -echo $ECHO_N "checking the name lister ($NM) interface... $ECHO_C" >&6; } -if test "${lt_cv_nm_interface+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 +$as_echo_n "checking the name lister ($NM) interface... " >&6; } +if test "${lt_cv_nm_interface+set}" = set; then : + $as_echo_n "(cached) " >&6 else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4715: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4999: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4718: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5002: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4721: output\"" >&5) + (eval echo "\"\$as_me:5005: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" fi rm -f conftest* fi -{ echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 -echo "${ECHO_T}$lt_cv_nm_interface" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 +$as_echo "$lt_cv_nm_interface" >&6; } # 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; } -if test "${lt_cv_sys_max_cmd_len+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 +$as_echo_n "checking the maximum length of command line arguments... " >&6; } +if test "${lt_cv_sys_max_cmd_len+set}" = set; then : + $as_echo_n "(cached) " >&6 else i=0 teststring="ABCD" @@ -4753,7 +5037,7 @@ lt_cv_sys_max_cmd_len=-1; ;; - cygwin* | mingw*) + cygwin* | mingw* | cegcc*) # On Win9x/ME, this test blows up -- it succeeds, but takes # about 5 minutes as the teststring grows exponentially. # Worse, since 9x/ME are not pre-emptively multitasking, @@ -4849,11 +5133,11 @@ fi if test -n $lt_cv_sys_max_cmd_len ; then - { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 -echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 +$as_echo "$lt_cv_sys_max_cmd_len" >&6; } else - { echo "$as_me:$LINENO: result: none" >&5 -echo "${ECHO_T}none" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } fi max_cmd_len=$lt_cv_sys_max_cmd_len @@ -4866,8 +5150,8 @@ : ${MV="mv -f"} : ${RM="rm -f"} -{ echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 -echo $ECHO_N "checking whether the shell understands some XSI constructs... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 +$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -4876,18 +5160,18 @@ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -{ echo "$as_me:$LINENO: result: $xsi_shell" >&5 -echo "${ECHO_T}$xsi_shell" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 +$as_echo "$xsi_shell" >&6; } -{ echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 -echo $ECHO_N "checking whether the shell understands \"+=\"... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 +$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } lt_shell_append=no ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ >/dev/null 2>&1 \ && lt_shell_append=yes -{ echo "$as_me:$LINENO: result: $lt_shell_append" >&5 -echo "${ECHO_T}$lt_shell_append" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 +$as_echo "$lt_shell_append" >&6; } if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then @@ -4921,15 +5205,15 @@ -{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } -if test "${lt_cv_ld_reload_flag+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +$as_echo_n "checking for $LD option to reload object files... " >&6; } +if test "${lt_cv_ld_reload_flag+set}" = set; then : + $as_echo_n "(cached) " >&6 else lt_cv_ld_reload_flag='-r' fi -{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 -echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 +$as_echo "$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in "" | " "*) ;; @@ -4954,11 +5238,112 @@ +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. +set dummy ${ac_tool_prefix}objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # 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_OBJDUMP="${ac_tool_prefix}objdump" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +OBJDUMP=$ac_cv_prog_OBJDUMP +if test -n "$OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +$as_echo "$OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_OBJDUMP"; then + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. +set dummy objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # 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_OBJDUMP="objdump" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP +if test -n "$ac_ct_OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +$as_echo "$ac_ct_OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_OBJDUMP" = x; then + OBJDUMP="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OBJDUMP=$ac_ct_OBJDUMP + fi +else + OBJDUMP="$ac_cv_prog_OBJDUMP" +fi + +test -z "$OBJDUMP" && OBJDUMP=objdump + + + + + + + + -{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 -echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } -if test "${lt_cv_deplibs_check_method+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 +$as_echo_n "checking how to recognize dependent libraries... " >&6; } +if test "${lt_cv_deplibs_check_method+set}" = set; then : + $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= @@ -5008,6 +5393,12 @@ fi ;; +cegcc) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; + darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; @@ -5066,7 +5457,7 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -5145,8 +5536,8 @@ esac fi -{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 -echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +$as_echo "$lt_cv_deplibs_check_method" >&6; } file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -5165,10 +5556,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; 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_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_AR+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. @@ -5178,25 +5569,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AR="${ac_tool_prefix}ar" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - { echo "$as_me:$LINENO: result: $AR" >&5 -echo "${ECHO_T}$AR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -5205,10 +5596,10 @@ ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; 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_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. @@ -5218,25 +5609,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AR="ar" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -echo "${ECHO_T}$ac_ct_AR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_AR" = x; then @@ -5244,12 +5635,8 @@ 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;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac AR=$ac_ct_AR @@ -5274,10 +5661,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. @@ -5287,25 +5674,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -5314,10 +5701,10 @@ ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; 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_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. @@ -5327,25 +5714,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -5353,12 +5740,8 @@ 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;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -5377,10 +5760,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; 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_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. @@ -5390,25 +5773,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -5417,10 +5800,10 @@ ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; 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_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. @@ -5430,25 +5813,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_RANLIB" = x; then @@ -5456,12 +5839,8 @@ 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;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB @@ -5538,10 +5917,10 @@ # Check for command to grab the raw symbol name followed by C symbol from nm. -{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 -echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 +$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } +if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : + $as_echo_n "(cached) " >&6 else # These are sane defaults that work on at least a few old systems. @@ -5558,7 +5937,7 @@ aix*) symcode='[BCDT]' ;; -cygwin* | mingw* | pw32*) +cygwin* | mingw* | pw32* | cegcc*) symcode='[ABCDGISTW]' ;; hpux*) @@ -5656,18 +6035,18 @@ int main(){nm_test_var='a';nm_test_func();return(0);} _LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm - if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s "$nlist"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -5720,11 +6099,11 @@ lt_save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext}; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi LIBS="$lt_save_LIBS" @@ -5758,11 +6137,11 @@ lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { echo "$as_me:$LINENO: result: failed" >&5 -echo "${ECHO_T}failed" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +$as_echo "failed" >&6; } else - { echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } fi @@ -5788,7 +6167,7 @@ # Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then +if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; fi @@ -5800,11 +6179,11 @@ ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE="32" @@ -5818,12 +6197,12 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5821 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + echo '#line 6200 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) @@ -5857,11 +6236,11 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *32-bit*) case $host in @@ -5910,10 +6289,10 @@ # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 -echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } -if test "${lt_cv_cc_needs_belf+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 +$as_echo_n "checking whether the C compiler needs -belf... " >&6; } +if test "${lt_cv_cc_needs_belf+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -5921,11 +6300,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5936,34 +6311,13 @@ 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 +if ac_fn_c_try_link "$LINENO"; then : lt_cv_cc_needs_belf=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_cc_needs_belf=no + lt_cv_cc_needs_belf=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5971,8 +6325,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 -echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 +$as_echo "$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS="$SAVE_CFLAGS" @@ -5981,11 +6335,11 @@ sparc*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in @@ -6011,10 +6365,10 @@ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$DSYMUTIL"; then ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. @@ -6024,25 +6378,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +$as_echo "$DSYMUTIL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6051,10 +6405,10 @@ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DSYMUTIL"; then ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. @@ -6064,25 +6418,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +$as_echo "$ac_ct_DSYMUTIL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_DSYMUTIL" = x; then @@ -6090,12 +6444,8 @@ 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;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DSYMUTIL=$ac_ct_DSYMUTIL @@ -6107,10 +6457,10 @@ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_NMEDIT+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$NMEDIT"; then ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. @@ -6120,25 +6470,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +$as_echo "$NMEDIT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6147,10 +6497,10 @@ 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NMEDIT"; then ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. @@ -6160,25 +6510,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_NMEDIT="nmedit" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 +$as_echo "$ac_ct_NMEDIT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_NMEDIT" = x; then @@ -6186,12 +6536,8 @@ 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;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac NMEDIT=$ac_ct_NMEDIT @@ -6203,10 +6549,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. set dummy ${ac_tool_prefix}lipo; 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_LIPO+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_LIPO+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$LIPO"; then ac_cv_prog_LIPO="$LIPO" # Let the user override the test. @@ -6216,25 +6562,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi LIPO=$ac_cv_prog_LIPO if test -n "$LIPO"; then - { echo "$as_me:$LINENO: result: $LIPO" >&5 -echo "${ECHO_T}$LIPO" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 +$as_echo "$LIPO" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6243,10 +6589,10 @@ ac_ct_LIPO=$LIPO # Extract the first word of "lipo", so it can be a program name with args. set dummy lipo; 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_LIPO+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_LIPO"; then ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. @@ -6256,25 +6602,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_LIPO="lipo" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO if test -n "$ac_ct_LIPO"; then - { echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 -echo "${ECHO_T}$ac_ct_LIPO" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 +$as_echo "$ac_ct_LIPO" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_LIPO" = x; then @@ -6282,12 +6628,8 @@ 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;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac LIPO=$ac_ct_LIPO @@ -6299,10 +6641,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. set dummy ${ac_tool_prefix}otool; 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_OTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_OTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$OTOOL"; then ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. @@ -6312,25 +6654,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi OTOOL=$ac_cv_prog_OTOOL if test -n "$OTOOL"; then - { echo "$as_me:$LINENO: result: $OTOOL" >&5 -echo "${ECHO_T}$OTOOL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 +$as_echo "$OTOOL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6339,10 +6681,10 @@ ac_ct_OTOOL=$OTOOL # Extract the first word of "otool", so it can be a program name with args. set dummy otool; 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_OTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL"; then ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. @@ -6352,25 +6694,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_OTOOL="otool" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL if test -n "$ac_ct_OTOOL"; then - { echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 -echo "${ECHO_T}$ac_ct_OTOOL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 +$as_echo "$ac_ct_OTOOL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_OTOOL" = x; then @@ -6378,12 +6720,8 @@ 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;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OTOOL=$ac_ct_OTOOL @@ -6395,10 +6733,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. set dummy ${ac_tool_prefix}otool64; 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_OTOOL64+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_OTOOL64+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$OTOOL64"; then ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. @@ -6408,25 +6746,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi OTOOL64=$ac_cv_prog_OTOOL64 if test -n "$OTOOL64"; then - { echo "$as_me:$LINENO: result: $OTOOL64" >&5 -echo "${ECHO_T}$OTOOL64" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 +$as_echo "$OTOOL64" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6435,10 +6773,10 @@ ac_ct_OTOOL64=$OTOOL64 # Extract the first word of "otool64", so it can be a program name with args. set dummy otool64; 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_OTOOL64+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL64"; then ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. @@ -6448,25 +6786,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_OTOOL64="otool64" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 if test -n "$ac_ct_OTOOL64"; then - { echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 -echo "${ECHO_T}$ac_ct_OTOOL64" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 +$as_echo "$ac_ct_OTOOL64" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_OTOOL64" = x; then @@ -6474,12 +6812,8 @@ 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;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OTOOL64=$ac_ct_OTOOL64 @@ -6514,10 +6848,10 @@ - { 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 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 +$as_echo_n "checking for -single_module linker flag... " >&6; } +if test "${lt_cv_apple_cc_single_mod+set}" = set; then : + $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no if test -z "${LT_MULTI_MODULE}"; then @@ -6541,22 +6875,18 @@ rm -f conftest.* 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 +$as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 +$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } +if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : + $as_echo_n "(cached) " >&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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -6567,39 +6897,18 @@ 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 +if ac_fn_c_try_link "$LINENO"; 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 + 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 +rm -f core conftest.err conftest.$ac_objext \ + 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; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 +$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } case $host_os in rhapsody* | darwin1.[012]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; @@ -6636,16 +6945,12 @@ esac -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -6660,47 +6965,23 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no + ac_cv_header_stdc=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -6710,18 +6991,14 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -6731,14 +7008,10 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : : else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -6765,172 +7038,50 @@ return 0; } _ACEOF -rm -f 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>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (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_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -ac_cv_header_stdc=no +else + ac_cv_header_stdc=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +$as_echo "#define STDC_HEADERS 1" >>confdefs.h fi # On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_Header=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then +done + + +for ac_header in dlfcn.h +do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +" +if test "x$ac_cv_header_dlfcn_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - -for ac_header in dlfcn.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_DLFCN_H 1 _ACEOF fi @@ -6950,7 +7101,7 @@ # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then +if test "${enable_shared+set}" = set; then : enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; @@ -6981,7 +7132,7 @@ # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then +if test "${enable_static+set}" = set; then : enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; @@ -7013,7 +7164,7 @@ # Check whether --with-pic was given. -if test "${with_pic+set}" = set; then +if test "${with_pic+set}" = set; then : withval=$with_pic; pic_mode="$withval" else pic_mode=default @@ -7029,7 +7180,7 @@ # Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then +if test "${enable_fast_install+set}" = set; then : enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; @@ -7110,10 +7261,10 @@ setopt NO_GLOB_SUBST fi -{ echo "$as_me:$LINENO: checking for objdir" >&5 -echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } -if test "${lt_cv_objdir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 +$as_echo_n "checking for objdir... " >&6; } +if test "${lt_cv_objdir+set}" = set; then : + $as_echo_n "(cached) " >&6 else rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null @@ -7125,8 +7276,8 @@ fi rmdir .libs 2>/dev/null fi -{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 -echo "${ECHO_T}$lt_cv_objdir" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 +$as_echo "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir @@ -7218,10 +7369,10 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 -echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 +$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) @@ -7271,11 +7422,11 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7284,10 +7435,10 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - { echo "$as_me:$LINENO: checking for file" >&5 -echo $ECHO_N "checking for file... $ECHO_C" >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 +$as_echo_n "checking for file... " >&6; } +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) @@ -7337,11 +7488,11 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7417,10 +7568,10 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' - { echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext @@ -7435,11 +7586,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:7438: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7589: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7442: \$? = $ac_status" >&5 + echo "$as_me:7593: \$? = $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. @@ -7452,8 +7603,8 @@ $RM conftest* fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" @@ -7472,8 +7623,8 @@ lt_prog_compiler_pic= lt_prog_compiler_static= -{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' @@ -7507,7 +7658,7 @@ # PIC is the default for these OSes. ;; - mingw* | cygwin* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2* | cegcc*) # 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). # Although the cygwin gcc ignores -fPIC, still need this for old-style @@ -7522,10 +7673,11 @@ ;; hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. case $host_cpu in - hppa*64*|ia64*) + hppa*64*) # +Z the default ;; *) @@ -7575,7 +7727,7 @@ fi ;; - mingw* | cygwin* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2* | cegcc*) # 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='-DDLL_EXPORT' @@ -7603,13 +7755,27 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in - icc* | ecc* | ifort*) + # old Intel for x86_64 which still supported -KPIC. + ecc*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-static' ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + # Lahey Fortran 8.1. + lf95*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='--shared' + lt_prog_compiler_static='--static' + ;; pgcc* | pgf77* | pgf90* | pgf95*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -7729,8 +7895,8 @@ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 +$as_echo "$lt_prog_compiler_pic" >&6; } @@ -7741,10 +7907,10 @@ # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then - { 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_cv_prog_compiler_pic_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext @@ -7759,11 +7925,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:7762: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7928: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7766: \$? = $ac_status" >&5 + echo "$as_me:7932: \$? = $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. @@ -7776,8 +7942,8 @@ $RM conftest* fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 +$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } if test x"$lt_cv_prog_compiler_pic_works" = xyes; then case $lt_prog_compiler_pic in @@ -7800,10 +7966,10 @@ # Check to make sure the static flag actually works. # 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_cv_prog_compiler_static_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if test "${lt_cv_prog_compiler_static_works+set}" = set; then : + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no save_LDFLAGS="$LDFLAGS" @@ -7828,8 +7994,8 @@ LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 +$as_echo "$lt_cv_prog_compiler_static_works" >&6; } if test x"$lt_cv_prog_compiler_static_works" = xyes; then : @@ -7843,10 +8009,10 @@ - { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test "${lt_cv_prog_compiler_c_o+set}" = set; then : + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no $RM -r conftest 2>/dev/null @@ -7864,11 +8030,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:7867: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8033: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7871: \$? = $ac_status" >&5 + echo "$as_me:8037: \$? = $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 @@ -7890,18 +8056,18 @@ $RM conftest* fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } - { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test "${lt_cv_prog_compiler_c_o+set}" = set; then : + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no $RM -r conftest 2>/dev/null @@ -7919,11 +8085,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:7922: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8088: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7926: \$? = $ac_status" >&5 + echo "$as_me:8092: \$? = $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 @@ -7945,8 +8111,8 @@ $RM conftest* fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } @@ -7954,19 +8120,19 @@ hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +$as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +$as_echo "$hard_links" >&6; } if test "$hard_links" = no; then - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -7978,8 +8144,8 @@ - { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= allow_undefined_flag= @@ -8023,7 +8189,7 @@ extract_expsyms_cmds= case $host_os in - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. @@ -8038,6 +8204,9 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu) + link_all_deplibs=no + ;; esac ld_shlibs=yes @@ -8059,6 +8228,7 @@ fi supports_anon_versioning=no case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... @@ -8110,7 +8280,7 @@ fi ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' @@ -8150,7 +8320,7 @@ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@ -8176,6 +8346,9 @@ tmp_addflag=' -i_dynamic -nofor_main' ;; ifc* | ifort*) # Intel Fortran compiler tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + whole_archive_flag_spec= + tmp_sharedflag='--shared' ;; xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; @@ -8408,6 +8581,7 @@ fi fi + export_dynamic_flag_spec='${wl}-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. always_export_symbols=yes @@ -8417,11 +8591,7 @@ allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -8432,24 +8602,7 @@ 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 +if ac_fn_c_try_link "$LINENO"; then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -8463,1242 +8616,22 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - 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_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec='$convenience' - archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='' - ;; - m68k) - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - esac - ;; - - bsdi[45]*) - export_dynamic_flag_spec=-rdynamic - ;; - - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_from_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes=yes - ;; - - darwin* | rhapsody*) - - - archive_cmds_need_lc=no - hardcode_direct=no - hardcode_automatic=yes - hardcode_shlibpath_var=unsupported - whole_archive_flag_spec='' - link_all_deplibs=yes - allow_undefined_flag="$_lt_dar_allow_undefined" - 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 $_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 - ld_shlibs=no - fi - - ;; - - dgux*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - freebsd1*) - ld_shlibs=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - hpux9*) - if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' - ;; - - hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - - case $host_cpu in - hppa*64*|ia64*) - hardcode_direct=no - hardcode_shlibpath_var=no - ;; - *) - hardcode_direct=yes - hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat >conftest.$ac_ext <<_ACEOF -int foo(void) {} -_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 - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' - fi - archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - inherit_rpath=yes - link_all_deplibs=yes - ;; - - 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 - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - newsos6) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_shlibpath_var=no - ;; - - *nto* | *qnx*) - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct=yes - hardcode_shlibpath_var=no - hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac - fi - else - ld_shlibs=no - fi - ;; - - os2*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - fi - archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' - - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' - fi - archive_cmds_need_lc='no' - hardcode_libdir_separator=: - ;; - - solaris*) - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) - wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' - ;; - *) - wlarc='${wl}' - archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - ;; - esac - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_shlibpath_var=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' - fi - ;; - esac - link_all_deplibs=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - sysv4) - case $host_vendor in - sni) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' - reload_cmds='$CC -r -o $output$reload_objs' - hardcode_direct=no - ;; - motorola) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no - ;; - - sysv4.3*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - export_dynamic_flag_spec='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-R,$libdir' - hardcode_libdir_separator=':' - link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - *) - ld_shlibs=no - ;; - esac - - if test x$host_vendor = xsni; then - case $host in - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - export_dynamic_flag_spec='${wl}-Blargedynsym' - ;; - esac - fi - fi - -{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -echo "${ECHO_T}$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no - -with_gnu_ld=$with_gnu_ld - - - - - - - - - - - - - - - -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl - pic_flag=$lt_prog_compiler_pic - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc=no - else - archive_cmds_need_lc=yes - fi - allow_undefined_flag=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -echo "${ECHO_T}$archive_cmds_need_lc" >&6; } - ;; - esac - fi - ;; -esac - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } - -if test "$GCC" = yes; then - case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else - test -d "$lt_sys_path" && \ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done - lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; - } else { - lt_count--; - } - } - } - } - if (lt_foo != "") { lt_freq[lt_foo]++; } - if (lt_freq[lt_foo] == 1) { print lt_foo; } -}'` - sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - case $host_cpu in - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - ;; - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[45]*) - version_type=linux - 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' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; - - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - 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 - ;; - -freebsd1*) - dynamic_linker=no - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -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 - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - -interix[3-9]*) - 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' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be Linux ELF. -linux* | k*bsd*-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' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag="-z nodefs" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -9709,275 +8642,510 @@ 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 - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then - shlibpath_overrides_runpath=yes +if ac_fn_c_try_link "$LINENO"; then : + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + no_undefined_flag=' ${wl}-bernotok' + allow_undefined_flag=' ${wl}-berok' + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec='$convenience' + archive_cmds_need_lc=yes + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac + ;; + + bsdi[45]*) + export_dynamic_flag_spec=-rdynamic + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + fix_srcfile_path='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes=yes + ;; + + darwin* | rhapsody*) + + + archive_cmds_need_lc=no + hardcode_direct=no + hardcode_automatic=yes + hardcode_shlibpath_var=unsupported + whole_archive_flag_spec='' + link_all_deplibs=yes + allow_undefined_flag="$_lt_dar_allow_undefined" + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "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 $_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 + ld_shlibs=no + fi + + ;; + + dgux*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; + + freebsd1*) + ld_shlibs=no + ;; + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + hpux9*) + if test "$GCC" = yes; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + export_dynamic_flag_spec='${wl}-E' + ;; + + hpux10*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_ld='+b $libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + hardcode_direct_absolute=yes + export_dynamic_flag_spec='${wl}-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + fi + ;; + + hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + + case $host_cpu in + hppa*64*|ia64*) + hardcode_direct=no + hardcode_shlibpath_var=no + ;; + *) + hardcode_direct=yes + hardcode_direct_absolute=yes + export_dynamic_flag_spec='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; + esac + fi + ;; + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int foo(void) {} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + fi + archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + inherit_rpath=yes + link_all_deplibs=yes + ;; -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir + 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 + archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes + newsos6) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_shlibpath_var=no + ;; - # 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="/lib /usr/lib $lt_ld_extra" - fi + *nto* | *qnx*) + ;; - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; + openbsd*) + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes + hardcode_shlibpath_var=no + hardcode_direct_absolute=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi + else + ld_shlibs=no + fi + ;; -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' - ;; + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; + osf3*) + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + fi + archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' -*nto* | *qnx*) - version_type=qnx - 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='ldqnx.so' - ;; + # Both c and cxx compiler support -rpath directly + hardcode_libdir_flag_spec='-rpath $libdir' + fi + archive_cmds_need_lc='no' + hardcode_libdir_separator=: + ;; -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; + solaris*) + no_undefined_flag=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' + archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) + wlarc='' + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + ;; + *) + wlarc='${wl}' + archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + ;; + esac + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_shlibpath_var=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; *) - shlibpath_overrides_runpath=yes + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test "$GCC" = yes; then + whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' + fi ;; esac - else - shlibpath_overrides_runpath=yes - fi - ;; + link_all_deplibs=yes + ;; -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; + sysv4) + case $host_vendor in + sni) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' + reload_cmds='$CC -r -o $output$reload_objs' + hardcode_direct=no + ;; + motorola) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var=no + ;; -rdos*) - dynamic_linker=no - ;; + sysv4.3*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + export_dynamic_flag_spec='-Bexport' + ;; -solaris*) - 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=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; + sysv4*MP*) + if test -d /usr/nec; then + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ld_shlibs=yes + fi + ;; -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag='${wl}-z,text' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + runpath_var='LD_RUN_PATH' -sysv4 | sysv4.3*) - version_type=linux - 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 - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - runpath_var=LD_RUN_PATH + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi ;; - siemens) - need_lib_prefix=no + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag='${wl}-z,text' + allow_undefined_flag='${wl}-z,nodefs' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-R,$libdir' + hardcode_libdir_separator=':' + link_all_deplibs=yes + export_dynamic_flag_spec='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + + uts4*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no ;; - esac - ;; -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; + *) + ld_shlibs=no + ;; + esac -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + if test x$host_vendor = xsni; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + export_dynamic_flag_spec='${wl}-Blargedynsym' ;; - esac + esac + fi fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; -tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux - need_lib_prefix=no - need_version=no - library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 +$as_echo "$ld_shlibs" >&6; } +test "$ld_shlibs" = no && can_build_shared=no + +with_gnu_ld=$with_gnu_ld + + -uts4*) - version_type=linux - 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 - ;; -*) - dynamic_linker=no - ;; -esac -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no -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" -fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -fi @@ -9987,6 +9155,69 @@ +# +# Do we need to explicitly link libc? +# +case "x$archive_cmds_need_lc" in +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $archive_cmds in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl + pic_flag=$lt_prog_compiler_pic + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + then + archive_cmds_need_lc=no + else + archive_cmds_need_lc=yes + fi + allow_undefined_flag=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 +$as_echo "$archive_cmds_need_lc" >&6; } + ;; + esac + fi + ;; +esac + @@ -10065,1473 +9296,783 @@ - { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } -hardcode_action= -if test -n "$hardcode_libdir_flag_spec" || - test -n "$runpath_var" || - test "X$hardcode_automatic" = "Xyes" ; then - # We can hardcode non-existent directories. - if test "$hardcode_direct" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action=unsupported -fi -{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 -echo "${ECHO_T}$hardcode_action" >&6; } -if test "$hardcode_action" = relink || - test "$inherit_rpath" = yes; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - mingw* | pw32*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - darwin*) - # if libdl is installed we need to link against it - { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - 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 - ac_cv_lib_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_dl_dlopen=no -fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes -fi - ;; - *) - { echo "$as_me:$LINENO: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } -if test "${ac_cv_func_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif -#undef shl_load -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_shl_load || defined __stub___shl_load -choke me -#endif -int -main () -{ -return shl_load (); - ; - 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 - ac_cv_func_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_shl_load=no -fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } -if test $ac_cv_func_shl_load = yes; then - lt_cv_dlopen="shl_load" -else - { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } -if test "${ac_cv_lib_dld_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -int -main () -{ -return shl_load (); - ; - 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 - ac_cv_lib_dld_shl_load=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_dld_shl_load=no -fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ 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="-ldld" -else - { echo "$as_me:$LINENO: checking for dlopen" >&5 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } -if test "${ac_cv_func_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif -#undef dlopen -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_dlopen || defined __stub___dlopen -choke me -#endif -int -main () -{ -return dlopen (); - ; - 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 - ac_cv_func_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_dlopen=no -fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } -if test $ac_cv_func_dlopen = yes; then - lt_cv_dlopen="dlopen" -else - { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - 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 - ac_cv_lib_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_dl_dlopen=no -fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } -if test "${ac_cv_lib_svld_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - 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 - ac_cv_lib_svld_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_svld_dlopen=no -fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } -if test $ac_cv_lib_svld_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else - { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } -if test "${ac_cv_lib_dld_dld_link+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dld_link (); -int -main () -{ -return dld_link (); - ; - 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 - ac_cv_lib_dld_dld_link=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_dld_dld_link=no -fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ 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="-ldld" -fi -fi -fi -fi -fi -fi - ;; - esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } -if test "${lt_cv_dlopen_self+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -#line 10683 "configure" -#include "confdefs.h" -#if HAVE_DLFCN_H -#include -#endif -#include -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif -#ifdef __cplusplus -extern "C" void exit (int); -#endif -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - else - puts (dlerror ()); - exit (status); -} -_LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self=no - fi -fi -rm -fr conftest* -fi -{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } -if test "${lt_cv_dlopen_self_static+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self_static=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -#line 10783 "configure" -#include "confdefs.h" -#if HAVE_DLFCN_H -#include -#endif -#include -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif -#ifdef __cplusplus -extern "C" void exit (int); -#endif -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +$as_echo_n "checking dynamic linker characteristics... " >&6; } - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } +if test "$GCC" = yes; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` else - puts (dlerror ()); - - exit (status); -} -_LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self_static=no + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[lt_foo]++; } + if (lt_freq[lt_foo] == 1) { print lt_foo; } +}'` + sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi -rm -fr conftest* +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +need_lib_prefix=unknown +hardcode_into_libs=no +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown -fi -{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } - fi +case $host_os in +aix3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac +aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi + shlibpath_var=LIBPATH + fi + ;; - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; +amigaos*) + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; esac -fi - - - - - - + ;; +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; +bsdi[45]*) + version_type=linux + 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' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; +cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + case $GCC,$host_os in + yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + esac + ;; + *) + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; + esac + dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; +dgux*) + 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 + ;; +freebsd1*) + dynamic_linker=no + ;; -striplib= -old_striplib= -{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else -# FIXME - insert some real tests, host_os isn't really good enough +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[123]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + freebsd2*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[01]* | freebsdelf3.[01]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; + +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 + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; *) - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' ;; esac -fi - - - - - - - - - - - - - # Report which library types will actually be built - { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } - { echo "$as_me:$LINENO: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6; } + # HP-UX runs *really* slowly unless shared libraries are mode 555. + postinstall_cmds='chmod 555 $lib' + ;; - { echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } - test "$can_build_shared" = "no" && enable_shared=no +interix[3-9]*) + 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' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. +irix5* | irix6* | nonstopux*) case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= ;; - - aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac ;; esac - { echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6; } - - { echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - { echo "$as_me:$LINENO: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6; } - - - - -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -CC="$lt_save_CC" - - - - - - - - - - - - - - ac_config_commands="$ac_config_commands libtool" - - - - -# Only expand once: - - - -{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } -if test "${ac_cv_c_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -/* FIXME: Include the comments suggested by Paul. */ -#ifndef __cplusplus - /* Ultrix mips cc rejects this. */ - typedef int charset[2]; - const charset cs; - /* SunOS 4.1.1 cc rejects this. */ - char const *const *pcpcc; - char **ppc; - /* NEC SVR4.0.2 mips cc rejects this. */ - struct point {int x, y;}; - static struct point const zero = {0,0}; - /* AIX XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in - an arm of an if-expression whose if-part is not a constant - expression */ - const char *g = "string"; - pcpcc = &g + (g ? g-g : 0); - /* HPUX 7.0 cc rejects these. */ - ++pcpcc; - ppc = (char**) pcpcc; - pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 0; - if (s) return 0; - } - { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; - const int *foo = &x[0]; - ++foo; - } - { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ - typedef const int *iptr; - iptr p = 0; - ++p; - } - { /* AIX XL C 1.02.0.0 rejects this saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; - if (!foo) return 0; - } - return !cs[0] && !zero.x; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_cv_c_const=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_const=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -echo "${ECHO_T}$ac_cv_c_const" >&6; } -if test $ac_cv_c_const = no; then - -cat >>confdefs.h <<\_ACEOF -#define const -_ACEOF + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; -fi +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; -{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 -echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; } -if test "${ac_cv_c_bigendian+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # See if sys/param.h defines the BYTE_ORDER macro. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +# This must be Linux ELF. +linux* | k*bsd*-gnu | kopensolaris*-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' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include int main () { -#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \ - && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN) - bogus endian macros -#endif ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - # It does; now see whether it defined to BIG_ENDIAN or not. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include +if ac_fn_c_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + shlibpath_overrides_runpath=yes +fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir -int -main () -{ -#if BYTE_ORDER != BIG_ENDIAN - not big endian -#endif + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_cv_c_bigendian=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + # 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="/lib /usr/lib $lt_ld_extra" + fi - ac_cv_c_bigendian=no -fi + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +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' + ;; - # It does not; compile a test program. -if test "$cross_compiling" = yes; then - # try to guess the endianness by grepping values into an object file - ac_cv_c_bigendian=unknown - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; -short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; -void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } -short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; -short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; -void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } -int -main () -{ - _ascii (); _ebcdic (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then - ac_cv_c_bigendian=yes -fi -if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then - if test "$ac_cv_c_bigendian" = unknown; then - ac_cv_c_bigendian=no +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' else - # finding both strings is unlikely to happen, but who knows? - ac_cv_c_bigendian=unknown + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' fi -fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; +newsos6) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; -fi +*nto* | *qnx*) + version_type=qnx + 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='ldqnx.so' + ;; + +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; + +os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +rdos*) + dynamic_linker=no + ;; + +solaris*) + 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=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.3*) + version_type=linux + 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 + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + 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}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; - /* Are we little or big endian? From Harbison&Steele. */ - union - { - long int l; - char c[sizeof (long int)]; - } u; - u.l = 1; - return u.c[sizeof (long int) - 1] == 1; +uts4*) + version_type=linux + 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 + ;; - ; - return 0; -} -_ACEOF -rm -f 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>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; +*) + dynamic_linker=no + ;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_bigendian=no -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +$as_echo "$dynamic_linker" >&6; } +test "$dynamic_linker" = no && can_build_shared=no -( exit $ac_status ) -ac_cv_c_bigendian=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +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" fi - +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 -echo "${ECHO_T}$ac_cv_c_bigendian" >&6; } -case $ac_cv_c_bigendian in - yes) - -cat >>confdefs.h <<\_ACEOF -#define WORDS_BIGENDIAN 1 -_ACEOF - ;; - no) - ;; - *) - { { echo "$as_me:$LINENO: error: unknown endianness -presetting ac_cv_c_bigendian=no (or yes) will help" >&5 -echo "$as_me: error: unknown endianness -presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} - { (exit 1); exit 1; }; } ;; -esac -ACLOCAL_AMFLAGS="-I m4" -# Checks for header files. -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include -int -main () -{ - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_cv_header_stdc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* -fi -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* -fi -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -rm -f 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>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (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_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -( exit $ac_status ) -ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF -fi @@ -11539,651 +10080,143 @@ -for ac_header in fcntl.h inttypes.h stdlib.h string.h sys/types.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF -fi -done -# Checks for typedefs, structures, and compiler characteristics. -{ echo "$as_me:$LINENO: checking for off_t" >&5 -echo $ECHO_N "checking for off_t... $ECHO_C" >&6; } -if test "${ac_cv_type_off_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -typedef off_t ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_cv_type_off_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_off_t=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 -echo "${ECHO_T}$ac_cv_type_off_t" >&6; } -if test $ac_cv_type_off_t = yes; then - : -else -cat >>confdefs.h <<_ACEOF -#define off_t long int -_ACEOF -fi -{ echo "$as_me:$LINENO: checking for size_t" >&5 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6; } -if test "${ac_cv_type_size_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -typedef size_t ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_cv_type_size_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_size_t=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -echo "${ECHO_T}$ac_cv_type_size_t" >&6; } -if test $ac_cv_type_size_t = yes; then - : -else -cat >>confdefs.h <<_ACEOF -#define size_t unsigned int -_ACEOF -fi -{ echo "$as_me:$LINENO: checking if $CC allows signed enums" >&5 -echo $ECHO_N "checking if $CC allows signed enums... $ECHO_C" >&6; } -ac_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -Wall -Wextra -Werror" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int -main () -{ - void t (void) - { - enum {A, B} a=A; - if (a < 0) {} - } - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then -cat >>confdefs.h <<\_ACEOF -#define ALLOW_SIGNED_ENUMS -_ACEOF - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -CFLAGS="$ac_save_CFLAGS" -# Checks for library functions. -for ac_func in memmove -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif -#undef $ac_func -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif -int -main () -{ -return $ac_func (); - ; - 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 - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -fi -done -# Check for pkg-config -# Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; 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_HAVE_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$HAVE_PKG_CONFIG"; then - ac_cv_prog_HAVE_PKG_CONFIG="$HAVE_PKG_CONFIG" # 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_HAVE_PKG_CONFIG="yes" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS -fi -fi -HAVE_PKG_CONFIG=$ac_cv_prog_HAVE_PKG_CONFIG -if test -n "$HAVE_PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $HAVE_PKG_CONFIG" >&5 -echo "${ECHO_T}$HAVE_PKG_CONFIG" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi -# Check for doxygen -# Extract the first word of "doxygen", so it can be a program name with args. -set dummy doxygen; 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_HAVE_DOXYGEN+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$HAVE_DOXYGEN"; then - ac_cv_prog_HAVE_DOXYGEN="$HAVE_DOXYGEN" # 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_HAVE_DOXYGEN="true" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - test -z "$ac_cv_prog_HAVE_DOXYGEN" && ac_cv_prog_HAVE_DOXYGEN="false" -fi -fi -HAVE_DOXYGEN=$ac_cv_prog_HAVE_DOXYGEN -if test -n "$HAVE_DOXYGEN"; then - { echo "$as_me:$LINENO: result: $HAVE_DOXYGEN" >&5 -echo "${ECHO_T}$HAVE_DOXYGEN" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - if $HAVE_DOXYGEN; then - HAVE_DOXYGEN_TRUE= - HAVE_DOXYGEN_FALSE='#' -else - HAVE_DOXYGEN_TRUE='#' - HAVE_DOXYGEN_FALSE= -fi -if test $HAVE_DOXYGEN = "false"; then - { echo "$as_me:$LINENO: WARNING: *** doxygen not found, docs will not be built" >&5 -echo "$as_me: WARNING: *** doxygen not found, docs will not be built" >&2;} -fi -# Check for man2html -# Extract the first word of "man2html", so it can be a program name with args. -set dummy man2html; 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_HAVE_MAN2HTML+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$HAVE_MAN2HTML"; then - ac_cv_prog_HAVE_MAN2HTML="$HAVE_MAN2HTML" # 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_HAVE_MAN2HTML="true" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - test -z "$ac_cv_prog_HAVE_MAN2HTML" && ac_cv_prog_HAVE_MAN2HTML="false" -fi -fi -HAVE_MAN2HTML=$ac_cv_prog_HAVE_MAN2HTML -if test -n "$HAVE_MAN2HTML"; then - { echo "$as_me:$LINENO: result: $HAVE_MAN2HTML" >&5 -echo "${ECHO_T}$HAVE_MAN2HTML" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - if $HAVE_MAN2HTML; then - HAVE_MAN2HTML_TRUE= - HAVE_MAN2HTML_FALSE='#' -else - HAVE_MAN2HTML_TRUE='#' - HAVE_MAN2HTML_FALSE= -fi -# Check for valgrind -VALGRIND_ENVIRONMENT="" -ac_enable_valgrind=no -# Check whether --enable-valgrind-testing was given. -if test "${enable_valgrind_testing+set}" = set; then - enableval=$enable_valgrind_testing; ac_enable_valgrind=yes -else - ac_enable_valgrind=no -fi -if test "x${ac_enable_valgrind}" = xyes ; then - if test "x${enable_shared}" = xyes ; then - VALGRIND_ENVIRONMENT="libtool --mode=execute " - fi - # Extract the first word of "valgrind", so it can be a program name with args. -set dummy valgrind; 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_HAVE_VALGRIND+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$HAVE_VALGRIND"; then - ac_cv_prog_HAVE_VALGRIND="$HAVE_VALGRIND" # 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_HAVE_VALGRIND="yes" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } +hardcode_action= +if test -n "$hardcode_libdir_flag_spec" || + test -n "$runpath_var" || + test "X$hardcode_automatic" = "Xyes" ; then - test -z "$ac_cv_prog_HAVE_VALGRIND" && ac_cv_prog_HAVE_VALGRIND="no" -fi -fi -HAVE_VALGRIND=$ac_cv_prog_HAVE_VALGRIND -if test -n "$HAVE_VALGRIND"; then - { echo "$as_me:$LINENO: result: $HAVE_VALGRIND" >&5 -echo "${ECHO_T}$HAVE_VALGRIND" >&6; } + # We can hardcode non-existent directories. + if test "$hardcode_direct" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && + test "$hardcode_minus_L" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action=immediate + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action=unsupported fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 +$as_echo "$hardcode_action" >&6; } +if test "$hardcode_action" = relink || + test "$inherit_rpath" = yes; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi - if test "x$HAVE_VALGRIND" = xyes ; then - VALGRIND_ENVIRONMENT="$VALGRIND_ENVIRONMENT valgrind -q --leak-check=yes --show-reachable=yes --num-callers=100" - TESTS_INFO="Test suite will be run under: - ${VALGRIND_ENVIRONMENT}" - else - TESTS_INFO="(Valgrind not found)" - fi + + + + + if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown else - TESTS_INFO="(Valgrind testing not enabled)" -fi + lt_cv_dlopen=no + lt_cv_dlopen_libs= -LIBS="" + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; -# check for getopt in a separate library -HAVE_GETOPT=no -{ echo "$as_me:$LINENO: checking for getopt in -lgetopt" >&5 -echo $ECHO_N "checking for getopt in -lgetopt... $ECHO_C" >&6; } -if test "${ac_cv_lib_getopt_getopt+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + mingw* | pw32* | cegcc*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; + + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lgetopt $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -12192,85 +10225,52 @@ #ifdef __cplusplus extern "C" #endif -char getopt (); +char dlopen (); int main () { -return getopt (); +return dlopen (); ; 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 - ac_cv_lib_getopt_getopt=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_getopt_getopt=no + ac_cv_lib_dl_dlopen=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_getopt_getopt" >&5 -echo "${ECHO_T}$ac_cv_lib_getopt_getopt" >&6; } -if test $ac_cv_lib_getopt_getopt = yes; then - HAVE_GETOPT="yes" -fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else -if test "x$HAVE_GETOPT" = xyes ; then - GETOPT_LIBS="-lgetopt" + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes fi -# check for getopt_long in standard library -HAVE_GETOPT_LONG=no -{ echo "$as_me:$LINENO: checking for getopt_long" >&5 -echo $ECHO_N "checking for getopt_long... $ECHO_C" >&6; } -if test "${ac_cv_func_getopt_long+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + ;; + + *) + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" +if test "x$ac_cv_func_shl_load" = x""yes; then : + lt_cv_dlopen="shl_load" else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 +$as_echo_n "checking for shl_load in -ldld... " >&6; } +if test "${ac_cv_lib_dld_shl_load+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Define getopt_long to an innocuous variant, in case declares getopt_long. - For example, HP-UX 11i declares gettimeofday. */ -#define getopt_long innocuous_getopt_long - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getopt_long (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef getopt_long /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -12278,2705 +10278,1856 @@ #ifdef __cplusplus extern "C" #endif -char getopt_long (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_getopt_long || defined __stub___getopt_long -choke me -#endif - +char shl_load (); int main () { -return getopt_long (); +return shl_load (); ; 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 - ac_cv_func_getopt_long=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_shl_load=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_getopt_long=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + ac_cv_lib_dld_shl_load=no fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_getopt_long" >&5 -echo "${ECHO_T}$ac_cv_func_getopt_long" >&6; } -if test $ac_cv_func_getopt_long = yes; then - HAVE_GETOPT_LONG="yes" +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 +$as_echo "$ac_cv_lib_dld_shl_load" >&6; } +if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" +else + ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +if test "x$ac_cv_func_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -if test "x$HAVE_GETOPT_LONG" = xyes ; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_GETOPT_LONG +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} _ACEOF - -fi - -oggz_config_ok=yes - -oggz_read_programs="" -oggz_rw_programs="" - - -ac_enable_experimental=no -# Check whether --enable-experimental was given. -if test "${enable_experimental+set}" = set; then - enableval=$enable_experimental; ac_enable_experimental=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes +else + ac_cv_lib_dl_dlopen=no fi - - -if test "x${ac_enable_experimental}" = xyes ; then - -cat >>confdefs.h <<\_ACEOF -#define OGGZ_CONFIG_EXPERIMENTAL -_ACEOF - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi - - -ac_enable_read=yes -# Check whether --enable-read was given. -if test "${enable_read+set}" = set; then - enableval=$enable_read; ac_enable_read=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - ac_enable_read=yes -fi - - -if test "x${ac_enable_read}" = xyes ; then - -cat >>confdefs.h <<\_ACEOF -#define OGGZ_CONFIG_READ 1 -_ACEOF - - oggz_read_programs="oggz-dump oggz-info oggz-scan oggz-codecs" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 +$as_echo_n "checking for dlopen in -lsvld... " >&6; } +if test "${ac_cv_lib_svld_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsvld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -cat >>confdefs.h <<\_ACEOF -#define OGGZ_CONFIG_READ 0 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} _ACEOF - -fi - if test "x${ac_enable_read}" = xyes; then - OGGZ_CONFIG_READ_TRUE= - OGGZ_CONFIG_READ_FALSE='#' +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_svld_dlopen=yes else - OGGZ_CONFIG_READ_TRUE='#' - OGGZ_CONFIG_READ_FALSE= + ac_cv_lib_svld_dlopen=no fi - - - -ac_enable_write=yes -# Check whether --enable-write was given. -if test "${enable_write+set}" = set; then - enableval=$enable_write; ac_enable_write=no -else - ac_enable_write=yes +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi - - -if test "x${ac_enable_write}" = xyes ; then - -cat >>confdefs.h <<\_ACEOF -#define OGGZ_CONFIG_WRITE 1 -_ACEOF - - if test "x${ac_enable_read}" = xyes ; then - oggz_rw_programs="oggz-rip oggz-merge oggz-chop oggz-comment oggz-sort oggz-validate" - fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 +$as_echo "$ac_cv_lib_svld_dlopen" >&6; } +if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 +$as_echo_n "checking for dld_link in -ldld... " >&6; } +if test "${ac_cv_lib_dld_dld_link+set}" = set; then : + $as_echo_n "(cached) " >&6 else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -cat >>confdefs.h <<\_ACEOF -#define OGGZ_CONFIG_WRITE 0 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dld_link (); +int +main () +{ +return dld_link (); + ; + return 0; +} _ACEOF - -fi - if test "x${ac_enable_write}" = xyes; then - OGGZ_CONFIG_WRITE_TRUE= - OGGZ_CONFIG_WRITE_FALSE='#' +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_dld_link=yes else - OGGZ_CONFIG_WRITE_TRUE='#' - OGGZ_CONFIG_WRITE_FALSE= + ac_cv_lib_dld_dld_link=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 +$as_echo "$ac_cv_lib_dld_dld_link" >&6; } +if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi -if test "x${ac_enable_read}" = xno && test "x${ac_enable_write}" = xno ; then - { { echo "$as_me:$LINENO: error: -*** -*** You have attempted to explicitly disable both writing and reading. -*** -" >&5 -echo "$as_me: error: -*** -*** You have attempted to explicitly disable both writing and reading. -*** -" >&2;} - { (exit 1); exit 1; }; } fi -HAVE_OGG=no -if test "x$HAVE_PKG_CONFIG" = "xyes" ; then - +fi -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # 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_PKG_CONFIG="$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 -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + + fi fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; 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_ac_pt_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # 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_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 + + ;; + esac + + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + else + enable_dlopen=no fi -done -done -IFS=$as_save_IFS - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 +$as_echo_n "checking whether a program can dlopen itself... " >&6; } +if test "${lt_cv_dlopen_self+set}" = set; then : + $as_echo_n "(cached) " >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +#line 10472 "configure" +#include "confdefs.h" - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } 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 - PKG_CONFIG=$ac_pt_PKG_CONFIG + puts (dlerror ()); + + return status; +} +_LT_EOF + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self=no fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" fi +rm -fr conftest* + fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - PKG_CONFIG="" - fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 +$as_echo "$lt_cv_dlopen_self" >&6; } + + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 +$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } +if test "${lt_cv_dlopen_self_static+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +#line 10568 "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + else + puts (dlerror ()); + return status; +} +_LT_EOF + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self_static=no + fi fi +rm -fr conftest* -pkg_failed=no -{ echo "$as_me:$LINENO: checking for OGG" >&5 -echo $ECHO_N "checking for OGG... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$OGG_CFLAGS"; then - pkg_cv_OGG_CFLAGS="$OGG_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "ogg >= 1.0") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_OGG_CFLAGS=`$PKG_CONFIG --cflags "ogg >= 1.0" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$OGG_LIBS"; then - pkg_cv_OGG_LIBS="$OGG_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "ogg >= 1.0") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_OGG_LIBS=`$PKG_CONFIG --libs "ogg >= 1.0" 2>/dev/null` -else - pkg_failed=yes fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +$as_echo "$lt_cv_dlopen_self_static" >&6; } fi -else - pkg_failed=untried + + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac 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 - OGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ogg >= 1.0"` - else - OGG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ogg >= 1.0"` - fi - # Put the nasty error message in config.log where it belongs - echo "$OGG_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - HAVE_OGG=no -elif test $pkg_failed = untried; then - HAVE_OGG=no -else - OGG_CFLAGS=$pkg_cv_OGG_CFLAGS - OGG_LIBS=$pkg_cv_OGG_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - HAVE_OGG=yes -fi -fi -if test "x$HAVE_OGG" = "xno" ; then -# Check whether --with-ogg was given. -if test "${with_ogg+set}" = set; then - withval=$with_ogg; ogg_prefix="$withval" -else - ogg_prefix="" -fi -# Check whether --with-ogg-libraries was given. -if test "${with_ogg_libraries+set}" = set; then - withval=$with_ogg_libraries; ogg_libraries="$withval" -else - ogg_libraries="" -fi -# Check whether --with-ogg-includes was given. -if test "${with_ogg_includes+set}" = set; then - withval=$with_ogg_includes; ogg_includes="$withval" -else - ogg_includes="" -fi -# Check whether --enable-oggtest was given. -if test "${enable_oggtest+set}" = set; then - enableval=$enable_oggtest; + + + + + +striplib= +old_striplib= +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +$as_echo_n "checking whether stripping libraries is possible... " >&6; } +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - enable_oggtest=yes +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + ;; + esac fi - if test "x$ogg_libraries" != "x" ; then - OGG_LIBS="-L$ogg_libraries" - elif test "x$ogg_prefix" = "xno" || test "x$ogg_prefix" = "xyes" ; then - OGG_LIBS="" - elif test "x$ogg_prefix" != "x" ; then - OGG_LIBS="-L$ogg_prefix/lib" - elif test "x$prefix" != "xNONE" ; then - OGG_LIBS="-L$prefix/lib" - fi - if test "x$ogg_prefix" != "xno" ; then - OGG_LIBS="$OGG_LIBS -logg" - fi - if test "x$ogg_includes" != "x" ; then - OGG_CFLAGS="-I$ogg_includes" - elif test "x$ogg_prefix" = "xno" || test "x$ogg_prefix" = "xyes" ; then - OGG_CFLAGS="" - elif test "x$ogg_prefix" != "x" ; then - OGG_CFLAGS="-I$ogg_prefix/include" - elif test "x$prefix" != "xNONE"; then - OGG_CFLAGS="-I$prefix/include" - fi - { echo "$as_me:$LINENO: checking for Ogg" >&5 -echo $ECHO_N "checking for Ogg... $ECHO_C" >&6; } - if test "x$ogg_prefix" = "xno" ; then - no_ogg="disabled" - enable_oggtest="no" - else - no_ogg="" - fi - if test "x$enable_oggtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $OGG_CFLAGS" - LIBS="$LIBS $OGG_LIBS" - rm -f conf.oggtest - if test "$cross_compiling" = yes; then - echo $ac_n "cross compiling; assumed OK... $ac_c" -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include -int main () -{ - system("touch conf.oggtest"); - return 0; -} -_ACEOF -rm -f 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>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (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_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -( exit $ac_status ) -no_ogg=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi + # Report which library types will actually be built + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +$as_echo_n "checking if libtool supports shared libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +$as_echo "$can_build_shared" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +$as_echo_n "checking whether to build shared libraries... " >&6; } + test "$can_build_shared" = "no" && enable_shared=no - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; - if test "x$no_ogg" = "xdisabled" ; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - HAVE_OGG="no" - elif test "x$no_ogg" = "x" ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - HAVE_OGG="yes" - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - if test -f conf.oggtest ; then - : - else - echo "*** Could not run Ogg test program, checking why..." - CFLAGS="$CFLAGS $OGG_CFLAGS" - LIBS="$LIBS $OGG_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + aix[4-9]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +$as_echo "$enable_shared" >&6; } -#include -#include + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +$as_echo_n "checking whether to build static libraries... " >&6; } + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +$as_echo "$enable_static" >&6; } -int -main () -{ - return 0; - ; - 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 - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding Ogg or finding the wrong" - echo "*** version of Ogg. If it is not finding Ogg, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means Ogg was incorrectly installed" - echo "*** or that you have moved Ogg since it was installed." -fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - OGG_CFLAGS="" - OGG_LIBS="" - HAVE_OGG="no" - fi +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +CC="$lt_save_CC" - rm -f conf.oggtest - if test "x$HAVE_OGG" = xno ; then - oggz_config_ok="no" - { echo "$as_me:$LINENO: checking for ogg_stream_init in -logg" >&5 -echo $ECHO_N "checking for ogg_stream_init in -logg... $ECHO_C" >&6; } -if test "${ac_cv_lib_ogg_ogg_stream_init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-logg $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char ogg_stream_init (); -int -main () -{ -return ogg_stream_init (); - ; - 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 - ac_cv_lib_ogg_ogg_stream_init=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_ogg_ogg_stream_init=no -fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ogg_ogg_stream_init" >&5 -echo "${ECHO_T}$ac_cv_lib_ogg_ogg_stream_init" >&6; } -if test $ac_cv_lib_ogg_ogg_stream_init = yes; then - HAVE_OGG="maybe" -fi - fi -fi - if test "x$HAVE_OGG" = "xyes"; then - HAVE_OGG_TRUE= - HAVE_OGG_FALSE='#' -else - HAVE_OGG_TRUE='#' - HAVE_OGG_FALSE= -fi -if test "x$HAVE_OGG" = "xyes" ; then - { echo "$as_me:$LINENO: checking if ogg_page_bos() takes a const argument" >&5 -echo $ECHO_N "checking if ogg_page_bos() takes a const argument... $ECHO_C" >&6; } - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS -Wall -Werror $OGG_CFLAGS" - LIBS="$LIBS $OGG_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -int f(const ogg_page * cog){return ogg_page_bos(cog);} - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then -cat >>confdefs.h <<\_ACEOF -#define OGG_H_CONST_CORRECT -_ACEOF - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi + ac_config_commands="$ac_config_commands libtool" -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" -fi -unset ac_cv_sizeof_off_t +# Only expand once: -{ echo "$as_me:$LINENO: checking for off_t" >&5 -echo $ECHO_N "checking for off_t... $ECHO_C" >&6; } -if test "${ac_cv_type_off_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; } +if test "${ac_cv_c_const+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default -typedef off_t ac__type_new_; + int main () { -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; +/* FIXME: Include the comments suggested by Paul. */ +#ifndef __cplusplus + /* Ultrix mips cc rejects this. */ + typedef int charset[2]; + const charset cs; + /* SunOS 4.1.1 cc rejects this. */ + char const *const *pcpcc; + char **ppc; + /* NEC SVR4.0.2 mips cc rejects this. */ + struct point {int x, y;}; + static struct point const zero = {0,0}; + /* AIX XL C 1.02.0.0 rejects this. + It does not let you subtract one const X* pointer from another in + an arm of an if-expression whose if-part is not a constant + expression */ + const char *g = "string"; + pcpcc = &g + (g ? g-g : 0); + /* HPUX 7.0 cc rejects these. */ + ++pcpcc; + ppc = (char**) pcpcc; + pcpcc = (char const *const *) ppc; + { /* SCO 3.2v4 cc rejects this. */ + char *t; + char const *s = 0 ? (char *) 0 : (char const *) 0; + + *t++ = 0; + if (s) return 0; + } + { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ + int x[] = {25, 17}; + const int *foo = &x[0]; + ++foo; + } + { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ + typedef const int *iptr; + iptr p = 0; + ++p; + } + { /* AIX XL C 1.02.0.0 rejects this saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ + struct s { int j; const int *ap[3]; }; + struct s *b; b->j = 5; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; + if (!foo) return 0; + } + return !cs[0] && !zero.x; +#endif + ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_cv_type_off_t=yes +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_const=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_off_t=no + ac_cv_c_const=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 -echo "${ECHO_T}$ac_cv_type_off_t" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 +$as_echo "$ac_cv_c_const" >&6; } +if test $ac_cv_c_const = no; then -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ echo "$as_me:$LINENO: checking size of off_t" >&5 -echo $ECHO_N "checking size of off_t... $ECHO_C" >&6; } -if test "${ac_cv_sizeof_off_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +$as_echo "#define const /**/" >>confdefs.h + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 +$as_echo_n "checking whether byte ordering is bigendian... " >&6; } +if test "${ac_cv_c_bigendian+set}" = set; then : + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_cv_c_bigendian=unknown + # See if we're dealing with a universal compiler. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default - typedef off_t ac__type_sizeof_; +#ifndef __APPLE_CC__ + not a universal capable compiler + #endif + typedef int dummy; + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + + # Check for potential -arch flags. It is not universal unless + # there are at least two -arch flags with different values. + ac_arch= + ac_prev= + for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do + if test -n "$ac_prev"; then + case $ac_word in + i?86 | x86_64 | ppc | ppc64) + if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then + ac_arch=$ac_word + else + ac_cv_c_bigendian=universal + break + fi + ;; + esac + ac_prev= + elif test "x$ac_word" = "x-arch"; then + ac_prev=arch + fi + done +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test $ac_cv_c_bigendian = unknown; then + # See if sys/param.h defines the BYTE_ORDER macro. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include + int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; -test_array [0] = 0 +#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ + && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ + && LITTLE_ENDIAN) + bogus endian macros + #endif ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + # It does; now see whether it defined to BIG_ENDIAN or not. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default - typedef off_t ac__type_sizeof_; +#include + #include + int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 +#if BYTE_ORDER != BIG_ENDIAN + not big endian + #endif ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_hi=$ac_mid; break +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_bigendian=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + ac_cv_c_bigendian=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default - typedef off_t ac__type_sizeof_; +#include + int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; -test_array [0] = 0 +#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) + bogus endian macros + #endif ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + # It does; now see whether it defined to _BIG_ENDIAN or not. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default - typedef off_t ac__type_sizeof_; +#include + int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; -test_array [0] = 0 +#ifndef _BIG_ENDIAN + not big endian + #endif ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_lo=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_bigendian=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo= ac_hi= + ac_cv_c_bigendian=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + fi + if test $ac_cv_c_bigendian = unknown; then + # Compile a test program. + if test "$cross_compiling" = yes; then : + # Try to guess by grepping values from an object file. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default - typedef off_t ac__type_sizeof_; +short int ascii_mm[] = + { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; + short int ascii_ii[] = + { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; + int use_ascii (int i) { + return ascii_mm[i] + ascii_ii[i]; + } + short int ebcdic_ii[] = + { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; + short int ebcdic_mm[] = + { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; + int use_ebcdic (int i) { + return ebcdic_mm[i] + ebcdic_ii[i]; + } + extern int foo; + int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 - +return use_ascii (foo) == use_ebcdic (foo); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_hi=$ac_mid -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo=`expr '(' $ac_mid ')' + 1` +if ac_fn_c_try_compile "$LINENO"; then : + if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then + ac_cv_c_bigendian=yes + fi + if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then + if test "$ac_cv_c_bigendian" = unknown; then + ac_cv_c_bigendian=no + else + # finding both strings is unlikely to happen, but who knows? + ac_cv_c_bigendian=unknown + fi + fi fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in -?*) ac_cv_sizeof_off_t=$ac_lo;; -'') if test "$ac_cv_type_off_t" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (off_t) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_off_t=0 - fi ;; -esac else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default - typedef off_t ac__type_sizeof_; -static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } -static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } -#include -#include int main () { - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if (((long int) (sizeof (ac__type_sizeof_))) < 0) - { - long int i = longval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%ld\n", i); - } - else - { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%lu\n", i); - } - return ferror (f) || fclose (f) != 0; + /* Are we little or big endian? From Harbison&Steele. */ + union + { + long int l; + char c[sizeof (long int)]; + } u; + u.l = 1; + return u.c[sizeof (long int) - 1] == 1; ; return 0; } _ACEOF -rm -f 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>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (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_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_off_t=`cat conftest.val` +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_c_bigendian=no else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -if test "$ac_cv_type_off_t" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (off_t) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_off_t=0 - fi + ac_cv_c_bigendian=yes fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f conftest.val + + fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5 -echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 +$as_echo "$ac_cv_c_bigendian" >&6; } + case $ac_cv_c_bigendian in #( + yes) + $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h +;; #( + no) + ;; #( + universal) +$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h + ;; #( + *) + as_fn_error "unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; + esac -cat >>confdefs.h <<_ACEOF -#define SIZEOF_OFF_T $ac_cv_sizeof_off_t -_ACEOF +ACLOCAL_AMFLAGS="-I m4" -case "$host_os" in - mingw*) - TYPEOF_OGGZ_OFF_T="__int64" - OGGZ_OFF_MAX="0x7FFFFFFFFFFFFFFFLL" - SIZEOF_OGGZ_OFF_T=8 - ;; - *) - if test "x$ac_cv_sizeof_off_t" = "x8" ; then - # If sizeof (off_t) is 8, no further checking is needed. - TYPEOF_OGGZ_OFF_T="off_t" - OGGZ_OFF_MAX="0x7FFFFFFFFFFFFFFFLL" - SIZEOF_OGGZ_OFF_T=8 - else - # Check for common 64 bit file offset types. - { echo "$as_me:$LINENO: checking for loff_t" >&5 -echo $ECHO_N "checking for loff_t... $ECHO_C" >&6; } -if test "${ac_cv_type_loff_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Checks for header files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default -typedef loff_t ac__type_new_; +#include +#include +#include +#include + int main () { -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; + ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_cv_type_loff_t=yes +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_loff_t=no + ac_cv_header_stdc=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_loff_t" >&5 -echo "${ECHO_T}$ac_cv_type_loff_t" >&6; } -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ echo "$as_me:$LINENO: checking size of loff_t" >&5 -echo $ECHO_N "checking size of loff_t... $ECHO_C" >&6; } -if test "${ac_cv_sizeof_loff_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default - typedef loff_t ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; -test_array [0] = 0 +#include - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default - typedef loff_t ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 +#include - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_hi=$ac_mid; break +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : + else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_header_stdc=no +fi +rm -f conftest* - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default - typedef loff_t ac__type_sizeof_; +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; -test_array [0] = 0 - - ; + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef loff_t ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; -test_array [0] = 0 +if ac_fn_c_try_run "$LINENO"; then : - ; - return 0; -} +else + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then + +$as_echo "#define STDC_HEADERS 1" >>confdefs.h + +fi + +for ac_header in fcntl.h inttypes.h stdlib.h string.h sys/types.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_lo=$ac_mid; break + +fi + +done + + +# Checks for typedefs, structures, and compiler characteristics. +ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" +if test "x$ac_cv_type_off_t" = x""yes; then : + else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` +cat >>confdefs.h <<_ACEOF +#define off_t long int +_ACEOF + fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done +ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" +if test "x$ac_cv_type_size_t" = x""yes; then : + else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo= ac_hi= -fi +cat >>confdefs.h <<_ACEOF +#define size_t unsigned int +_ACEOF -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC allows signed enums" >&5 +$as_echo_n "checking if $CC allows signed enums... " >&6; } + +ac_save_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS -Wall -Wextra -Werror" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default - typedef loff_t ac__type_sizeof_; + int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 + void t (void) + { + enum {A, B} a=A; + if (a < 0) {} + } ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_hi=$ac_mid +if ac_fn_c_try_compile "$LINENO"; then : + +$as_echo "#define ALLOW_SIGNED_ENUMS /**/" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +CFLAGS="$ac_save_CFLAGS" + +# Checks for library functions. +for ac_func in memmove +do : + ac_fn_c_check_func "$LINENO" "memmove" "ac_cv_func_memmove" +if test "x$ac_cv_func_memmove" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_MEMMOVE 1 +_ACEOF - ac_lo=`expr '(' $ac_mid ')' + 1` fi +done -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +# Check for pkg-config +# Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_HAVE_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$HAVE_PKG_CONFIG"; then + ac_cv_prog_HAVE_PKG_CONFIG="$HAVE_PKG_CONFIG" # 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_HAVE_PKG_CONFIG="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi done -case $ac_lo in -?*) ac_cv_sizeof_loff_t=$ac_lo;; -'') if test "$ac_cv_type_loff_t" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (loff_t) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (loff_t) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_loff_t=0 - fi ;; -esac + done +IFS=$as_save_IFS + +fi +fi +HAVE_PKG_CONFIG=$ac_cv_prog_HAVE_PKG_CONFIG +if test -n "$HAVE_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_PKG_CONFIG" >&5 +$as_echo "$HAVE_PKG_CONFIG" >&6; } else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef loff_t ac__type_sizeof_; -static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } -static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } -#include -#include -int -main () -{ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if (((long int) (sizeof (ac__type_sizeof_))) < 0) - { - long int i = longval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%ld\n", i); - } - else - { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%lu\n", i); - } - return ferror (f) || fclose (f) != 0; - ; - return 0; -} -_ACEOF -rm -f 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>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (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_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_loff_t=`cat conftest.val` + +# Check for doxygen +# Extract the first word of "doxygen", so it can be a program name with args. +set dummy doxygen; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_HAVE_DOXYGEN+set}" = set; then : + $as_echo_n "(cached) " >&6 else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + if test -n "$HAVE_DOXYGEN"; then + ac_cv_prog_HAVE_DOXYGEN="$HAVE_DOXYGEN" # 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_HAVE_DOXYGEN="true" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -( exit $ac_status ) -if test "$ac_cv_type_loff_t" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (loff_t) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (loff_t) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_loff_t=0 - fi + test -z "$ac_cv_prog_HAVE_DOXYGEN" && ac_cv_prog_HAVE_DOXYGEN="false" fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.val +HAVE_DOXYGEN=$ac_cv_prog_HAVE_DOXYGEN +if test -n "$HAVE_DOXYGEN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_DOXYGEN" >&5 +$as_echo "$HAVE_DOXYGEN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_loff_t" >&5 -echo "${ECHO_T}$ac_cv_sizeof_loff_t" >&6; } + if $HAVE_DOXYGEN; then + HAVE_DOXYGEN_TRUE= + HAVE_DOXYGEN_FALSE='#' +else + HAVE_DOXYGEN_TRUE='#' + HAVE_DOXYGEN_FALSE= +fi -cat >>confdefs.h <<_ACEOF -#define SIZEOF_LOFF_T $ac_cv_sizeof_loff_t -_ACEOF +if test $HAVE_DOXYGEN = "false"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** doxygen not found, docs will not be built" >&5 +$as_echo "$as_me: WARNING: *** doxygen not found, docs will not be built" >&2;} +fi - # Fake default value. - { echo "$as_me:$LINENO: checking for off64_t" >&5 -echo $ECHO_N "checking for off64_t... $ECHO_C" >&6; } -if test "${ac_cv_type_off64_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Check for man2html +# Extract the first word of "man2html", so it can be a program name with args. +set dummy man2html; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_HAVE_MAN2HTML+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -typedef off64_t ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_cv_type_off64_t=yes + if test -n "$HAVE_MAN2HTML"; then + ac_cv_prog_HAVE_MAN2HTML="$HAVE_MAN2HTML" # Let the user override the test. else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +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_HAVE_MAN2HTML="true" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_HAVE_MAN2HTML" && ac_cv_prog_HAVE_MAN2HTML="false" +fi +fi +HAVE_MAN2HTML=$ac_cv_prog_HAVE_MAN2HTML +if test -n "$HAVE_MAN2HTML"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_MAN2HTML" >&5 +$as_echo "$HAVE_MAN2HTML" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if $HAVE_MAN2HTML; then + HAVE_MAN2HTML_TRUE= + HAVE_MAN2HTML_FALSE='#' +else + HAVE_MAN2HTML_TRUE='#' + HAVE_MAN2HTML_FALSE= +fi + + +# Check for valgrind +VALGRIND_ENVIRONMENT="" +ac_enable_valgrind=no +# Check whether --enable-valgrind-testing was given. +if test "${enable_valgrind_testing+set}" = set; then : + enableval=$enable_valgrind_testing; ac_enable_valgrind=yes +else + ac_enable_valgrind=no +fi + + +if test "x${ac_enable_valgrind}" = xyes ; then + if test "x${enable_shared}" = xyes ; then + VALGRIND_ENVIRONMENT="libtool --mode=execute " + fi + + # Extract the first word of "valgrind", so it can be a program name with args. +set dummy valgrind; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_HAVE_VALGRIND+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$HAVE_VALGRIND"; then + ac_cv_prog_HAVE_VALGRIND="$HAVE_VALGRIND" # 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_HAVE_VALGRIND="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - ac_cv_type_off64_t=no + test -z "$ac_cv_prog_HAVE_VALGRIND" && ac_cv_prog_HAVE_VALGRIND="no" fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_off64_t" >&5 -echo "${ECHO_T}$ac_cv_type_off64_t" >&6; } - -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ echo "$as_me:$LINENO: checking size of off64_t" >&5 -echo $ECHO_N "checking size of off64_t... $ECHO_C" >&6; } -if test "${ac_cv_sizeof_off64_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +HAVE_VALGRIND=$ac_cv_prog_HAVE_VALGRIND +if test -n "$HAVE_VALGRIND"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_VALGRIND" >&5 +$as_echo "$HAVE_VALGRIND" >&6; } else - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef off64_t ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; -test_array [0] = 0 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef off64_t ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_hi=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + if test "x$HAVE_VALGRIND" = xyes ; then + VALGRIND_ENVIRONMENT="$VALGRIND_ENVIRONMENT valgrind -q --leak-check=yes --show-reachable=yes --num-callers=50" - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + TESTS_INFO="Test suite will be run under: + ${VALGRIND_ENVIRONMENT}" + else + TESTS_INFO="(Valgrind not found)" + fi +else + TESTS_INFO="(Valgrind testing not enabled)" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +LIBS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +# check for getopt in a separate library +HAVE_GETOPT=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getopt in -lgetopt" >&5 +$as_echo_n "checking for getopt in -lgetopt... " >&6; } +if test "${ac_cv_lib_getopt_getopt+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgetopt $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default - typedef off64_t ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; -test_array [0] = 0 - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef off64_t ac__type_sizeof_; +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char getopt (); int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; -test_array [0] = 0 - +return getopt (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_lo=$ac_mid; break +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_getopt_getopt=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_getopt_getopt=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_getopt_getopt" >&5 +$as_echo "$ac_cv_lib_getopt_getopt" >&6; } +if test "x$ac_cv_lib_getopt_getopt" = x""yes; then : + HAVE_GETOPT="yes" +fi + +if test "x$HAVE_GETOPT" = xyes ; then + GETOPT_LIBS="-lgetopt" - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# check for getopt_long in standard library +HAVE_GETOPT_LONG=no +ac_fn_c_check_func "$LINENO" "getopt_long" "ac_cv_func_getopt_long" +if test "x$ac_cv_func_getopt_long" = x""yes; then : + HAVE_GETOPT_LONG="yes" +fi + +if test "x$HAVE_GETOPT_LONG" = xyes ; then + +$as_echo "#define HAVE_GETOPT_LONG /**/" >>confdefs.h - ac_lo= ac_hi= fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +oggz_config_ok=yes + +oggz_read_programs="" +oggz_rw_programs="" + + +ac_enable_experimental=no +# Check whether --enable-experimental was given. +if test "${enable_experimental+set}" = set; then : + enableval=$enable_experimental; ac_enable_experimental=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef off64_t ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_hi=$ac_mid -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if test "x${ac_enable_experimental}" = xyes ; then + +$as_echo "#define OGGZ_CONFIG_EXPERIMENTAL /**/" >>confdefs.h - ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in -?*) ac_cv_sizeof_off64_t=$ac_lo;; -'') if test "$ac_cv_type_off64_t" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (off64_t) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (off64_t) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_off64_t=0 - fi ;; -esac + +ac_enable_read=yes +# Check whether --enable-read was given. +if test "${enable_read+set}" = set; then : + enableval=$enable_read; ac_enable_read=no else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef off64_t ac__type_sizeof_; -static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } -static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } -#include -#include -int -main () -{ + ac_enable_read=yes +fi - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if (((long int) (sizeof (ac__type_sizeof_))) < 0) - { - long int i = longval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%ld\n", i); - } - else - { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%lu\n", i); - } - return ferror (f) || fclose (f) != 0; - ; - return 0; -} -_ACEOF -rm -f 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>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (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_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_off64_t=`cat conftest.val` +if test "x${ac_enable_read}" = xyes ; then + +$as_echo "#define OGGZ_CONFIG_READ 1" >>confdefs.h + + oggz_read_programs="oggz-dump oggz-info oggz-scan oggz-codecs" else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -( exit $ac_status ) -if test "$ac_cv_type_off64_t" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (off64_t) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (off64_t) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_off64_t=0 - fi -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +$as_echo "#define OGGZ_CONFIG_READ 0" >>confdefs.h + fi -rm -f conftest.val + if test "x${ac_enable_read}" = xyes; then + OGGZ_CONFIG_READ_TRUE= + OGGZ_CONFIG_READ_FALSE='#' +else + OGGZ_CONFIG_READ_TRUE='#' + OGGZ_CONFIG_READ_FALSE= fi -{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_off64_t" >&5 -echo "${ECHO_T}$ac_cv_sizeof_off64_t" >&6; } -cat >>confdefs.h <<_ACEOF -#define SIZEOF_OFF64_T $ac_cv_sizeof_off64_t -_ACEOF +ac_enable_write=yes +# Check whether --enable-write was given. +if test "${enable_write+set}" = set; then : + enableval=$enable_write; ac_enable_write=no +else + ac_enable_write=yes +fi + + +if test "x${ac_enable_write}" = xyes ; then - # Fake default value. +$as_echo "#define OGGZ_CONFIG_WRITE 1" >>confdefs.h - TYPEOF_OGGZ_OFF_T="unknown" - if test "x$ac_cv_sizeof_loff_t" = "x8" ; then - TYPEOF_OGGZ_OFF_T="loff_t" - SIZEOF_OGGZ_OFF_T=8 - elif test "x$ac_cv_sizeof_off64_t" = "x8" ; then - TYPEOF_OGGZ_OFF_T="off64_t" - SIZEOF_OGGZ_OFF_T=8 - fi + if test "x${ac_enable_read}" = xyes ; then + oggz_rw_programs="oggz-rip oggz-merge oggz-chop oggz-comment oggz-sort oggz-validate" + fi +else - # Save the old sizeof (off_t) value and then unset it to see if it - # changes when Large File Support is enabled. +$as_echo "#define OGGZ_CONFIG_WRITE 0" >>confdefs.h - pre_largefile_sizeof_off_t=$ac_cv_sizeof_off_t - unset ac_cv_sizeof_off_t +fi + if test "x${ac_enable_write}" = xyes; then + OGGZ_CONFIG_WRITE_TRUE= + OGGZ_CONFIG_WRITE_FALSE='#' +else + OGGZ_CONFIG_WRITE_TRUE='#' + OGGZ_CONFIG_WRITE_FALSE= +fi - # Check whether --enable-largefile was given. -if test "${enable_largefile+set}" = set; then - enableval=$enable_largefile; +if test "x${ac_enable_read}" = xno && test "x${ac_enable_write}" = xno ; then + as_fn_error " +*** +*** You have attempted to explicitly disable both writing and reading. +*** +" "$LINENO" 5 fi - if test "$enable_largefile" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}getconf", so it can be a program name with args. -set dummy ${ac_tool_prefix}getconf; 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_GETCONF+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$GETCONF"; then - ac_cv_prog_GETCONF="$GETCONF" # Let the user override the test. + +HAVE_OGG=no +if test "x$HAVE_PKG_CONFIG" = "xyes" ; then + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # 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 + 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_GETCONF="${ac_tool_prefix}getconf" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS + ;; +esac fi -fi -GETCONF=$ac_cv_prog_GETCONF -if test -n "$GETCONF"; then - { echo "$as_me:$LINENO: result: $GETCONF" >&5 -echo "${ECHO_T}$GETCONF" >&6; } +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi -if test -z "$ac_cv_prog_GETCONF"; then - ac_ct_GETCONF=$GETCONF - # Extract the first word of "getconf", so it can be a program name with args. -set dummy getconf; 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_GETCONF+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_GETCONF"; then - ac_cv_prog_ac_ct_GETCONF="$ac_ct_GETCONF" # Let the user override the test. +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # 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 + 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_GETCONF="getconf" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS + ;; +esac fi -fi -ac_ct_GETCONF=$ac_cv_prog_ac_ct_GETCONF -if test -n "$ac_ct_GETCONF"; then - { echo "$as_me:$LINENO: result: $ac_ct_GETCONF" >&5 -echo "${ECHO_T}$ac_ct_GETCONF" >&6; } +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - if test "x$ac_ct_GETCONF" = x; then - GETCONF="" + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" 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;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac - GETCONF=$ac_ct_GETCONF + PKG_CONFIG=$ac_pt_PKG_CONFIG fi else - GETCONF="$ac_cv_prog_GETCONF" + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" fi - { echo "$as_me:$LINENO: checking for CFLAGS value to request large file support" >&5 -echo $ECHO_N "checking for CFLAGS value to request large file support... $ECHO_C" >&6; } -if test "${ac_cv_sys_largefile_CFLAGS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_sys_largefile_CFLAGS=`($GETCONF LFS_CFLAGS) 2>/dev/null` || { - ac_cv_sys_largefile_CFLAGS=no - case "$host_os" in - # IRIX 6.2 and later require cc -n32. - irix6.[2-9]* | irix6.1[0-9]* | irix[7-9].* | irix[1-9][0-9]*) - if test "$GCC" != yes; then - ac_cv_sys_largefile_CFLAGS=-n32 - fi - ac_save_CC="$CC" - CC="$CC $ac_cv_sys_largefile_CFLAGS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi -int -main () -{ +fi - ; - 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 +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OGG" >&5 +$as_echo_n "checking for OGG... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$OGG_CFLAGS"; then + pkg_cv_OGG_CFLAGS="$OGG_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ogg >= 1.0") 2>&5 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 - : + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_OGG_CFLAGS=`$PKG_CONFIG --cflags "ogg >= 1.0" 2>/dev/null` else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_sys_largefile_CFLAGS=no + pkg_failed=yes fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CC="$ac_save_CC" - esac - } + fi +else + pkg_failed=untried fi -{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CFLAGS" >&5 -echo "${ECHO_T}$ac_cv_sys_largefile_CFLAGS" >&6; } - { echo "$as_me:$LINENO: checking for LDFLAGS value to request large file support" >&5 -echo $ECHO_N "checking for LDFLAGS value to request large file support... $ECHO_C" >&6; } -if test "${ac_cv_sys_largefile_LDFLAGS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test -n "$PKG_CONFIG"; then + if test -n "$OGG_LIBS"; then + pkg_cv_OGG_LIBS="$OGG_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ogg >= 1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_OGG_LIBS=`$PKG_CONFIG --libs "ogg >= 1.0" 2>/dev/null` else - ac_cv_sys_largefile_LDFLAGS=`($GETCONF LFS_LDFLAGS) 2>/dev/null` || { - ac_cv_sys_largefile_LDFLAGS=no - - } + pkg_failed=yes fi -{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_LDFLAGS" >&5 -echo "${ECHO_T}$ac_cv_sys_largefile_LDFLAGS" >&6; } - { echo "$as_me:$LINENO: checking for LIBS value to request large file support" >&5 -echo $ECHO_N "checking for LIBS value to request large file support... $ECHO_C" >&6; } -if test "${ac_cv_sys_largefile_LIBS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + fi else - ac_cv_sys_largefile_LIBS=`($GETCONF LFS_LIBS) 2>/dev/null` || { - ac_cv_sys_largefile_LIBS=no + 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 -{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_LIBS" >&5 -echo "${ECHO_T}$ac_cv_sys_largefile_LIBS" >&6; } + if test $_pkg_short_errors_supported = yes; then + OGG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ogg >= 1.0"` + else + OGG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ogg >= 1.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$OGG_PKG_ERRORS" >&5 - for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do - case "$ac_flag" in - no) ;; - -D_FILE_OFFSET_BITS=*) ;; - -D_LARGEFILE_SOURCE | -D_LARGEFILE_SOURCE=*) ;; - -D_LARGE_FILES | -D_LARGE_FILES=*) ;; - -D?* | -I?*) - case "$ac_flag" in - no) ;; - ?*) - case "$CPPFLAGS" in - '') CPPFLAGS="$ac_flag" ;; - *) CPPFLAGS=$CPPFLAGS' '"$ac_flag" ;; - esac ;; - esac ;; - *) - case "$ac_flag" in - no) ;; - ?*) - case "$CFLAGS" in - '') CFLAGS="$ac_flag" ;; - *) CFLAGS=$CFLAGS' '"$ac_flag" ;; - esac ;; - esac ;; - esac - done - case "$ac_cv_sys_largefile_LDFLAGS" in - no) ;; - ?*) - case "$LDFLAGS" in - '') LDFLAGS="$ac_cv_sys_largefile_LDFLAGS" ;; - *) LDFLAGS=$LDFLAGS' '"$ac_cv_sys_largefile_LDFLAGS" ;; - esac ;; - esac - case "$ac_cv_sys_largefile_LIBS" in - no) ;; - ?*) - case "$LIBS" in - '') LIBS="$ac_cv_sys_largefile_LIBS" ;; - *) LIBS=$LIBS' '"$ac_cv_sys_largefile_LIBS" ;; - esac ;; - esac - { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS" >&5 -echo $ECHO_N "checking for _FILE_OFFSET_BITS... $ECHO_C" >&6; } -if test "${ac_cv_sys_file_offset_bits+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + HAVE_OGG=no +elif test $pkg_failed = untried; then + HAVE_OGG=no else - ac_cv_sys_file_offset_bits=no + OGG_CFLAGS=$pkg_cv_OGG_CFLAGS + OGG_LIBS=$pkg_cv_OGG_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + HAVE_OGG=yes +fi +fi - for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do - case "$ac_flag" in - -D_FILE_OFFSET_BITS) - ac_cv_sys_file_offset_bits=1 ;; - -D_FILE_OFFSET_BITS=*) - ac_cv_sys_file_offset_bits=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;; - esac - done +if test "x$HAVE_OGG" = "xno" ; then +# Check whether --with-ogg was given. +if test "${with_ogg+set}" = set; then : + withval=$with_ogg; ogg_prefix="$withval" +else + ogg_prefix="" fi -{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 -echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; } - if test "$ac_cv_sys_file_offset_bits" != no; then -cat >>confdefs.h <<_ACEOF -#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits -_ACEOF - fi - case "$host_os" in - # HP-UX 10.20 and later - hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*) - ac_cv_sys_file_offset_bits=64 ;; - esac - { echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE" >&5 -echo $ECHO_N "checking for _LARGEFILE_SOURCE... $ECHO_C" >&6; } -if test "${ac_cv_sys_largefile_source+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Check whether --with-ogg-libraries was given. +if test "${with_ogg_libraries+set}" = set; then : + withval=$with_ogg_libraries; ogg_libraries="$withval" else - ac_cv_sys_largefile_source=no - case "$host_os" in - # HP-UX 10.20 and later - hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*) - ac_cv_sys_largefile_source=1 ;; - esac - for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do - case "$ac_flag" in - -D_LARGEFILE_SOURCE) - ac_cv_sys_largefile_source=1 ;; - -D_LARGEFILE_SOURCE=*) - ac_cv_sys_largefile_source=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;; - esac - done - + ogg_libraries="" fi -{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5 -echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6; } - if test "$ac_cv_sys_largefile_source" != no; then -cat >>confdefs.h <<_ACEOF -#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source -_ACEOF - fi - { echo "$as_me:$LINENO: checking for _LARGE_FILES" >&5 -echo $ECHO_N "checking for _LARGE_FILES... $ECHO_C" >&6; } -if test "${ac_cv_sys_large_files+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Check whether --with-ogg-includes was given. +if test "${with_ogg_includes+set}" = set; then : + withval=$with_ogg_includes; ogg_includes="$withval" else - ac_cv_sys_large_files=no - case "$host_os" in - # AIX 4.2 and later - aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*) - ac_cv_sys_large_files=1 ;; - esac - for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do - case "$ac_flag" in - -D_LARGE_FILES) - ac_cv_sys_large_files=1 ;; - -D_LARGE_FILES=*) - ac_cv_sys_large_files=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;; - esac - done + ogg_includes="" +fi +# Check whether --enable-oggtest was given. +if test "${enable_oggtest+set}" = set; then : + enableval=$enable_oggtest; +else + enable_oggtest=yes fi -{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 -echo "${ECHO_T}$ac_cv_sys_large_files" >&6; } - if test "$ac_cv_sys_large_files" != no; then -cat >>confdefs.h <<_ACEOF -#define _LARGE_FILES $ac_cv_sys_large_files -_ACEOF - fi - fi + if test "x$ogg_libraries" != "x" ; then + OGG_LIBS="-L$ogg_libraries" + elif test "x$ogg_prefix" = "xno" || test "x$ogg_prefix" = "xyes" ; then + OGG_LIBS="" + elif test "x$ogg_prefix" != "x" ; then + OGG_LIBS="-L$ogg_prefix/lib" + elif test "x$prefix" != "xNONE" ; then + OGG_LIBS="-L$prefix/lib" + fi + if test "x$ogg_prefix" != "xno" ; then + OGG_LIBS="$OGG_LIBS -logg" + fi + + if test "x$ogg_includes" != "x" ; then + OGG_CFLAGS="-I$ogg_includes" + elif test "x$ogg_prefix" = "xno" || test "x$ogg_prefix" = "xyes" ; then + OGG_CFLAGS="" + elif test "x$ogg_prefix" != "x" ; then + OGG_CFLAGS="-I$ogg_prefix/include" + elif test "x$prefix" != "xNONE"; then + OGG_CFLAGS="-I$prefix/include" + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Ogg" >&5 +$as_echo_n "checking for Ogg... " >&6; } + if test "x$ogg_prefix" = "xno" ; then + no_ogg="disabled" + enable_oggtest="no" + else + no_ogg="" + fi - if test "x$ac_cv_sys_largefile_CFLAGS" = "xno" ; then - ac_cv_sys_largefile_CFLAGS="" - fi - if test "x$ac_cv_sys_largefile_LDFLAGS" = "xno" ; then - ac_cv_sys_largefile_LDFLAGS="" - fi - if test "x$ac_cv_sys_largefile_LIBS" = "xno" ; then - ac_cv_sys_largefile_LIBS="" - fi - { echo "$as_me:$LINENO: checking for off_t" >&5 -echo $ECHO_N "checking for off_t... $ECHO_C" >&6; } -if test "${ac_cv_type_off_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test "x$enable_oggtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $OGG_CFLAGS" + LIBS="$LIBS $OGG_LIBS" + rm -f conf.oggtest + if test "$cross_compiling" = yes; then : + echo $ac_n "cross compiling; assumed OK... $ac_c" else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default -typedef off_t ac__type_new_; -int -main () + +#include +#include +#include +#include + +int main () { -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; + system("touch conf.oggtest"); return 0; } + + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_cv_type_off_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_run "$LINENO"; then : - ac_cv_type_off_t=no +else + no_ogg=yes fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 -echo "${ECHO_T}$ac_cv_type_off_t" >&6; } -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ echo "$as_me:$LINENO: checking size of off_t" >&5 -echo $ECHO_N "checking size of off_t... $ECHO_C" >&6; } -if test "${ac_cv_sizeof_off_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef off_t ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; -test_array [0] = 0 + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + if test "x$no_ogg" = "xdisabled" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + HAVE_OGG="no" + elif test "x$no_ogg" = "x" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + HAVE_OGG="yes" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test -f conf.oggtest ; then + : + else + echo "*** Could not run Ogg test program, checking why..." + CFLAGS="$CFLAGS $OGG_CFLAGS" + LIBS="$LIBS $OGG_LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default - typedef off_t ac__type_sizeof_; + +#include +#include + int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 - + return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_hi=$ac_mid; break +if ac_fn_c_try_link "$LINENO"; then : + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding Ogg or finding the wrong" + echo "*** version of Ogg. If it is not finding Ogg, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means Ogg was incorrectly installed" + echo "*** or that you have moved Ogg since it was installed." fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + OGG_CFLAGS="" + OGG_LIBS="" + HAVE_OGG="no" + fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef off_t ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; -test_array [0] = 0 + rm -f conf.oggtest - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + if test "x$HAVE_OGG" = xno ; then + oggz_config_ok="no" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ogg_stream_init in -logg" >&5 +$as_echo_n "checking for ogg_stream_init in -logg... " >&6; } +if test "${ac_cv_lib_ogg_ogg_stream_init+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-logg $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default - typedef off_t ac__type_sizeof_; + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ogg_stream_init (); int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; -test_array [0] = 0 - +return ogg_stream_init (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_lo=$ac_mid; break +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ogg_ogg_stream_init=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_lib_ogg_ogg_stream_init=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ogg_ogg_stream_init" >&5 +$as_echo "$ac_cv_lib_ogg_ogg_stream_init" >&6; } +if test "x$ac_cv_lib_ogg_ogg_stream_init" = x""yes; then : + HAVE_OGG="maybe" +fi - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + fi fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done + if test "x$HAVE_OGG" = "xyes"; then + HAVE_OGG_TRUE= + HAVE_OGG_FALSE='#' else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo= ac_hi= + HAVE_OGG_TRUE='#' + HAVE_OGG_FALSE= fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +if test "x$HAVE_OGG" = "xyes" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ogg_page_bos() takes a const argument" >&5 +$as_echo_n "checking if ogg_page_bos() takes a const argument... " >&6; } + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS -Wall -Werror $OGG_CFLAGS" + LIBS="$LIBS $OGG_LIBS" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default - typedef off_t ac__type_sizeof_; +#include int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 - +int f(const ogg_page * cog){return ogg_page_bos(cog);} ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_hi=$ac_mid +if ac_fn_c_try_compile "$LINENO"; then : + +$as_echo "#define OGG_H_CONST_CORRECT /**/" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_lo=`expr '(' $ac_mid ')' + 1` + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in -?*) ac_cv_sizeof_off_t=$ac_lo;; -'') if test "$ac_cv_type_off_t" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (off_t) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_off_t=0 - fi ;; -esac -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef off_t ac__type_sizeof_; -static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } -static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } -#include -#include -int -main () -{ - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if (((long int) (sizeof (ac__type_sizeof_))) < 0) - { - long int i = longval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%ld\n", i); - } - else - { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%lu\n", i); - } - return ferror (f) || fclose (f) != 0; +unset ac_cv_sizeof_off_t - ; - return 0; -} -_ACEOF -rm -f 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>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (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_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_off_t=`cat conftest.val` -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5 +$as_echo_n "checking size of off_t... " >&6; } +if test "${ac_cv_sizeof_off_t+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t" "$ac_includes_default"; then : -( exit $ac_status ) -if test "$ac_cv_type_off_t" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (off_t) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } +else + if test "$ac_cv_type_off_t" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ as_fn_set_status 77 +as_fn_error "cannot compute sizeof (off_t) +See \`config.log' for more details." "$LINENO" 5; }; } else ac_cv_sizeof_off_t=0 fi fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -rm -f conftest.val + fi -{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5 -echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5 +$as_echo "$ac_cv_sizeof_off_t" >&6; } @@ -14984,514 +12135,531 @@ #define SIZEOF_OFF_T $ac_cv_sizeof_off_t _ACEOF - # Fake default value. - - if test "x$ac_cv_sizeof_off_t" = "x8" ; then - OGGZ_OFF_MAX="0x7FFFFFFFFFFFFFFFLL" - elif test "x$ac_cv_sizeof_off_t" = "x$pre_largefile_sizeof_off_t" ; then - { echo "$as_me:$LINENO: WARNING: This machine does not seem to support 64 bit file offsets." >&5 -echo "$as_me: WARNING: This machine does not seem to support 64 bit file offsets." >&2;} - TYPEOF_OGGZ_OFF_T="off_t" - SIZEOF_OGGZ_OFF_T=$ac_cv_sizeof_off_t - elif test "x$TYPEOF_OGGZ_OFF_T" = "xunknown" ; then - echo - echo "*** The configure process has determined that this system is capable" - echo "*** of Large File Support but has not been able to find a type which" - echo "*** is an unambiguous 64 bit file offset." - echo "*** Please contact the author to help resolve this problem." - echo - { { echo "$as_me:$LINENO: error: Bad file offset type." >&5 -echo "$as_me: error: Bad file offset type." >&2;} - { (exit 1); exit 1; }; } - fi - fi - ;; - esac -if test $SIZEOF_OGGZ_OFF_T = 4 ; then - OGGZ_OFF_MAX="0x7FFFFFFF" - PRI_OGGZ_OFF_T="l" -elif test $SIZEOF_OGGZ_OFF_T = 8 ; then - PRI_OGGZ_OFF_T="ll" -fi +case "$host_os" in + mingw*) + TYPEOF_OGGZ_OFF_T="__int64" + OGGZ_OFF_MAX="0x7FFFFFFFFFFFFFFFLL" + SIZEOF_OGGZ_OFF_T=8 + ;; + *) + if test "x$ac_cv_sizeof_off_t" = "x8" ; then + # If sizeof (off_t) is 8, no further checking is needed. + TYPEOF_OGGZ_OFF_T="off_t" + OGGZ_OFF_MAX="0x7FFFFFFFFFFFFFFFLL" + SIZEOF_OGGZ_OFF_T=8 + else + # Check for common 64 bit file offset types. + # The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of loff_t" >&5 +$as_echo_n "checking size of loff_t... " >&6; } +if test "${ac_cv_sizeof_loff_t+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (loff_t))" "ac_cv_sizeof_loff_t" "$ac_includes_default"; then : +else + if test "$ac_cv_type_loff_t" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ as_fn_set_status 77 +as_fn_error "cannot compute sizeof (loff_t) +See \`config.log' for more details." "$LINENO" 5; }; } + else + ac_cv_sizeof_loff_t=0 + fi +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_loff_t" >&5 +$as_echo "$ac_cv_sizeof_loff_t" >&6; } cat >>confdefs.h <<_ACEOF -#define SIZEOF_OGGZ_OFF_T ${SIZEOF_OGGZ_OFF_T} +#define SIZEOF_LOFF_T $ac_cv_sizeof_loff_t _ACEOF + # Fake default value. + # The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off64_t" >&5 +$as_echo_n "checking size of off64_t... " >&6; } +if test "${ac_cv_sizeof_off64_t+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off64_t))" "ac_cv_sizeof_off64_t" "$ac_includes_default"; then : + +else + if test "$ac_cv_type_off64_t" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ as_fn_set_status 77 +as_fn_error "cannot compute sizeof (off64_t) +See \`config.log' for more details." "$LINENO" 5; }; } + else + ac_cv_sizeof_off64_t=0 + fi +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off64_t" >&5 +$as_echo "$ac_cv_sizeof_off64_t" >&6; } cat >>confdefs.h <<_ACEOF -#define OGGZ_OFF_MAX ${OGGZ_OFF_MAX} +#define SIZEOF_OFF64_T $ac_cv_sizeof_off64_t _ACEOF + # Fake default value. + + TYPEOF_OGGZ_OFF_T="unknown" + if test "x$ac_cv_sizeof_loff_t" = "x8" ; then + TYPEOF_OGGZ_OFF_T="loff_t" + SIZEOF_OGGZ_OFF_T=8 + elif test "x$ac_cv_sizeof_off64_t" = "x8" ; then + TYPEOF_OGGZ_OFF_T="off64_t" + SIZEOF_OGGZ_OFF_T=8 + fi + + # Save the old sizeof (off_t) value and then unset it to see if it + # changes when Large File Support is enabled. + + pre_largefile_sizeof_off_t=$ac_cv_sizeof_off_t + unset ac_cv_sizeof_off_t + + + # Check whether --enable-largefile was given. +if test "${enable_largefile+set}" = set; then : + enableval=$enable_largefile; +fi + + if test "$enable_largefile" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}getconf", so it can be a program name with args. +set dummy ${ac_tool_prefix}getconf; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_GETCONF+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$GETCONF"; then + ac_cv_prog_GETCONF="$GETCONF" # 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_GETCONF="${ac_tool_prefix}getconf" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +GETCONF=$ac_cv_prog_GETCONF +if test -n "$GETCONF"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GETCONF" >&5 +$as_echo "$GETCONF" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_GETCONF"; then + ac_ct_GETCONF=$GETCONF + # Extract the first word of "getconf", so it can be a program name with args. +set dummy getconf; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_GETCONF+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_GETCONF"; then + ac_cv_prog_ac_ct_GETCONF="$ac_ct_GETCONF" # 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_GETCONF="getconf" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_GETCONF=$ac_cv_prog_ac_ct_GETCONF +if test -n "$ac_ct_GETCONF"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_GETCONF" >&5 +$as_echo "$ac_ct_GETCONF" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + if test "x$ac_ct_GETCONF" = x; then + GETCONF="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + GETCONF=$ac_ct_GETCONF + fi +else + GETCONF="$ac_cv_prog_GETCONF" +fi -{ echo "$as_me:$LINENO: checking for ssize_t" >&5 -echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; } -if test "${ac_cv_type_ssize_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLAGS value to request large file support" >&5 +$as_echo_n "checking for CFLAGS value to request large file support... " >&6; } +if test "${ac_cv_sys_largefile_CFLAGS+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_cv_sys_largefile_CFLAGS=`($GETCONF LFS_CFLAGS) 2>/dev/null` || { + ac_cv_sys_largefile_CFLAGS=no + case "$host_os" in + # IRIX 6.2 and later require cc -n32. + irix6.[2-9]* | irix6.1[0-9]* | irix[7-9].* | irix[1-9][0-9]*) + if test "$GCC" != yes; then + ac_cv_sys_largefile_CFLAGS=-n32 + fi + ac_save_CC="$CC" + CC="$CC $ac_cv_sys_largefile_CFLAGS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default -typedef ssize_t ac__type_new_; + int main () { -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; + ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_cv_type_ssize_t=yes +if ac_fn_c_try_link "$LINENO"; then : + else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_sys_largefile_CFLAGS=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CC="$ac_save_CC" + esac + } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CFLAGS" >&5 +$as_echo "$ac_cv_sys_largefile_CFLAGS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LDFLAGS value to request large file support" >&5 +$as_echo_n "checking for LDFLAGS value to request large file support... " >&6; } +if test "${ac_cv_sys_largefile_LDFLAGS+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_sys_largefile_LDFLAGS=`($GETCONF LFS_LDFLAGS) 2>/dev/null` || { + ac_cv_sys_largefile_LDFLAGS=no - ac_cv_type_ssize_t=no + } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_LDFLAGS" >&5 +$as_echo "$ac_cv_sys_largefile_LDFLAGS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBS value to request large file support" >&5 +$as_echo_n "checking for LIBS value to request large file support... " >&6; } +if test "${ac_cv_sys_largefile_LIBS+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_sys_largefile_LIBS=`($GETCONF LFS_LIBS) 2>/dev/null` || { + ac_cv_sys_largefile_LIBS=no + + } fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_LIBS" >&5 +$as_echo "$ac_cv_sys_largefile_LIBS" >&6; } + + for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do + case "$ac_flag" in + no) ;; + -D_FILE_OFFSET_BITS=*) ;; + -D_LARGEFILE_SOURCE | -D_LARGEFILE_SOURCE=*) ;; + -D_LARGE_FILES | -D_LARGE_FILES=*) ;; + -D?* | -I?*) + case "$ac_flag" in + no) ;; + ?*) + case "$CPPFLAGS" in + '') CPPFLAGS="$ac_flag" ;; + *) CPPFLAGS=$CPPFLAGS' '"$ac_flag" ;; + esac ;; + esac ;; + *) + case "$ac_flag" in + no) ;; + ?*) + case "$CFLAGS" in + '') CFLAGS="$ac_flag" ;; + *) CFLAGS=$CFLAGS' '"$ac_flag" ;; + esac ;; + esac ;; + esac + done + case "$ac_cv_sys_largefile_LDFLAGS" in + no) ;; + ?*) + case "$LDFLAGS" in + '') LDFLAGS="$ac_cv_sys_largefile_LDFLAGS" ;; + *) LDFLAGS=$LDFLAGS' '"$ac_cv_sys_largefile_LDFLAGS" ;; + esac ;; + esac + case "$ac_cv_sys_largefile_LIBS" in + no) ;; + ?*) + case "$LIBS" in + '') LIBS="$ac_cv_sys_largefile_LIBS" ;; + *) LIBS=$LIBS' '"$ac_cv_sys_largefile_LIBS" ;; + esac ;; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS" >&5 +$as_echo_n "checking for _FILE_OFFSET_BITS... " >&6; } +if test "${ac_cv_sys_file_offset_bits+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_sys_file_offset_bits=no + + for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do + case "$ac_flag" in + -D_FILE_OFFSET_BITS) + ac_cv_sys_file_offset_bits=1 ;; + -D_FILE_OFFSET_BITS=*) + ac_cv_sys_file_offset_bits=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;; + esac + done -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5 -echo "${ECHO_T}$ac_cv_type_ssize_t" >&6; } -if test $ac_cv_type_ssize_t = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 +$as_echo "$ac_cv_sys_file_offset_bits" >&6; } + if test "$ac_cv_sys_file_offset_bits" != no; then cat >>confdefs.h <<_ACEOF -#define HAVE_SSIZE_T 1 +#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits _ACEOF + fi + case "$host_os" in + # HP-UX 10.20 and later + hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*) + ac_cv_sys_file_offset_bits=64 ;; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE" >&5 +$as_echo_n "checking for _LARGEFILE_SOURCE... " >&6; } +if test "${ac_cv_sys_largefile_source+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_sys_largefile_source=no + case "$host_os" in + # HP-UX 10.20 and later + hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*) + ac_cv_sys_largefile_source=1 ;; + esac + for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do + case "$ac_flag" in + -D_LARGEFILE_SOURCE) + ac_cv_sys_largefile_source=1 ;; + -D_LARGEFILE_SOURCE=*) + ac_cv_sys_largefile_source=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;; + esac + done fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5 +$as_echo "$ac_cv_sys_largefile_source" >&6; } + if test "$ac_cv_sys_largefile_source" != no; then -{ echo "$as_me:$LINENO: checking for ssize_t" >&5 -echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; } -if test "${ac_cv_type_ssize_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -typedef ssize_t ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} +cat >>confdefs.h <<_ACEOF +#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_cv_type_ssize_t=yes + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES" >&5 +$as_echo_n "checking for _LARGE_FILES... " >&6; } +if test "${ac_cv_sys_large_files+set}" = set; then : + $as_echo_n "(cached) " >&6 else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_sys_large_files=no + case "$host_os" in + # AIX 4.2 and later + aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*) + ac_cv_sys_large_files=1 ;; + esac + for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do + case "$ac_flag" in + -D_LARGE_FILES) + ac_cv_sys_large_files=1 ;; + -D_LARGE_FILES=*) + ac_cv_sys_large_files=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;; + esac + done - ac_cv_type_ssize_t=no fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 +$as_echo "$ac_cv_sys_large_files" >&6; } + if test "$ac_cv_sys_large_files" != no; then -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5 -echo "${ECHO_T}$ac_cv_type_ssize_t" >&6; } +cat >>confdefs.h <<_ACEOF +#define _LARGE_FILES $ac_cv_sys_large_files +_ACEOF -# The cast to long int works around a bug in the HP C Compiler + fi + fi + + + if test "x$ac_cv_sys_largefile_CFLAGS" = "xno" ; then + ac_cv_sys_largefile_CFLAGS="" + fi + if test "x$ac_cv_sys_largefile_LDFLAGS" = "xno" ; then + ac_cv_sys_largefile_LDFLAGS="" + fi + if test "x$ac_cv_sys_largefile_LIBS" = "xno" ; then + ac_cv_sys_largefile_LIBS="" + fi + + # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ echo "$as_me:$LINENO: checking size of ssize_t" >&5 -echo $ECHO_N "checking size of ssize_t... $ECHO_C" >&6; } -if test "${ac_cv_sizeof_ssize_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef ssize_t ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef ssize_t ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5 +$as_echo_n "checking size of off_t... " >&6; } +if test "${ac_cv_sizeof_off_t+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t" "$ac_includes_default"; then : - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_hi=$ac_mid; break else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + if test "$ac_cv_type_off_t" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ as_fn_set_status 77 +as_fn_error "cannot compute sizeof (off_t) +See \`config.log' for more details." "$LINENO" 5; }; } + else + ac_cv_sizeof_off_t=0 + fi +fi - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5 +$as_echo "$ac_cv_sizeof_off_t" >&6; } -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef ssize_t ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; -test_array [0] = 0 - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +cat >>confdefs.h <<_ACEOF +#define SIZEOF_OFF_T $ac_cv_sizeof_off_t _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef ssize_t ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; -test_array [0] = 0 - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_lo=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + # Fake default value. - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + if test "x$ac_cv_sizeof_off_t" = "x8" ; then + OGGZ_OFF_MAX="0x7FFFFFFFFFFFFFFFLL" + elif test "x$ac_cv_sizeof_off_t" = "x$pre_largefile_sizeof_off_t" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This machine does not seem to support 64 bit file offsets." >&5 +$as_echo "$as_me: WARNING: This machine does not seem to support 64 bit file offsets." >&2;} + TYPEOF_OGGZ_OFF_T="off_t" + SIZEOF_OGGZ_OFF_T=$ac_cv_sizeof_off_t + elif test "x$TYPEOF_OGGZ_OFF_T" = "xunknown" ; then + echo + echo "*** The configure process has determined that this system is capable" + echo "*** of Large File Support but has not been able to find a type which" + echo "*** is an unambiguous 64 bit file offset." + echo "*** Please contact the author to help resolve this problem." + echo + as_fn_error "Bad file offset type." "$LINENO" 5 + fi + fi + ;; + esac + +if test $SIZEOF_OGGZ_OFF_T = 4 ; then + OGGZ_OFF_MAX="0x7FFFFFFF" + PRI_OGGZ_OFF_T="l" +elif test $SIZEOF_OGGZ_OFF_T = 8 ; then + PRI_OGGZ_OFF_T="ll" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo= ac_hi= -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef ssize_t ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 - ; - return 0; -} + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_OGGZ_OFF_T ${SIZEOF_OGGZ_OFF_T} _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_hi=$ac_mid -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr '(' $ac_mid ')' + 1` -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in -?*) ac_cv_sizeof_ssize_t=$ac_lo;; -'') if test "$ac_cv_type_ssize_t" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (ssize_t) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (ssize_t) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_ssize_t=0 - fi ;; -esac -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ + + +cat >>confdefs.h <<_ACEOF +#define OGGZ_OFF_MAX ${OGGZ_OFF_MAX} _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef ssize_t ac__type_sizeof_; -static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } -static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } -#include -#include -int -main () -{ - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if (((long int) (sizeof (ac__type_sizeof_))) < 0) - { - long int i = longval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%ld\n", i); - } - else - { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%lu\n", i); - } - return ferror (f) || fclose (f) != 0; - ; - return 0; -} + +ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default" +if test "x$ac_cv_type_ssize_t" = x""yes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_SSIZE_T 1 _ACEOF -rm -f 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>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (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_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_ssize_t=`cat conftest.val` -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -( exit $ac_status ) -if test "$ac_cv_type_ssize_t" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (ssize_t) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (ssize_t) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } + +fi + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ssize_t" >&5 +$as_echo_n "checking size of ssize_t... " >&6; } +if test "${ac_cv_sizeof_ssize_t+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (ssize_t))" "ac_cv_sizeof_ssize_t" "$ac_includes_default"; then : + +else + if test "$ac_cv_type_ssize_t" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ as_fn_set_status 77 +as_fn_error "cannot compute sizeof (ssize_t) +See \`config.log' for more details." "$LINENO" 5; }; } else ac_cv_sizeof_ssize_t=0 fi fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -rm -f conftest.val + fi -{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_ssize_t" >&5 -echo "${ECHO_T}$ac_cv_sizeof_ssize_t" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_ssize_t" >&5 +$as_echo "$ac_cv_sizeof_ssize_t" >&6; } @@ -15502,13 +12670,9 @@ # MacOS 10.4 only declares timezone for _XOPEN_SOURCE. Check for this. -{ echo "$as_me:$LINENO: checking for timezone" >&5 -echo $ECHO_N "checking for timezone... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for timezone" >&5 +$as_echo_n "checking for timezone... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -15522,38 +12686,15 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - { echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6; } -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - { echo "$as_me:$LINENO: checking for timezone with _XOPEN_SOURCE" >&5 -echo $ECHO_N "checking for timezone with _XOPEN_SOURCE... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for timezone with _XOPEN_SOURCE" >&5 +$as_echo_n "checking for timezone with _XOPEN_SOURCE... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _XOPEN_SOURCE @@ -15570,43 +12711,20 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - { echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6; } +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } -cat >>confdefs.h <<\_ACEOF -#define _XOPEN_SOURCE 1 -_ACEOF +$as_echo "#define _XOPEN_SOURCE 1" >>confdefs.h else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Checks for typedefs, structures, and compiler characteristics. @@ -15617,7 +12735,7 @@ # Check whether --enable-gcc-werror was given. -if test "${enable_gcc_werror+set}" = set; then +if test "${enable_gcc_werror+set}" = set; then : enableval=$enable_gcc_werror; ac_enable_gcc_werror=yes else ac_enable_gcc_werror=no @@ -15630,7 +12748,7 @@ case "$target_os" in - linux* | solaris*|k*bsd*-gnu*|gnu-*) + linux* | solaris*|k*bsd*-gnu*|gnu*) SHLIB_VERSION_ARG="-Wl,--version-script=Version_script" ;; *) @@ -15642,7 +12760,7 @@ if test $oggz_config_ok = no ; then -{ echo "$as_me:$LINENO: result: +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ************************************************************** *** $PACKAGE $VERSION: Automatic configuration FAILED. @@ -15652,7 +12770,7 @@ *** The following required libraries are missing or *** misconfigured on your system: " >&5 -echo "${ECHO_T} +$as_echo " ************************************************************** *** $PACKAGE $VERSION: Automatic configuration FAILED. @@ -15664,19 +12782,19 @@ " >&6; } if test "x$HAVE_OGG" != xyes ; then - { echo "$as_me:$LINENO: result: *** libogg, available from http://www.xiph.org/ogg/" >&5 -echo "${ECHO_T}*** libogg, available from http://www.xiph.org/ogg/" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** libogg, available from http://www.xiph.org/ogg/" >&5 +$as_echo "*** libogg, available from http://www.xiph.org/ogg/" >&6; } fi if test "x$HAVE_OGG" = xmaybe ; then - { echo "$as_me:$LINENO: result: Development files missing: The libogg library binary seems to be + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Development files missing: The libogg library binary seems to be installed, but building of a test program failed. " >&5 -echo "${ECHO_T} Development files missing: The libogg library binary seems to be +$as_echo " Development files missing: The libogg library binary seems to be installed, but building of a test program failed. " >&6; } fi -{ echo "$as_me:$LINENO: result: *** If you install the required libraries from source, you +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: *** If you install the required libraries from source, you *** need to inform the dynamic linker of their location. If *** you install them in a system-wide directory such as *** /usr/local (the default), you must ensure that @@ -15685,7 +12803,7 @@ *** Alternatively, you can set your LD_LIBRARY_PATH environment *** variable to include the library installation directory. " >&5 -echo "${ECHO_T}*** If you install the required libraries from source, you +$as_echo "*** If you install the required libraries from source, you *** need to inform the dynamic linker of their location. If *** you install them in a system-wide directory such as *** /usr/local (the default), you must ensure that @@ -15696,23 +12814,17 @@ " >&6; } -{ echo "$as_me:$LINENO: result: ************************************************************** +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ************************************************************** " >&5 -echo "${ECHO_T}************************************************************** +$as_echo "************************************************************** " >&6; } -{ { echo "$as_me:$LINENO: error: -*** -*** After fixing the above problems, you must run ./configure again. -*** -" >&5 -echo "$as_me: error: +as_fn_error " *** *** After fixing the above problems, you must run ./configure again. *** -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 else @@ -15863,12 +12975,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -15876,8 +12989,8 @@ (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" @@ -15900,12 +13013,12 @@ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && - { echo "$as_me:$LINENO: updating cache $cache_file" >&5 -echo "$as_me: updating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -15921,73 +13034,63 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`echo "$ac_i" | sed "$ac_script"` + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs + if test -n "$EXEEXT"; then + am__EXEEXT_TRUE= + am__EXEEXT_FALSE='#' +else + am__EXEEXT_TRUE='#' + am__EXEEXT_FALSE= +fi + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi + if test -z "${HAVE_DOXYGEN_TRUE}" && test -z "${HAVE_DOXYGEN_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_DOXYGEN\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_DOXYGEN\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"HAVE_DOXYGEN\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_MAN2HTML_TRUE}" && test -z "${HAVE_MAN2HTML_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_MAN2HTML\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_MAN2HTML\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"HAVE_MAN2HTML\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${OGGZ_CONFIG_READ_TRUE}" && test -z "${OGGZ_CONFIG_READ_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"OGGZ_CONFIG_READ\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"OGGZ_CONFIG_READ\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"OGGZ_CONFIG_READ\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${OGGZ_CONFIG_WRITE_TRUE}" && test -z "${OGGZ_CONFIG_WRITE_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"OGGZ_CONFIG_WRITE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"OGGZ_CONFIG_WRITE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"OGGZ_CONFIG_WRITE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_OGG_TRUE}" && test -z "${HAVE_OGG_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_OGG\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_OGG\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"HAVE_OGG\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi : ${CONFIG_STATUS=./config.status} +ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -15997,59 +13100,79 @@ debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi @@ -16058,20 +13181,18 @@ # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) -as_nl=' -' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -16082,32 +13203,111 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with status $?, using 1 if that was 0. +as_fn_error () +{ + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + fi + $as_echo "$as_me: error: $1" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + -# Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -16121,13 +13321,17 @@ as_basename=false fi +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -# Name of the executable. as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -16142,104 +13346,103 @@ } s/.*/./; q'` -# CDPATH. -$as_unset CDPATH - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir + mkdir conf$$.dir 2>/dev/null fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + + +} # as_fn_mkdir_p if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -16256,12 +13459,12 @@ as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else - case $1 in - -*)set "./$1";; + case $1 in #( + -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -16276,13 +13479,19 @@ exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -# Save the log message, to keep $[0] and so on meaningful, and to +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.61. Invocation command line was +generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -16295,7 +13504,16 @@ _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac + +case $ac_config_headers in *" +"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +esac + + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. config_files="$ac_config_files" config_headers="$ac_config_headers" @@ -16303,22 +13521,25 @@ _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. -Usage: $0 [OPTIONS] [FILE]... +Usage: $0 [OPTION]... [TAG]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit - -q, --quiet do not print progress messages + --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE Configuration files: $config_files @@ -16329,16 +13550,17 @@ Configuration commands: $config_commands -Report bugs to ." +Report bugs to the package provider." _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.61, - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.65, + with options \\"\$ac_cs_config\\" -Copyright (C) 2006 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -16346,11 +13568,12 @@ srcdir='$srcdir' INSTALL='$INSTALL' MKDIR_P='$MKDIR_P' +AWK='$AWK' +test -n "\$AWK" || AWK=awk _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. ac_need_defaults=: while test $# != 0 do @@ -16372,34 +13595,40 @@ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - echo "$ac_cs_version"; exit ;; + $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; --header | --heade | --head | --hea ) $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - { echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; + as_fn_error "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; --help | --hel | -h ) - echo "$ac_cs_usage"; exit ;; + $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) { echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; + -*) as_fn_error "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; - *) ac_config_targets="$ac_config_targets $1" + *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; esac @@ -16414,27 +13643,29 @@ fi _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - CONFIG_SHELL=$SHELL + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' export CONFIG_SHELL - exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + exec "\$@" fi _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 exec 5>>config.log { echo sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - echo "$ac_log" + $as_echo "$ac_log" } >&5 _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # # INIT-COMMANDS # @@ -16476,6 +13707,7 @@ lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' +OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`' deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' @@ -16581,6 +13813,7 @@ lt_SP2NL \ lt_NL2SP \ reload_flag \ +OBJDUMP \ deplibs_check_method \ file_magic_cmd \ AR \ @@ -16695,7 +13928,7 @@ _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # Handling of arguments. for ac_config_target in $ac_config_targets @@ -16722,9 +13955,7 @@ "oggz.pc") CONFIG_FILES="$CONFIG_FILES oggz.pc" ;; "oggz-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES oggz-uninstalled.pc" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; + *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -16751,7 +13982,7 @@ trap 'exit_status=$? { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 + trap 'as_fn_exit 1' 1 2 13 15 } # Create a (secure) tmp directory for tmp files. @@ -16762,246 +13993,139 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || -{ - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} - -# -# Set up the sed scripts for CONFIG_FILES section. -# +} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. if test -n "$CONFIG_FILES"; then -_ACEOF - - - -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -SHELL!$SHELL$ac_delim -PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim -PACKAGE_NAME!$PACKAGE_NAME$ac_delim -PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim -PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim -PACKAGE_STRING!$PACKAGE_STRING$ac_delim -PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim -exec_prefix!$exec_prefix$ac_delim -prefix!$prefix$ac_delim -program_transform_name!$program_transform_name$ac_delim -bindir!$bindir$ac_delim -sbindir!$sbindir$ac_delim -libexecdir!$libexecdir$ac_delim -datarootdir!$datarootdir$ac_delim -datadir!$datadir$ac_delim -sysconfdir!$sysconfdir$ac_delim -sharedstatedir!$sharedstatedir$ac_delim -localstatedir!$localstatedir$ac_delim -includedir!$includedir$ac_delim -oldincludedir!$oldincludedir$ac_delim -docdir!$docdir$ac_delim -infodir!$infodir$ac_delim -htmldir!$htmldir$ac_delim -dvidir!$dvidir$ac_delim -pdfdir!$pdfdir$ac_delim -psdir!$psdir$ac_delim -libdir!$libdir$ac_delim -localedir!$localedir$ac_delim -mandir!$mandir$ac_delim -DEFS!$DEFS$ac_delim -ECHO_C!$ECHO_C$ac_delim -ECHO_N!$ECHO_N$ac_delim -ECHO_T!$ECHO_T$ac_delim -LIBS!$LIBS$ac_delim -build_alias!$build_alias$ac_delim -host_alias!$host_alias$ac_delim -target_alias!$target_alias$ac_delim -build!$build$ac_delim -build_cpu!$build_cpu$ac_delim -build_vendor!$build_vendor$ac_delim -build_os!$build_os$ac_delim -host!$host$ac_delim -host_cpu!$host_cpu$ac_delim -host_vendor!$host_vendor$ac_delim -host_os!$host_os$ac_delim -target!$target$ac_delim -target_cpu!$target_cpu$ac_delim -target_vendor!$target_vendor$ac_delim -target_os!$target_os$ac_delim -INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim -INSTALL_DATA!$INSTALL_DATA$ac_delim -am__isrc!$am__isrc$ac_delim -CYGPATH_W!$CYGPATH_W$ac_delim -PACKAGE!$PACKAGE$ac_delim -VERSION!$VERSION$ac_delim -ACLOCAL!$ACLOCAL$ac_delim -AUTOCONF!$AUTOCONF$ac_delim -AUTOMAKE!$AUTOMAKE$ac_delim -AUTOHEADER!$AUTOHEADER$ac_delim -MAKEINFO!$MAKEINFO$ac_delim -install_sh!$install_sh$ac_delim -STRIP!$STRIP$ac_delim -INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim -mkdir_p!$mkdir_p$ac_delim -AWK!$AWK$ac_delim -SET_MAKE!$SET_MAKE$ac_delim -am__leading_dot!$am__leading_dot$ac_delim -AMTAR!$AMTAR$ac_delim -am__tar!$am__tar$ac_delim -am__untar!$am__untar$ac_delim -CC!$CC$ac_delim -CFLAGS!$CFLAGS$ac_delim -LDFLAGS!$LDFLAGS$ac_delim -CPPFLAGS!$CPPFLAGS$ac_delim -ac_ct_CC!$ac_ct_CC$ac_delim -EXEEXT!$EXEEXT$ac_delim -OBJEXT!$OBJEXT$ac_delim -DEPDIR!$DEPDIR$ac_delim -am__include!$am__include$ac_delim -am__quote!$am__quote$ac_delim -AMDEP_TRUE!$AMDEP_TRUE$ac_delim -AMDEP_FALSE!$AMDEP_FALSE$ac_delim -AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim -CCDEPMODE!$CCDEPMODE$ac_delim -am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim -am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim -CPP!$CPP$ac_delim -LN_S!$LN_S$ac_delim -LIBTOOL!$LIBTOOL$ac_delim -SED!$SED$ac_delim -GREP!$GREP$ac_delim -EGREP!$EGREP$ac_delim -FGREP!$FGREP$ac_delim -LD!$LD$ac_delim -DUMPBIN!$DUMPBIN$ac_delim -ac_ct_DUMPBIN!$ac_ct_DUMPBIN$ac_delim -_ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\r' +else + ac_cs_awk_cr=$ac_cr fi -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -CEOF$ac_eof +echo 'BEGIN {' >"$tmp/subs1.awk" && _ACEOF +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -NM!$NM$ac_delim -AR!$AR$ac_delim -RANLIB!$RANLIB$ac_delim -lt_ECHO!$lt_ECHO$ac_delim -DSYMUTIL!$DSYMUTIL$ac_delim -NMEDIT!$NMEDIT$ac_delim -LIPO!$LIPO$ac_delim -OTOOL!$OTOOL$ac_delim -OTOOL64!$OTOOL64$ac_delim -ACLOCAL_AMFLAGS!$ACLOCAL_AMFLAGS$ac_delim -HAVE_PKG_CONFIG!$HAVE_PKG_CONFIG$ac_delim -HAVE_DOXYGEN!$HAVE_DOXYGEN$ac_delim -HAVE_DOXYGEN_TRUE!$HAVE_DOXYGEN_TRUE$ac_delim -HAVE_DOXYGEN_FALSE!$HAVE_DOXYGEN_FALSE$ac_delim -HAVE_MAN2HTML!$HAVE_MAN2HTML$ac_delim -HAVE_MAN2HTML_TRUE!$HAVE_MAN2HTML_TRUE$ac_delim -HAVE_MAN2HTML_FALSE!$HAVE_MAN2HTML_FALSE$ac_delim -HAVE_VALGRIND!$HAVE_VALGRIND$ac_delim -VALGRIND_ENVIRONMENT!$VALGRIND_ENVIRONMENT$ac_delim -GETOPT_LIBS!$GETOPT_LIBS$ac_delim -OGGZ_CONFIG_READ_TRUE!$OGGZ_CONFIG_READ_TRUE$ac_delim -OGGZ_CONFIG_READ_FALSE!$OGGZ_CONFIG_READ_FALSE$ac_delim -OGGZ_CONFIG_WRITE_TRUE!$OGGZ_CONFIG_WRITE_TRUE$ac_delim -OGGZ_CONFIG_WRITE_FALSE!$OGGZ_CONFIG_WRITE_FALSE$ac_delim -PKG_CONFIG!$PKG_CONFIG$ac_delim -OGG_CFLAGS!$OGG_CFLAGS$ac_delim -OGG_LIBS!$OGG_LIBS$ac_delim -HAVE_OGG_TRUE!$HAVE_OGG_TRUE$ac_delim -HAVE_OGG_FALSE!$HAVE_OGG_FALSE$ac_delim -GETCONF!$GETCONF$ac_delim -TYPEOF_OGGZ_OFF_T!$TYPEOF_OGGZ_OFF_T$ac_delim -PRI_OGGZ_OFF_T!$PRI_OGGZ_OFF_T$ac_delim -SIZEOF_OGGZ_OFF_T!$SIZEOF_OGGZ_OFF_T$ac_delim -OGGZ_OFF_MAX!$OGGZ_OFF_MAX$ac_delim -LIBDIR!$LIBDIR$ac_delim -INCLUDEDIR!$INCLUDEDIR$ac_delim -BINDIR!$BINDIR$ac_delim -DOCDIR!$DOCDIR$ac_delim -SHLIB_VERSION_ARG!$SHLIB_VERSION_ARG$ac_delim -SHARED_VERSION_INFO!$SHARED_VERSION_INFO$ac_delim -LIBOBJS!$LIBOBJS$ac_delim -LTLIBOBJS!$LTLIBOBJS$ac_delim -_ACEOF + . ./conf$$subs.sh || + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 42; then + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi done +rm -f conf$$subs.sh -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi - -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -:end -s/|#_!!_#|//g -CEOF$ac_eof +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && _ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\)..*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\)..*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } + + print line +} +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ + || as_fn_error "could not setup config files machinery" "$LINENO" 5 +_ACEOF # VPATH may cause trouble with some makes, so we remove $(srcdir), # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and @@ -17018,20 +14142,128 @@ }' fi -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 fi # test -n "$CONFIG_FILES" +# Set up the scripts for CONFIG_HEADERS section. +# No need to generate them if there are no CONFIG_HEADERS. +# This happens for instance with `./config.status Makefile'. +if test -n "$CONFIG_HEADERS"; then +cat >"$tmp/defines.awk" <<\_ACAWK || +BEGIN { +_ACEOF + +# Transform confdefs.h into an awk script `defines.awk', embedded as +# here-document in config.status, that substitutes the proper values into +# config.h.in to produce config.h. + +# Create a delimiter string that does not exist in confdefs.h, to ease +# handling of long lines. +ac_delim='%!_!# ' +for ac_last_try in false false :; do + ac_t=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_t"; then + break + elif $ac_last_try; then + as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +# For the awk script, D is an array of macro values keyed by name, +# likewise P contains macro parameters if any. Preserve backslash +# newline sequences. + +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +sed -n ' +s/.\{148\}/&'"$ac_delim"'/g +t rset +:rset +s/^[ ]*#[ ]*define[ ][ ]*/ / +t def +d +:def +s/\\$// +t bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3"/p +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +d +:bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3\\\\\\n"\\/p +t cont +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +t cont +d +:cont +n +s/.\{148\}/&'"$ac_delim"'/g +t clear +:clear +s/\\$// +t bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/"/p +d +:bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +b cont +' >$CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + for (key in D) D_is_set[key] = 1 + FS = "" +} +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { + line = \$ 0 + split(line, arg, " ") + if (arg[1] == "#") { + defundef = arg[2] + mac1 = arg[3] + } else { + defundef = substr(arg[1], 2) + mac1 = arg[2] + } + split(mac1, mac2, "(") #) + macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) + if (D_is_set[macro]) { + # Preserve the white space surrounding the "#". + print prefix "define", macro P[macro] D[macro] + next + } else { + # Replace #undef with comments. This is necessary, for example, + # in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. + if (defundef == "undef") { + print "/*", prefix defundef, macro, "*/" + next + } + } +} +{ print } +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + as_fn_error "could not setup config headers machinery" "$LINENO" 5 +fi # test -n "$CONFIG_HEADERS" + -for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" +shift +for ac_tag do case $ac_tag in :[FHLC]) ac_mode=$ac_tag; continue;; esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -echo "$as_me: error: Invalid tag $ac_tag." >&2;} - { (exit 1); exit 1; }; };; + :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -17059,26 +14291,34 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - ac_file_inputs="$ac_file_inputs $ac_f" + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" done # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ - configure_input="Generated from "`IFS=: - echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + configure_input='Generated from '` + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin";; + *:-:* | *:-) cat >"$tmp/stdin" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -17088,7 +14328,7 @@ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -echo X"$ac_file" | +$as_echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -17106,55 +14346,15 @@ q } s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir="$ac_dir"; as_fn_mkdir_p ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -17199,12 +14399,12 @@ esac _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= - -case `sed -n '/datarootdir/ { +ac_sed_dataroot=' +/datarootdir/ { p q } @@ -17212,36 +14412,37 @@ /@docdir@/p /@infodir@/p /@localedir@/p -/@mandir@/p -' $ac_file_inputs` in +/@mandir@/p' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' s&@datadir@&$datadir&g s&@docdir@&$docdir&g s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; + s&\\\${datarootdir}&$datarootdir&g' ;; esac _ACEOF # Neutralize VPATH when `$srcdir' = `.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub $extrasub _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s&@configure_input@&$configure_input&;t t +s|@configure_input@|$ac_sed_conf_input|;t t s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t s&@srcdir@&$ac_srcdir&;t t s&@abs_srcdir@&$ac_abs_srcdir&;t t s&@top_srcdir@&$ac_top_srcdir&;t t @@ -17252,121 +14453,50 @@ s&@INSTALL@&$ac_INSTALL&;t t s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&5 -echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&2;} rm -f "$tmp/stdin" case $ac_file in - -) cat "$tmp/out"; rm -f "$tmp/out";; - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; - esac + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + esac \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; :H) # # CONFIG_HEADER # -_ACEOF - -# Transform confdefs.h into a sed script `conftest.defines', that -# substitutes the proper values into config.h.in to produce config.h. -rm -f conftest.defines conftest.tail -# First, append a space to every undef/define line, to ease matching. -echo 's/$/ /' >conftest.defines -# Then, protect against being on the right side of a sed subst, or in -# an unquoted here document, in config.status. If some macros were -# called several times there might be several #defines for the same -# symbol, which is useless. But do not sort them, since the last -# AC_DEFINE must be honored. -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where -# NAME is the cpp macro being defined, VALUE is the value it is being given. -# PARAMS is the parameter list in the macro definition--in most cases, it's -# just an empty string. -ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' -ac_dB='\\)[ (].*,\\1define\\2' -ac_dC=' ' -ac_dD=' ,' - -uniq confdefs.h | - sed -n ' - t rset - :rset - s/^[ ]*#[ ]*define[ ][ ]*// - t ok - d - :ok - s/[\\&,]/\\&/g - s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p - s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p - ' >>conftest.defines - -# Remove the space that was appended to ease matching. -# Then replace #undef with comments. This is necessary, for -# example, in the case of _POSIX_SOURCE, which is predefined and required -# on some systems where configure will not decide to define it. -# (The regexp can be short, since the line contains either #define or #undef.) -echo 's/ $// -s,^[ #]*u.*,/* & */,' >>conftest.defines - -# Break up conftest.defines: -ac_max_sed_lines=50 - -# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" -# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" -# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" -# et cetera. -ac_in='$ac_file_inputs' -ac_out='"$tmp/out1"' -ac_nxt='"$tmp/out2"' - -while : -do - # Write a here document: - cat >>$CONFIG_STATUS <<_ACEOF - # First, check the format of the line: - cat >"\$tmp/defines.sed" <<\\CEOF -/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def -/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def -b -:def -_ACEOF - sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS - echo 'CEOF - sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS - ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in - sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail - grep . conftest.tail >/dev/null || break - rm -f conftest.defines - mv conftest.tail conftest.defines -done -rm -f conftest.defines conftest.tail - -echo "ac_result=$ac_in" >>$CONFIG_STATUS -cat >>$CONFIG_STATUS <<\_ACEOF if test x"$ac_file" != x-; then - echo "/* $configure_input */" >"$tmp/config.h" - cat "$ac_result" >>"$tmp/config.h" - if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -echo "$as_me: $ac_file is unchanged" >&6;} + { + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" + } >"$tmp/config.h" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} else - rm -f $ac_file - mv "$tmp/config.h" $ac_file + rm -f "$ac_file" + mv "$tmp/config.h" "$ac_file" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 fi else - echo "/* $configure_input */" - cat "$ac_result" + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error "could not create -" "$LINENO" 5 fi - rm -f "$tmp/out12" -# Compute $ac_file's index in $config_headers. -_am_arg=$ac_file +# Compute "$ac_file"'s index in $config_headers. +_am_arg="$ac_file" _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in @@ -17381,7 +14511,7 @@ X"$_am_arg" : 'X\(//\)[^/]' \| \ X"$_am_arg" : 'X\(//\)$' \| \ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -echo X"$_am_arg" | +$as_echo X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -17401,30 +14531,40 @@ s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 -echo "$as_me: executing $ac_file commands" >&6;} + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +$as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac case $ac_file$ac_mode in - "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || + "depfiles":C) test x"$AMDEP_TRUE" != x"" || { + # Autoconf 2.62 quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ X"$mf" : 'X\(/\)' \| . 2>/dev/null || -echo X"$mf" | +$as_echo X"$mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -17442,68 +14582,33 @@ q } s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`$as_dirname -- "$file" || $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ X"$file" : 'X\(/\)' \| . 2>/dev/null || -echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - { as_dir=$dirpart/$fdir - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -echo X"$as_dir" | +$as_echo X"$file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -17521,16 +14626,12 @@ q } s/.*/./; q'` - test -d "$as_dir" && break + as_dir=$dirpart/$fdir; as_fn_mkdir_p + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" done -done +} ;; "libtool":C) @@ -17654,6 +14755,9 @@ reload_flag=$lt_reload_flag reload_cmds=$lt_reload_cmds +# An object symbol dumper. +OBJDUMP=$lt_OBJDUMP + # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -18169,11 +15273,13 @@ done # for ac_tag -{ (exit 0); exit 0; } +as_fn_exit 0 _ACEOF -chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save +test $ac_write_fail = 0 || + as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. @@ -18193,11 +15299,15 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } + $ac_cs_success || as_fn_exit $? +fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi -{ echo "$as_me:$LINENO: result: +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ------------------------------------------------------------------------ $PACKAGE $VERSION: Automatic configuration OK. @@ -18232,7 +15342,7 @@ Example programs will be built but not installed. ------------------------------------------------------------------------ " >&5 -echo "${ECHO_T} +$as_echo " ------------------------------------------------------------------------ $PACKAGE $VERSION: Automatic configuration OK. diff -Nru liboggz-1.1.0/configure.ac liboggz-1.1.1/configure.ac --- liboggz-1.1.0/configure.ac 2009-10-08 09:17:52.000000000 +0000 +++ liboggz-1.1.1/configure.ac 2010-04-29 01:37:34.000000000 +0000 @@ -6,7 +6,7 @@ AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE(liboggz, 1.1.0) +AM_INIT_AUTOMAKE(liboggz, 1.1.1) AM_CONFIG_HEADER(config.h) ################################################################################ @@ -110,7 +110,7 @@ AC_CHECK_PROG(HAVE_VALGRIND, valgrind, yes, no) if test "x$HAVE_VALGRIND" = xyes ; then - VALGRIND_ENVIRONMENT="$VALGRIND_ENVIRONMENT valgrind -q --leak-check=yes --show-reachable=yes --num-callers=100" + VALGRIND_ENVIRONMENT="$VALGRIND_ENVIRONMENT valgrind -q --leak-check=yes --show-reachable=yes --num-callers=50" AC_SUBST(VALGRIND_ENVIRONMENT) TESTS_INFO="Test suite will be run under: ${VALGRIND_ENVIRONMENT}" @@ -401,7 +401,7 @@ dnl case "$target_os" in - linux* | solaris*|k*bsd*-gnu*|gnu-*) + linux* | solaris*|k*bsd*-gnu*|gnu*) SHLIB_VERSION_ARG="-Wl,--version-script=Version_script" ;; *) diff -Nru liboggz-1.1.0/debian/changelog liboggz-1.1.1/debian/changelog --- liboggz-1.1.0/debian/changelog 2012-03-11 02:12:40.000000000 +0000 +++ liboggz-1.1.1/debian/changelog 2012-03-11 02:08:19.000000000 +0000 @@ -1,3 +1,19 @@ +liboggz (1.1.1-1~lucid1) lucid; urgency=medium + + * Backport from maverick. + + -- DNS777 Sun, 11 Mar 2012 00:00:00 +0000 + +liboggz (1.1.1-1) unstable; urgency=low + + * New upstream release. + - Remove patches/build_on_gnu. + - m4 directory now included (Closes: #574765). + * Removed quilt. + * Added source format. + + -- John Francesco Ferlito Thu, 29 Apr 2010 22:05:29 +1000 + liboggz (1.1.0-2) unstable; urgency=low * Move to dh7 rules. diff -Nru liboggz-1.1.0/debian/control liboggz-1.1.1/debian/control --- liboggz-1.1.0/debian/control 2012-03-11 02:12:40.000000000 +0000 +++ liboggz-1.1.1/debian/control 2010-04-29 12:26:36.000000000 +0000 @@ -3,8 +3,8 @@ Priority: optional Maintainer: Debian Xiph.org Maintainers Uploaders: John Francesco Ferlito -Build-Depends: debhelper (>= 7.0.50~), libogg-dev, doxygen, docbook-to-man, binutils (>= 2.12.90.0.9), libtool, quilt, bash-completion (>= 1.1) -Standards-Version: 3.8.3 +Build-Depends: debhelper (>= 7.0.50~), libogg-dev, doxygen, docbook-to-man, binutils (>= 2.12.90.0.9), libtool, bash-completion (>= 1.1) +Standards-Version: 3.8.4 Vcs-Bzr: http://bzr.debian.org/pkg-xiph/liboggz/ Package: liboggz2 diff -Nru liboggz-1.1.0/debian/patches/build_on_gnu liboggz-1.1.1/debian/patches/build_on_gnu --- liboggz-1.1.0/debian/patches/build_on_gnu 2012-03-11 02:12:40.000000000 +0000 +++ liboggz-1.1.1/debian/patches/build_on_gnu 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -# FTBFS on hurd-i386: wrong platform detection for version -# Upstream liboggz commit 5cc71fdb5b3b887222218e26d30792701018a5cf ---- liboggz-1.1.0.orig/configure -+++ liboggz-1.1.0/configure -@@ -15630,7 +15630,7 @@ - - - case "$target_os" in -- linux* | solaris*|k*bsd*-gnu*|gnu-*) -+ linux* | solaris*|k*bsd*-gnu*|gnu*) - SHLIB_VERSION_ARG="-Wl,--version-script=Version_script" - ;; - *) ---- liboggz-1.1.0.orig/configure.ac -+++ liboggz-1.1.0/configure.ac -@@ -401,7 +401,7 @@ - dnl - - case "$target_os" in -- linux* | solaris*|k*bsd*-gnu*|gnu-*) -+ linux* | solaris*|k*bsd*-gnu*|gnu*) - SHLIB_VERSION_ARG="-Wl,--version-script=Version_script" - ;; - *) diff -Nru liboggz-1.1.0/debian/patches/series liboggz-1.1.1/debian/patches/series --- liboggz-1.1.0/debian/patches/series 2012-03-11 02:12:40.000000000 +0000 +++ liboggz-1.1.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -build_on_gnu diff -Nru liboggz-1.1.0/debian/rules liboggz-1.1.1/debian/rules --- liboggz-1.1.0/debian/rules 2012-03-11 02:12:40.000000000 +0000 +++ liboggz-1.1.1/debian/rules 2010-04-29 12:26:36.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/make -f %: - dh --with quilt,bash-completion $@ + dh --with bash-completion $@ override_dh_strip: dh_strip --dbg-package=liboggz2-dbg diff -Nru liboggz-1.1.0/debian/source/format liboggz-1.1.1/debian/source/format --- liboggz-1.1.0/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ liboggz-1.1.1/debian/source/format 2012-03-11 02:12:41.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru liboggz-1.1.0/depcomp liboggz-1.1.1/depcomp --- liboggz-1.1.0/depcomp 2008-04-07 08:59:37.000000000 +0000 +++ liboggz-1.1.1/depcomp 2010-01-18 06:28:57.000000000 +0000 @@ -1,9 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2004-04-25.13 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free +# Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,9 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -43,17 +42,18 @@ depmode Dependency tracking mode. source Source file read by `PROGRAMS ARGS'. object Object file output by `PROGRAMS ARGS'. + DEPDIR directory where to store dependencies. depfile Dependency file to output. tmpdepfile Temporary file to use when outputing dependencies. libtool Whether libtool is used (yes/no). Report bugs to . EOF - exit 0 + exit $? ;; -v | --v*) echo "depcomp $scriptversion" - exit 0 + exit $? ;; esac @@ -61,18 +61,10 @@ echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 fi -# `libtool' can also be set to `yes' or `no'. - -if test -z "$depfile"; then - base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'` - dir=`echo "$object" | sed 's,/.*$,/,'` - if test "$dir" = "$object"; then - dir= - fi - # FIXME: should be _deps on DOS. - depfile="$dir.deps/$base" -fi +# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. +depfile=${depfile-`echo "$object" | + sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" @@ -93,12 +85,34 @@ depmode=dashmstdout fi +cygpath_u="cygpath -u -f -" +if test "$depmode" = msvcmsys; then + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u="sed s,\\\\\\\\,/,g" + depmode=msvisualcpp +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what ## we want. Yay! Note: for some reason libtool 1.4 doesn't like ## it if -MD -MP comes after the -MF stuff. Hmm. - "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" +## Unfortunately, FreeBSD c89 acceptance of flags depends upon +## the command line argument order; so add the flags where they +## appear in depend2.am. Note that the slowdown incurred here +## affects only configure: in makefiles, %FASTDEP% shortcuts this. + for arg + do + case $arg in + -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; + *) set fnord "$@" "$arg" ;; + esac + shift # fnord + shift # $arg + done + "$@" stat=$? if test $stat -eq 0; then : else @@ -185,14 +199,14 @@ ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ tr ' -' ' ' >> $depfile - echo >> $depfile +' ' ' >> "$depfile" + echo >> "$depfile" # The second pass generates a dummy entry for each header file. tr ' ' ' ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> $depfile + >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -208,34 +222,39 @@ # current directory. Also, the AIX compiler puts `$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` - tmpdepfile="$stripped.u" + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then + tmpdepfile1=$dir$base.u + tmpdepfile2=$base.u + tmpdepfile3=$dir.libs/$base.u "$@" -Wc,-M else + tmpdepfile1=$dir$base.u + tmpdepfile2=$dir$base.u + tmpdepfile3=$dir$base.u "$@" -M fi stat=$? - if test -f "$tmpdepfile"; then : - else - stripped=`echo "$stripped" | sed 's,^.*/,,'` - tmpdepfile="$stripped.u" - fi - if test $stat -eq 0; then : else - rm -f "$tmpdepfile" + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done if test -f "$tmpdepfile"; then - outname="$stripped.o" # Each line is of the form `foo.o: dependent.h'. # Do two passes, one to just change these to # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" - sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a tab and a space in the []. + sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -283,6 +302,51 @@ rm -f "$tmpdepfile" ;; +hp2) + # The "hp" stanza above does not work with aCC (C++) and HP's ia64 + # compilers, which have integrated preprocessors. The correct option + # to use with these is +Maked; it writes dependencies to a file named + # 'foo.d', which lands next to the object file, wherever that + # happens to be. + # Much of this is similar to the tru64 case; see comments there. + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + if test "$libtool" = yes; then + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir.libs/$base.d + "$@" -Wc,+Maked + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + "$@" +Maked + fi + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile1" "$tmpdepfile2" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" + do + test -f "$tmpdepfile" && break + done + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + # Add `dependent.h:' lines. + sed -ne '2,${ + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" + else + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" "$tmpdepfile2" + ;; + tru64) # The Tru64 compiler uses -MD to generate dependencies as a side # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. @@ -294,33 +358,43 @@ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then - # Dependencies are output in .lo.d with libtool 1.4. - # They are output in .o.d with libtool 1.5. - tmpdepfile1="$dir.libs/$base.lo.d" - tmpdepfile2="$dir.libs/$base.o.d" - tmpdepfile3="$dir.libs/$base.d" + # With Tru64 cc, shared objects can also be used to make a + # static library. This mechanism is used in libtool 1.4 series to + # handle both shared and static libraries in a single compilation. + # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. + # + # With libtool 1.5 this exception was removed, and libtool now + # generates 2 separate objects for the 2 libraries. These two + # compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 + tmpdepfile2=$dir$base.o.d # libtool 1.5 + tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 + tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 "$@" -Wc,-MD else - tmpdepfile1="$dir$base.o.d" - tmpdepfile2="$dir$base.d" - tmpdepfile3="$dir$base.d" + tmpdepfile1=$dir$base.o.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + tmpdepfile4=$dir$base.d "$@" -MD fi stat=$? if test $stat -eq 0; then : else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" exit $stat fi - if test -f "$tmpdepfile1"; then - tmpdepfile="$tmpdepfile1" - elif test -f "$tmpdepfile2"; then - tmpdepfile="$tmpdepfile2" - else - tmpdepfile="$tmpdepfile3" - fi + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + do + test -f "$tmpdepfile" && break + done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" # That's a tab and a space in the []. @@ -342,7 +416,7 @@ # Remove the call to Libtool. if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift @@ -393,32 +467,39 @@ "$@" || exit $? # Remove any Libtool call if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift fi # X makedepend shift - cleared=no - for arg in "$@"; do + cleared=no eat=no + for arg + do case $cleared in no) set ""; shift cleared=yes ;; esac + if test $eat = yes; then + eat=no + continue + fi case "$arg" in -D*|-I*) set fnord "$@" "$arg"; shift ;; # Strip any option that makedepend may not understand. Remove # the object too, otherwise makedepend will parse it as a source file. + -arch) + eat=yes ;; -*|$object) ;; *) set fnord "$@" "$arg"; shift ;; esac done - obj_suffix="`echo $object | sed 's/^.*\././'`" + obj_suffix=`echo "$object" | sed 's/^.*\././'` touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" @@ -438,7 +519,7 @@ # Remove the call to Libtool. if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift @@ -464,7 +545,8 @@ done "$@" -E | - sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" @@ -475,13 +557,27 @@ msvisualcpp) # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. + # always write the preprocessed file to stdout. "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + IFS=" " for arg do case "$arg" in + -o) + shift + ;; + $object) + shift + ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") set fnord "$@" shift @@ -494,16 +590,23 @@ ;; esac done - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" + "$@" -E 2>/dev/null | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" echo " " >> "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; +msvcmsys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + none) exec "$@" ;; @@ -522,5 +625,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -Nru liboggz-1.1.0/doc/liboggz/html/annotated.html liboggz-1.1.1/doc/liboggz/html/annotated.html --- liboggz-1.1.0/doc/liboggz/html/annotated.html 2009-10-08 09:21:26.000000000 +0000 +++ liboggz-1.1.1/doc/liboggz/html/annotated.html 2010-04-24 00:13:55.000000000 +0000 @@ -1,10 +1,13 @@ - - + + + + liboggz: Data Structures - - - - + + + + + +
- + - + @@ -235,33 +230,33 @@
-

-Retrieve the preroll of a logical bitstream. -

-

Parameters:
+

Retrieve the preroll of a logical bitstream.

+
Parameters:
int oggz_get_preroll int oggz_get_preroll (OGGZ * OGGZ *  oggz,
oggz An OGGZ handle
serialno Identify the logical bitstream in oggz
+ -
Returns:
The preroll of the specified logical bitstream.
-
Return values:
+
Returns:
The preroll of the specified logical bitstream.
+
Return values:
OGGZ_ERR_BAD_SERIALNO serialno does not identify an existing logical bitstream in oggz.
OGGZ_ERR_BAD_OGGZ oggz does not refer to an existing OGGZ
+
-

- + +

- + - + @@ -279,29 +274,29 @@
-

-Tell Oggz to remember the given offset as the start of data. -

-This informs the seeking mechanism that when seeking back to unit 0, go to the given offset, not to the start of the file, which is usually codec headers. The usual usage is: 

+
Tell Oggz to remember the given offset as the start of data. 

+
This informs the seeking mechanism that when seeking back to unit 0, go to the given offset, not to the start of the file, which is usually codec headers. The usual usage is: 

+
     oggz_set_data_start (oggz, oggz_tell (oggz));
-
 
Parameters:

+
Parameters:
int oggz_set_data_start int oggz_set_data_start (OGGZ * OGGZ *  oggz,
oggz An OGGZ handle previously opened for reading
offset The offset of the start of data
+ -
Returns:
0 on success, -1 on failure.
+
Returns:
0 on success, -1 on failure.
-

- + +

- + - + @@ -331,35 +326,35 @@
-

-Specify the granulerate of a logical bitstream. -

-

Parameters:
+

Specify the granulerate of a logical bitstream.

+
Parameters:
int oggz_set_granulerate int oggz_set_granulerate (OGGZ * OGGZ *  oggz,
oggz An OGGZ handle
serialno Identify the logical bitstream in oggz to attach this linear metric to. A value of -1 indicates that the metric should be attached to all unattached logical bitstreams in oggz.
granule_rate_numerator The numerator of the granule rate
granule_rate_denominator The denominator of the granule rate
+ -
Returns:
0 Success
-
Return values:
+
Returns:
0 Success
+
Return values:
OGGZ_ERR_BAD_SERIALNO serialno does not identify an existing logical bitstream in oggz.
OGGZ_ERR_BAD_OGGZ oggz does not refer to an existing OGGZ
+
-

- + +

- + - + @@ -383,34 +378,34 @@
-

-Specify the granuleshift of a logical bitstream. -

-

Parameters:
+

Specify the granuleshift of a logical bitstream.

+
Parameters:
int oggz_set_granuleshift int oggz_set_granuleshift (OGGZ * OGGZ *  oggz,
oggz An OGGZ handle
serialno Identify the logical bitstream in oggz to attach this granuleshift metric to. A value of -1 indicates that the metric should be attached to all unattached logical bitstreams in oggz.
granuleshift The granuleshift
+ -
Returns:
0 Success
-
Return values:
+
Returns:
0 Success
+
Return values:
OGGZ_ERR_BAD_SERIALNO serialno does not identify an existing logical bitstream in oggz.
OGGZ_ERR_BAD_OGGZ oggz does not refer to an existing OGGZ
+
-

- + +

- + - + @@ -422,7 +417,7 @@ - + @@ -440,37 +435,38 @@
-

-Set the OggzMetric to use for an OGGZ handle. -

-

Parameters:
+

Set the OggzMetric to use for an OGGZ handle.

+
Parameters:
int oggz_set_metric int oggz_set_metric (OGGZ * OGGZ *  oggz,
OggzMetric OggzMetric  metric,
oggz An OGGZ handle
serialno Identify the logical bitstream in oggz to attach this metric to. A value of -1 indicates that this metric should be attached to all unattached logical bitstreams in oggz.
metric An OggzMetric callback
user_data arbitrary data to pass to the metric callback
+ -
Returns:
0 Success
-
Return values:
+
Returns:
0 Success
+
Return values:
OGGZ_ERR_BAD_SERIALNO serialno does not identify an existing logical bitstream in oggz, and is not -1
OGGZ_ERR_BAD_OGGZ oggz does not refer to an existing OGGZ
+
-
Note:
Specifying values of serialno other than -1 allows you to pass logical bitstream specific user_data to the same metric.

+

Note:
Specifying values of serialno other than -1 allows you to pass logical bitstream specific user_data to the same metric.
+
Alternatively, you may use a different metric for each serialno, but all metrics used must return mutually consistent unit measurements.
-

- + +

- + - + @@ -494,29 +490,29 @@
-

-Specify the preroll of a logical bitstream. -

-

Parameters:
+

Specify the preroll of a logical bitstream.

+
Parameters:
int oggz_set_preroll int oggz_set_preroll (OGGZ * OGGZ *  oggz,
oggz An OGGZ handle
serialno Identify the logical bitstream in oggz to attach this preroll to.
preroll The preroll
+ -
Returns:
0 Success
-
Return values:
+
Returns:
0 Success
+
Return values:
OGGZ_ERR_BAD_SERIALNO serialno does not identify an existing logical bitstream in oggz.
OGGZ_ERR_BAD_OGGZ oggz does not refer to an existing OGGZ
+
-

-

Generated on Thu Oct 8 18:21:26 2009 for liboggz by  + +
Generated on Sat Apr 24 09:13:55 2010 for liboggz by  -doxygen 1.5.6
+doxygen 1.6.3
diff -Nru liboggz-1.1.0/doc/liboggz/html/group__read__api.html liboggz-1.1.1/doc/liboggz/html/group__read__api.html --- liboggz-1.1.0/doc/liboggz/html/group__read__api.html 2009-10-08 09:21:26.000000000 +0000 +++ liboggz-1.1.1/doc/liboggz/html/group__read__api.html 2010-04-24 00:13:55.000000000 +0000 @@ -1,10 +1,13 @@ - - + + + + liboggz: Oggz Read API - - - - + + + + +
-

Oggz Read API

Detailed Description

-Oggz parses Ogg bitstreams, forming ogg_packet structures, and calling your OggzReadPacket callback(s). -

-You provide Ogg data to Oggz with oggz_read() or oggz_read_input(), and independently process it in OggzReadPacket callbacks. It is possible to set a different callback per serialno (ie. for each logical bitstream in the Ogg bitstream - see the Ogg basics section for more detail).

-When using an OGGZ* opened with the OGGZ_AUTO flag set, Oggz will internally calculate the granulepos for each packet, even though these are not all recorded in the file: only the last packet ending on a page will have its granulepos recorded in the page header. Within a OggzReadPacket callback, calling oggz_tell_granulepos() will retrieve the calculated granulepos.

-See Oggz Seek API for information on seeking on interleaved Ogg data, and for working with calculated granulepos values. -

+

Oggz Read API

+

Oggz parses Ogg bitstreams, forming ogg_packet structures, and calling your OggzReadPacket callback(s). +More...

- - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + +

Typedefs

typedef int(* OggzReadPacket )(OGGZ *oggz, oggz_packet *packet, long serialno, void *user_data)
 This is the signature of a callback which you must provide for Oggz to call whenever it finds a new packet in the Ogg stream associated with oggz.
typedef int(* OggzReadPage )(OGGZ *oggz, const ogg_page *og, long serialno, void *user_data)
 This is the signature of a callback which you must provide for Oggz to call whenever it finds a new page in the Ogg stream associated with oggz.

Functions

int oggz_set_read_callback (OGGZ *oggz, long serialno, OggzReadPacket read_packet, void *user_data)
 Set a callback for Oggz to call when a new Ogg packet is found in the stream.
int oggz_set_read_page (OGGZ *oggz, long serialno, OggzReadPage read_page, void *user_data)
 Set a callback for Oggz to call when a new Ogg page is found in the stream.
long oggz_read (OGGZ *oggz, long n)
 Read n bytes into oggz, calling any read callbacks on the fly.
long oggz_read_input (OGGZ *oggz, unsigned char *buf, long n)
 Input data into oggz.

Typedefs

typedef int(* OggzReadPacket )(OGGZ *oggz, ogg_packet *op, long serialno, void *user_data)
 This is the signature of a callback which you must provide for Oggz to call whenever it finds a new packet in the Ogg stream associated with oggz.
typedef int(* OggzReadPage )(OGGZ *oggz, const ogg_page *og, long serialno, void *user_data)
 This is the signature of a callback which you must provide for Oggz to call whenever it finds a new page in the Ogg stream associated with oggz.

Functions

int oggz_set_read_callback (OGGZ *oggz, long serialno, OggzReadPacket read_packet, void *user_data)
 Set a callback for Oggz to call when a new Ogg packet is found in the stream.
int oggz_set_read_page (OGGZ *oggz, long serialno, OggzReadPage read_page, void *user_data)
 Set a callback for Oggz to call when a new Ogg page is found in the stream.
long oggz_read (OGGZ *oggz, long n)
 Read n bytes into oggz, calling any read callbacks on the fly.
long oggz_read_input (OGGZ *oggz, unsigned char *buf, long n)
 Input data into oggz.
-

Typedef Documentation

- +

Detailed Description

+

Oggz parses Ogg bitstreams, forming ogg_packet structures, and calling your OggzReadPacket callback(s).

+

You provide Ogg data to Oggz with oggz_read() or oggz_read_input(), and independently process it in OggzReadPacket callbacks. It is possible to set a different callback per serialno (ie. for each logical bitstream in the Ogg bitstream - see the Ogg basics section for more detail).

+

When using an OGGZ* opened with the OGGZ_AUTO flag set, Oggz will internally calculate the granulepos for each packet, even though these are not all recorded in the file: only the last packet ending on a page will have its granulepos recorded in the page header. Within a OggzReadPacket callback, calling oggz_tell_granulepos() will retrieve the calculated granulepos.

+

See Oggz Seek API for information on seeking on interleaved Ogg data, and for working with calculated granulepos values.

+

Typedef Documentation

+
- +
typedef int(* OggzReadPacket)(OGGZ *oggz, oggz_packet *packet, long serialno, void *user_data) typedef int(* OggzReadPacket)(OGGZ *oggz, ogg_packet *op, long serialno, void *user_data)
-

-This is the signature of a callback which you must provide for Oggz to call whenever it finds a new packet in the Ogg stream associated with oggz. -

-

Parameters:
+

This is the signature of a callback which you must provide for Oggz to call whenever it finds a new packet in the Ogg stream associated with oggz.

+
Parameters:
- - + +
oggz The OGGZ handle
packet The packet, including its position in the stream.
serialno Identify the logical bistream in oggz that contains packet
op The full ogg_packet (see <ogg/ogg.h>)
serialno Identify the logical bistream in oggz that contains op
user_data A generic pointer you have provided earlier
+
-
Returns:
0 to continue, non-zero to instruct Oggz to stop.
-
Note:
It is possible to provide different callbacks per logical bitstream -- see oggz_set_read_callback() for more information.
+
Returns:
0 to continue, non-zero to instruct Oggz to stop.
+
Note:
It is possible to provide different callbacks per logical bitstream -- see oggz_set_read_callback() for more information.
-

- +

+
- +
typedef int(* OggzReadPage)(OGGZ *oggz, const ogg_page *og, long serialno, void *user_data) typedef int(* OggzReadPage)(OGGZ *oggz, const ogg_page *og, long serialno, void *user_data)
-

-This is the signature of a callback which you must provide for Oggz to call whenever it finds a new page in the Ogg stream associated with oggz. -

-

Parameters:
+

This is the signature of a callback which you must provide for Oggz to call whenever it finds a new page in the Ogg stream associated with oggz.

+
Parameters:
oggz The OGGZ handle
op The full ogg_page (see <ogg/ogg.h>)
user_data A generic pointer you have provided earlier
+
-
Returns:
0 to continue, non-zero to instruct Oggz to stop.
+
Returns:
0 to continue, non-zero to instruct Oggz to stop.
-

-

Function Documentation

- + +

Function Documentation

+
- + - + @@ -125,16 +120,15 @@
-

-Read n bytes into oggz, calling any read callbacks on the fly. -

-

Parameters:
+

Read n bytes into oggz, calling any read callbacks on the fly.

+
Parameters:
long oggz_read long oggz_read (OGGZ * OGGZ *  oggz,
oggz An OGGZ handle previously opened for reading
n A count of bytes to ingest
+ -
Return values:
+
Return values:
@@ -146,18 +140,19 @@
> 0 The number of bytes successfully ingested.
0 End of file
OGGZ_ERR_HOLE_IN_DATA Hole (sequence number gap) detected in input data
OGGZ_ERR_OUT_OF_MEMORY Out of memory
+
-

- + +

- + - + @@ -181,17 +176,16 @@
-

-Input data into oggz. -

-

Parameters:
+

Input data into oggz.

+
Parameters:
long oggz_read_input long oggz_read_input (OGGZ * OGGZ *  oggz,
oggz An OGGZ handle previously opened for reading
buf A memory buffer
n A count of bytes to input
+ -
Return values:
+
Return values:
@@ -201,18 +195,19 @@
> 0 The number of bytes successfully ingested.
OGGZ_ERR_BAD_OGGZ oggz does not refer to an existing OGGZ
OGGZ_ERR_HOLE_IN_DATA Hole (sequence number gap) detected in input data
OGGZ_ERR_OUT_OF_MEMORY Out of memory
+
-

- + +

- + - + @@ -224,7 +219,7 @@ - + @@ -242,18 +237,17 @@
-

-Set a callback for Oggz to call when a new Ogg packet is found in the stream. -

-

Parameters:
+

Set a callback for Oggz to call when a new Ogg packet is found in the stream.

+
Parameters:
int oggz_set_read_callback int oggz_set_read_callback (OGGZ * OGGZ *  oggz,
OggzReadPacket OggzReadPacket  read_packet,
oggz An OGGZ handle previously opened for reading
serialno Identify the logical bitstream in oggz to attach this callback to, or -1 to attach this callback to all unattached logical bitstreams in oggz.
read_packet Your callback function
user_data Arbitrary data you wish to pass to your callback
+ -
Return values:
+
Return values:
@@ -261,20 +255,22 @@
0 Success
OGGZ_ERR_BAD_SERIALNO serialno does not identify an existing logical bitstream in oggz.
OGGZ_ERR_INVALID Operation not suitable for this OGGZ
OGGZ_ERR_OUT_OF_MEMORY Out of memory
+
-
Note:
Values of serialno other than -1 allows you to specify different callback functions for each logical bitstream.

+

Note:
Values of serialno other than -1 allows you to specify different callback functions for each logical bitstream.
+
It is safe to call this callback from within an OggzReadPacket function, in order to specify that subsequent packets should be handled by a different OggzReadPacket function.
-

- + +

- + - + @@ -286,7 +282,7 @@ - + @@ -304,33 +300,34 @@
-

-Set a callback for Oggz to call when a new Ogg page is found in the stream. -

-

Parameters:
+

Set a callback for Oggz to call when a new Ogg page is found in the stream.

+
Parameters:
int oggz_set_read_page int oggz_set_read_page (OGGZ * OGGZ *  oggz,
OggzReadPage OggzReadPage  read_page,
oggz An OGGZ handle previously opened for reading
serialno Identify the logical bitstream in oggz to attach this callback to, or -1 to attach this callback to all unattached logical bitstreams in oggz.
read_page Your OggzReadPage callback function
user_data Arbitrary data you wish to pass to your callback
+ -
Return values:
+
Return values:
0 Success
OGGZ_ERR_BAD_OGGZ oggz does not refer to an existing OGGZ
OGGZ_ERR_INVALID Operation not suitable for this OGGZ
OGGZ_ERR_OUT_OF_MEMORY Out of memory
+
-
Note:
Values of serialno other than -1 allows you to specify different callback functions for each logical bitstream.

+

Note:
Values of serialno other than -1 allows you to specify different callback functions for each logical bitstream.
+
It is safe to call this callback from within an OggzReadPage function, in order to specify that subsequent pages should be handled by a different OggzReadPage function.
-

-

Generated on Thu Oct 8 18:21:26 2009 for liboggz by  + +
Generated on Sat Apr 24 09:13:55 2010 for liboggz by  -doxygen 1.5.6
+doxygen 1.6.3
diff -Nru liboggz-1.1.0/doc/liboggz/html/group__seek__api.html liboggz-1.1.1/doc/liboggz/html/group__seek__api.html --- liboggz-1.1.0/doc/liboggz/html/group__seek__api.html 2009-10-08 09:21:26.000000000 +0000 +++ liboggz-1.1.1/doc/liboggz/html/group__seek__api.html 2010-04-24 00:13:55.000000000 +0000 @@ -1,10 +1,13 @@ - - + + + + liboggz: Oggz Seek API - - - - + + + + +
-

Oggz Seek API

Detailed Description

-Oggz can seek on multitrack, multicodec bitstreams. -

-

+

Oggz Seek API

+

Oggz can seek on multitrack, multicodec bitstreams. +More...

+ + + + + + + + + + + + +

Functions

ogg_int64_t oggz_tell_units (OGGZ *oggz)
 Query the current offset in milliseconds, or custom units as specified by a Metric function you have provided.
ogg_int64_t oggz_seek_units (OGGZ *oggz, ogg_int64_t units, int whence)
 Seek to an offset in milliseconds, or custom units as specified by a Metric function you have provided.
ogg_int64_t oggz_tell_granulepos (OGGZ *oggz)
 Provide the exact stored granulepos (from the page header) if relevant to the current packet, or a constructed granulepos if the stored granulepos does not belong to this packet, or -1 if this codec does not have support for granulepos interpolation.
oggz_off_t oggz_tell (OGGZ *oggz)
 Query the file offset in bytes corresponding to the data read.
oggz_off_t oggz_seek (OGGZ *oggz, oggz_off_t offset, int whence)
 Seek to a specific byte offset.
+

Detailed Description

+

Oggz can seek on multitrack, multicodec bitstreams.

+

Time seeking

-Support is built-in for seeking to time positions in CELT, CMML. FLAC, OggPCM, Speex, Theora and Vorbis. Oggz is also compatible with Annodex streams, and supports seeking on all tracks described in an Ogg Skeleton track.

-You need to open the file with the OGGZ_AUTO flag set:

+

Support is built-in for seeking to time positions in CELT, CMML. FLAC, OggPCM, Speex, Theora and Vorbis. Oggz is also compatible with Annodex streams, and supports seeking on all tracks described in an Ogg Skeleton track.

+

You need to open the file with the OGGZ_AUTO flag set:

    -
  • Create an OGGZ handle for reading with flags = OGGZ_READ | OGGZ_AUTO
  • Read data, ensuring that you have received all b_o_s pages before attempting to seek.
-

-Oggz will silently parse known codec headers and associate metrics appropriately; if you attempt to seek before you have received all b_o_s pages, Oggz will not have had a chance to parse the codec headers and associate metrics. It is safe to seek once you have received a packet with b_o_s == 0; see the Ogg basics section for more details.

-

Note:
Oggz parses these codec headers internally, and so liboggz is not linked to libspeex, libvorbis, libflac, libtheora, libcmml or libannodex.
-For other data streams, you will need to provide a metric function; see the section on Using OggzMetrics for details of setting up and seeking with metrics.

+
  • Create an OGGZ handle for reading with flags = OGGZ_READ | OGGZ_AUTO
    • +
  • Read data, ensuring that you have received all b_o_s pages before attempting to seek.
    • + +

    Oggz will silently parse known codec headers and associate metrics appropriately; if you attempt to seek before you have received all b_o_s pages, Oggz will not have had a chance to parse the codec headers and associate metrics. It is safe to seek once you have received a packet with b_o_s == 0; see the Ogg basics section for more details.

    +
    Note:
    Oggz parses these codec headers internally, and so liboggz is not linked to libspeex, libvorbis, libflac, libtheora, libcmml or libannodex.
    +

    For other data streams, you will need to provide a metric function; see the section on Using OggzMetrics for details of setting up and seeking with metrics.

    +

    Byte seeking

    -oggz_seek() provides low-level seeking to byte positions.

    +

    oggz_seek() provides low-level seeking to byte positions.

    +

    More detail

    -For a full description of the seeking methods possible in Ogg, see Semantics of seeking in Ogg bitstreams . -

    - - - - - - - - - - - - - - - - - - -

    Functions

    ogg_int64_t oggz_tell_units (OGGZ *oggz)
     Query the current offset in milliseconds, or custom units as specified by a Metric function you have provided.
    ogg_int64_t oggz_seek_units (OGGZ *oggz, ogg_int64_t units, int whence)
     Seek to an offset in milliseconds, or custom units as specified by a Metric function you have provided.
    ogg_int64_t oggz_tell_granulepos (OGGZ *oggz)
     Provide the exact stored granulepos (from the page header) if relevant to the current packet, or a constructed granulepos if the stored granulepos does not belong to this packet, or -1 if this codec does not have support for granulepos interpolation.
    oggz_off_t oggz_tell (OGGZ *oggz)
     Query the file offset in bytes corresponding to the data read.
    oggz_off_t oggz_seek (OGGZ *oggz, oggz_off_t offset, int whence)
     Seek to a specific byte offset.
    -

    Function Documentation

    - +

    For a full description of the seeking methods possible in Ogg, see Semantics of seeking in Ogg bitstreams .

    +

    Function Documentation

    +
    - + - + @@ -85,28 +86,27 @@
    -

    -Seek to a specific byte offset. -

    -

    Parameters:
    +

    Seek to a specific byte offset.

    +
    Parameters:
    oggz_off_t oggz_seek oggz_off_t oggz_seek (OGGZ * OGGZ *  oggz,
    oggz An OGGZ handle
    offset a byte offset
    whence As defined in <stdio.h>: SEEK_SET, SEEK_CUR or SEEK_END
    + -
    Returns:
    the new file offset, or -1 on failure.
    +
    Returns:
    the new file offset, or -1 on failure.
    -

    - +

    +
    - + - + @@ -130,29 +130,28 @@
    -

    -Seek to an offset in milliseconds, or custom units as specified by a Metric function you have provided. -

    -

    Parameters:
    +

    Seek to an offset in milliseconds, or custom units as specified by a Metric function you have provided.

    +
    Parameters:
    ogg_int64_t oggz_seek_units ogg_int64_t oggz_seek_units (OGGZ * OGGZ *  oggz,
    oggz An OGGZ handle
    units A number of milliseconds, or custom units
    whence As defined in <stdio.h>: SEEK_SET, SEEK_CUR or SEEK_END
    + -
    Returns:
    the new file offset, or -1 on failure.
    +
    Returns:
    the new file offset, or -1 on failure.
    -

    - + +

    - + - - + + @@ -160,28 +159,27 @@
    -

    -Query the file offset in bytes corresponding to the data read. -

    -

    Parameters:
    +

    Query the file offset in bytes corresponding to the data read.

    +
    Parameters:
    oggz_off_t oggz_tell oggz_off_t oggz_tell (OGGZ *  oggz OGGZ *  oggz  ) 
    oggz An OGGZ handle
    + -
    Returns:
    The current offset of oggz.
    -
    Note:
    When reading, the value returned by oggz_tell() reflects the data offset of the start of the most recent packet processed, so that when called from an OggzReadPacket callback it reflects the byte offset of the start of the packet. As Oggz may have internally read ahead, this may differ from the current offset of the associated file descriptor.
    +
    Returns:
    The current offset of oggz.
    +
    Note:
    When reading, the value returned by oggz_tell() reflects the data offset of the start of the most recent packet processed, so that when called from an OggzReadPacket callback it reflects the byte offset of the start of the packet. As Oggz may have internally read ahead, this may differ from the current offset of the associated file descriptor.
    -

    - + +

    - + - - + + @@ -189,27 +187,26 @@
    -

    -Provide the exact stored granulepos (from the page header) if relevant to the current packet, or a constructed granulepos if the stored granulepos does not belong to this packet, or -1 if this codec does not have support for granulepos interpolation. -

    -

    Parameters:
    +

    Provide the exact stored granulepos (from the page header) if relevant to the current packet, or a constructed granulepos if the stored granulepos does not belong to this packet, or -1 if this codec does not have support for granulepos interpolation.

    +
    Parameters:
    ogg_int64_t oggz_tell_granulepos ogg_int64_t oggz_tell_granulepos (OGGZ *  oggz OGGZ *  oggz  ) 
    oggz An OGGZ handle
    + -
    Returns:
    the granulepos of the current packet (if available)
    +
    Returns:
    the granulepos of the current packet (if available)
    -

    - + +

    - + - - + + @@ -217,27 +214,27 @@
    -

    -Query the current offset in milliseconds, or custom units as specified by a Metric function you have provided. -

    -

    Parameters:
    +

    Query the current offset in milliseconds, or custom units as specified by a Metric function you have provided.

    +
    Parameters:
    ogg_int64_t oggz_tell_units ogg_int64_t oggz_tell_units (OGGZ *  oggz OGGZ *  oggz  ) 
    oggz An OGGZ handle
    + -
    Returns:
    the offset in milliseconds, or custom units
    -
    Return values:
    +
    Returns:
    the offset in milliseconds, or custom units
    +
    Return values:
    OGGZ_ERR_BAD_OGGZ oggz does not refer to an existing OGGZ
    OGGZ_ERR_INVALID Operation not suitable for this OGGZ
    +
    -

    -

    Generated on Thu Oct 8 18:21:26 2009 for liboggz by  + +
    Generated on Sat Apr 24 09:13:55 2010 for liboggz by  -doxygen 1.5.6
    +doxygen 1.6.3
    diff -Nru liboggz-1.1.0/doc/liboggz/html/group__seek__semantics.html liboggz-1.1.1/doc/liboggz/html/group__seek__semantics.html --- liboggz-1.1.0/doc/liboggz/html/group__seek__semantics.html 2009-10-08 09:21:26.000000000 +0000 +++ liboggz-1.1.1/doc/liboggz/html/group__seek__semantics.html 2010-04-24 00:13:55.000000000 +0000 @@ -1,10 +1,13 @@ - - + + + + liboggz: Semantics of seeking in Ogg bitstreams - - - - + + + + +
    -

    Semantics of seeking in Ogg bitstreams

    +

    Semantics of seeking in Ogg bitstreams

    +
    +

    Introduction

    -[*** This line works around a bug in doxygen ***]

    -[*** This line works around a bug in doxygen ***]

    -The seeking semantics of the Ogg file format were outlined by Monty in a post to theora-dev in September 2002. Quoting from that post, we have the following assumptions:

    +

    [*** This line works around a bug in doxygen ***]

    +

    [*** This line works around a bug in doxygen ***]

    +

    The seeking semantics of the Ogg file format were outlined by Monty in a post to theora-dev in September 2002. Quoting from that post, we have the following assumptions:

      -
    • Ogg is not a non-linear format. ... It is a media transport format designed to do nothing more than deliver content, in a stream, and have all the pieces arrive on time and in sync.
    • The Ogg layer does not know the specifics of the codec data it's multiplexing into a stream. It knows nothing beyond 'Oooo, packets!', that the packets belong to different buckets, that the packets go in order, and that packets have position markers. Ogg does not even have a concept of 'time'; it only knows about the sequentially increasing, unitless position markers. It is up to higher layers which have access to the codec APIs to assign and convert units of framing or time.
    -

    -(For more details on the structure of Ogg streams, see the Ogg Basics section).

    -For data such as media, for which it is possible to provide a mapping such as 'time', Oggz can efficiently navigate through an Ogg stream by use of an OggzMetric callback, thus allowing automatic seeking to points in 'time'.

    -For common codecs you can ask Oggz to set this for you automatically by instantiating the OGGZ handle with the OGGZ_AUTO flag set. For others you can specify a multiplier with oggz_set_metric_linear(), or a generic non-linear metric with oggz_set_metric(). -

    - - -
    +

  • Ogg is not a non-linear format. ... It is a media transport format designed to do nothing more than deliver content, in a stream, and have all the pieces arrive on time and in sync.
    • +
  • The Ogg layer does not know the specifics of the codec data it's multiplexing into a stream. It knows nothing beyond 'Oooo, packets!', that the packets belong to different buckets, that the packets go in order, and that packets have position markers. Ogg does not even have a concept of 'time'; it only knows about the sequentially increasing, unitless position markers. It is up to higher layers which have access to the codec APIs to assign and convert units of framing or time.
    • + +

    (For more details on the structure of Ogg streams, see the Ogg Basics section).

    +

    For data such as media, for which it is possible to provide a mapping such as 'time', Oggz can efficiently navigate through an Ogg stream by use of an OggzMetric callback, thus allowing automatic seeking to points in 'time'.

    +

    For common codecs you can ask Oggz to set this for you automatically by instantiating the OGGZ handle with the OGGZ_AUTO flag set. For others you can specify a multiplier with oggz_set_metric_linear(), or a generic non-linear metric with oggz_set_metric().

    -
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by  +
    Generated on Sat Apr 24 09:13:55 2010 for liboggz by  -doxygen 1.5.6
    +doxygen 1.6.3
    diff -Nru liboggz-1.1.0/doc/liboggz/html/group__write__api.html liboggz-1.1.1/doc/liboggz/html/group__write__api.html --- liboggz-1.1.0/doc/liboggz/html/group__write__api.html 2009-10-08 09:21:26.000000000 +0000 +++ liboggz-1.1.1/doc/liboggz/html/group__write__api.html 2010-04-24 00:13:55.000000000 +0000 @@ -1,10 +1,13 @@ - - + + + + liboggz: Oggz Write API - - - - + + + + +
    -

    Oggz Write API

    Detailed Description

    -Oggz maintains a packet queue, such that you can independently add packets to the queue and write an Ogg bitstream. -

    -There are two complementary methods for adding packets to the packet queue.

    -

    -

    -As each packet is enqueued, its validity is checked against the framing constraints outlined in the Ogg basics section. If it does not pass these constraints, oggz_write_feed() will fail with an appropriate error code.

    -

    Note:
      -
    • When writing, you can ensure that a packet starts on a new page by setting the flush parameter of oggz_write_feed() to OGGZ_FLUSH_BEFORE when enqueuing it. Similarly you can ensure that the last page a packet is written into won't contain any following packets by setting the flush parameter of oggz_write_feed() to OGGZ_FLUSH_AFTER.
    • The OGGZ_FLUSH_BEFORE and OGGZ_FLUSH_AFTER flags can be bitwise OR'd together to ensure that the packet will not share any pages with any other packets, either before or after.
    -
    - -

    +

    Oggz Write API

    +

    Oggz maintains a packet queue, such that you can independently add packets to the queue and write an Ogg bitstream. +More...

    - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + +

    Typedefs

    typedef int(* OggzWriteHungry )(OGGZ *oggz, int empty, void *user_data)
     This is the signature of a callback which Oggz will call when oggz is hungry .

    Functions

    int oggz_write_set_hungry_callback (OGGZ *oggz, OggzWriteHungry hungry, int only_when_empty, void *user_data)
     Set a callback for Oggz to call when oggz is hungry .
    int oggz_write_feed (OGGZ *oggz, ogg_packet *op, long serialno, int flush, int *guard)
     Add a packet to oggz's packet queue.
    long oggz_write_output (OGGZ *oggz, unsigned char *buf, long n)
     Output data from an OGGZ handle.
    long oggz_write (OGGZ *oggz, long n)
     Write n bytes from an OGGZ handle.
    long oggz_write_get_next_page_size (OGGZ *oggz)
     Query the number of bytes in the next page to be written.

    Typedefs

    typedef int(* OggzWriteHungry )(OGGZ *oggz, int empty, void *user_data)
     This is the signature of a callback which Oggz will call when oggz is hungry .

    Functions

    int oggz_write_set_hungry_callback (OGGZ *oggz, OggzWriteHungry hungry, int only_when_empty, void *user_data)
     Set a callback for Oggz to call when oggz is hungry .
    int oggz_write_feed (OGGZ *oggz, ogg_packet *op, long serialno, int flush, int *guard)
     Add a packet to oggz's packet queue.
    long oggz_write_output (OGGZ *oggz, unsigned char *buf, long n)
     Output data from an OGGZ handle.
    long oggz_write (OGGZ *oggz, long n)
     Write n bytes from an OGGZ handle.
    long oggz_write_get_next_page_size (OGGZ *oggz)
     Query the number of bytes in the next page to be written.
    -

    Typedef Documentation

    - +

    Detailed Description

    +

    Oggz maintains a packet queue, such that you can independently add packets to the queue and write an Ogg bitstream.

    +

    There are two complementary methods for adding packets to the packet queue.

    + +

    As each packet is enqueued, its validity is checked against the framing constraints outlined in the Ogg basics section. If it does not pass these constraints, oggz_write_feed() will fail with an appropriate error code.

    +
    Note:
      +
    • When writing, you can ensure that a packet starts on a new page by setting the flush parameter of oggz_write_feed() to OGGZ_FLUSH_BEFORE when enqueuing it. Similarly you can ensure that the last page a packet is written into won't contain any following packets by setting the flush parameter of oggz_write_feed() to OGGZ_FLUSH_AFTER.
      • +
    • The OGGZ_FLUSH_BEFORE and OGGZ_FLUSH_AFTER flags can be bitwise OR'd together to ensure that the packet will not share any pages with any other packets, either before or after.
      • +
    +
    +

    Typedef Documentation

    +
    - +
    typedef int(* OggzWriteHungry)(OGGZ *oggz, int empty, void *user_data) typedef int(* OggzWriteHungry)(OGGZ *oggz, int empty, void *user_data)
    -

    -This is the signature of a callback which Oggz will call when oggz is hungry . -

    -

    Parameters:
    +

    This is the signature of a callback which Oggz will call when oggz is hungry .

    +
    Parameters:
    oggz The OGGZ handle
    empty A value of 1 indicates that the packet queue is currently empty. A value of 0 indicates that the packet queue is not empty.
    user_data A generic pointer you have provided earlier
    +
    -
    Return values:
    +
    Return values:
    0 Continue
    non-zero Instruct Oggz to stop.
    +
    -

    -

    Function Documentation

    - +
    +

    Function Documentation

    +
    - + - + @@ -109,17 +108,16 @@
    -

    -Write n bytes from an OGGZ handle. -

    -Oggz will call your write callback as needed.

    -

    Parameters:
    +

    Write n bytes from an OGGZ handle.

    +

    Oggz will call your write callback as needed.

    +
    Parameters:
    long oggz_write long oggz_write (OGGZ * OGGZ *  oggz,
    oggz An OGGZ handle previously opened for writing
    n A count of bytes to be written
    + -
    Return values:
    +
    Return values:
    @@ -129,18 +127,19 @@
    > 0 The number of bytes successfully output
    0 End of stream
    OGGZ_ERR_STOP_OK Writing was stopped by an OggzHungry callback returning OGGZ_STOP_OK
    OGGZ_ERR_STOP_ERR Reading was stopped by an OggzHungry callback returning OGGZ_STOP_ERR
    +
    -

    - + +

    - + - + @@ -176,10 +175,8 @@
    -

    -Add a packet to oggz's packet queue. -

    -

    Parameters:
    +

    Add a packet to oggz's packet queue.

    +
    Parameters:
    int oggz_write_feed int oggz_write_feed (OGGZ * OGGZ *  oggz,
    @@ -187,8 +184,9 @@
    oggz An OGGZ handle previously opened for writing
    op An ogg_packet with all fields filled in
    flush Bitmask of OGGZ_FLUSH_BEFORE, OGGZ_FLUSH_AFTER
    guard A guard for nocopy, NULL otherwise
    + -
    Return values:
    +
    Return values:
    @@ -203,20 +201,21 @@
    0 Success
    OGGZ_ERR_BAD_GUARD guard specified has non-zero initialization
    OGGZ_ERR_INVALID Operation not suitable for this OGGZ
    OGGZ_ERR_OUT_OF_MEMORY Unable to allocate memory to queue packet
    +
    -
    Note:
    If op->b_o_s is initialized to -1 before calling oggz_write_feed(), Oggz will fill it in with the appropriate value; ie. 1 for the first packet of a new stream, and 0 otherwise.
    +
    Note:
    If op->b_o_s is initialized to -1 before calling oggz_write_feed(), Oggz will fill it in with the appropriate value; ie. 1 for the first packet of a new stream, and 0 otherwise.
    -

    - + +

    - + - - + + @@ -224,32 +223,32 @@
    -

    -Query the number of bytes in the next page to be written. -

    -

    Parameters:
    +

    Query the number of bytes in the next page to be written.

    +
    Parameters:
    long oggz_write_get_next_page_size long oggz_write_get_next_page_size (OGGZ *  oggz OGGZ *  oggz  ) 
    oggz An OGGZ handle previously opened for writing
    + -
    Return values:
    +
    Return values:
    >= 0 The number of bytes in the next page
    OGGZ_ERR_BAD_OGGZ oggz does not refer to an existing OGGZ
    OGGZ_ERR_INVALID Operation not suitable for this OGGZ
    +
    -

    - + +

    - + - + @@ -273,18 +272,17 @@
    -

    -Output data from an OGGZ handle. -

    -Oggz will call your write callback as needed.

    -

    Parameters:
    +

    Output data from an OGGZ handle.

    +

    Oggz will call your write callback as needed.

    +
    Parameters:
    long oggz_write_output long oggz_write_output (OGGZ * OGGZ *  oggz,
    oggz An OGGZ handle previously opened for writing
    buf A memory buffer
    n A count of bytes to output
    + -
    Return values:
    +
    Return values:
    @@ -294,24 +292,25 @@
    > 0 The number of bytes successfully output
    0 End of stream
    OGGZ_ERR_STOP_OK Writing was stopped by an OggzHungry callback returning OGGZ_STOP_OK
    OGGZ_ERR_STOP_ERR Reading was stopped by an OggzHungry callback returning OGGZ_STOP_ERR
    +
    -

    - + +

    - + - + - + @@ -335,31 +334,31 @@
    -

    -Set a callback for Oggz to call when oggz is hungry . -

    -

    Parameters:
    +

    Set a callback for Oggz to call when oggz is hungry .

    +
    Parameters:
    int oggz_write_set_hungry_callback int oggz_write_set_hungry_callback (OGGZ * OGGZ *  oggz,
    OggzWriteHungry OggzWriteHungry  hungry,
    oggz An OGGZ handle previously opened for writing
    hungry Your callback function
    only_when_empty When to call: a value of 0 indicates that Oggz should call hungry() after each and every packet is written; a value of 1 indicates that Oggz should call hungry() only when its packet queue is empty
    user_data Arbitrary data you wish to pass to your callback
    + -
    Return values:
    +
    Return values:
    0 Success
    OGGZ_ERR_BAD_OGGZ oggz does not refer to an existing OGGZ
    OGGZ_ERR_INVALID Operation not suitable for this OGGZ
    +
    -
    Note:
    Passing a value of 0 for only_when_empty allows you to feed new packets into oggz's packet queue on the fly.
    +
    Note:
    Passing a value of 0 for only_when_empty allows you to feed new packets into oggz's packet queue on the fly.
    -

    -

    Generated on Thu Oct 8 18:21:26 2009 for liboggz by  + +
    Generated on Sat Apr 24 09:13:55 2010 for liboggz by  -doxygen 1.5.6
    +doxygen 1.6.3
    diff -Nru liboggz-1.1.0/doc/liboggz/html/index.html liboggz-1.1.1/doc/liboggz/html/index.html --- liboggz-1.1.0/doc/liboggz/html/index.html 2009-10-08 09:21:26.000000000 +0000 +++ liboggz-1.1.1/doc/liboggz/html/index.html 2010-04-24 00:13:55.000000000 +0000 @@ -1,10 +1,13 @@ - - + + + + liboggz: Main Page - - - - + + + + +
    -

    liboggz Documentation

    -

    -

    1.1.0

    +

    liboggz Documentation

    1.0.1

    Oggz makes programming with Ogg easy!

    -This is the documentation for the Oggz C API. Oggz provides a simple programming interface for reading and writing Ogg files and streams. Ogg is an interleaving data container developed by Monty at Xiph.Org, originally to support the Ogg Vorbis audio format.

    -liboggz supports the flexibility afforded by the Ogg file format while presenting the following API niceties:

    +

    This is the documentation for the Oggz C API. Oggz provides a simple programming interface for reading and writing Ogg files and streams. Ogg is an interleaving data container developed by Monty at Xiph.Org, originally to support the Ogg Vorbis audio format.

    +

    liboggz supports the flexibility afforded by the Ogg file format while presenting the following API niceties:

      -
    • Strict adherence to the formatting requirements of Ogg bitstreams , to ensure that only valid bitstreams are generated
    • A simple, callback based open/read/close or open/write/close interface to raw Ogg files
    • A customisable seeking abstraction for seeking on multitrack Ogg data
    • A packet queue for feeding incoming packets for writing, with callback based notification when this queue is empty
    • A means of overriding the IO functions used by Oggz, for easier integration with media frameworks and similar systems.
    • A handy table structure for storing information on each logical bitstream
    -

    +
  • Strict adherence to the formatting requirements of Ogg bitstreams , to ensure that only valid bitstreams are generated
    • +
  • A simple, callback based open/read/close or open/write/close interface to raw Ogg files
    • +
  • A customisable seeking abstraction for seeking on multitrack Ogg data
    • +
  • A packet queue for feeding incoming packets for writing, with callback based notification when this queue is empty
    • +
  • A means of overriding the IO functions used by Oggz, for easier integration with media frameworks and similar systems.
    • +
  • A handy table structure for storing information on each logical bitstream
    • + +

    Contents

      -
    • Basics : Information about Ogg required to understand liboggz
    -

    +

  • Basics : Information about Ogg required to understand liboggz
    • +
      -
    • oggz.h : Documentation of the Oggz C API
    -

    +

  • oggz.h : Documentation of the Oggz C API
    • + -

    +

  • Configuration : Customizing liboggz to only read or write.
    • +
      -
    • Building : Information related to building software that uses liboggz.
    -

    +
  • Building : Information related to building software that uses liboggz.
    • + +

    Licensing

    -liboggz is provided under the following BSD-style open source license:

    +

    liboggz is provided under the following BSD-style open source license:

     
    
-
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by 
+
    Generated on Sat Apr 24 09:13:55 2010 for liboggz by 
 
-doxygen 1.5.6 
    
+doxygen 1.6.3 
    
 
 
diff -Nru liboggz-1.1.0/doc/liboggz/html/modules.html liboggz-1.1.1/doc/liboggz/html/modules.html
--- liboggz-1.1.0/doc/liboggz/html/modules.html	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/modules.html	2010-04-24 00:13:55.000000000 +0000
@@ -1,10 +1,13 @@
-
-
+
+
+
+
 liboggz: Module Index
-
-
-
-
+
+
+
+
+
 
+
 
    
 
    
       
-          
+          
-          
-          
+          
+          
@@ -166,27 +168,26 @@
 
    
 
-
    
-Return human-readable string representation of a content type. 
-
    
-
    Return values:
    
+
    Return human-readable string representation of a content type. 
    
+
    Return values:
    
   
    
         
    const char* oggz_content_type           const char* oggz_content_type 
           (OggzStreamContent  content          OggzStreamContent  content
            ) 
           
         
    
 
    
     
    string the name of the content type 
    
     
    NULL content invalid 
    
   
    
+  
 
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
-          
+          
+          
@@ -194,33 +195,33 @@
 
    
 
-
    
-Ensure any associated io streams are flushed. 
-
    
-
    Parameters:
    
+
    Ensure any associated io streams are flushed. 
    
+
    Parameters:
    
   
    
         
    int oggz_flush           int oggz_flush 
           (OGGZ *  oggz          OGGZ *  oggz
            ) 
           
         
    
 
    
     
    oggz An OGGZ handle 
    
   
    
+  
 
-
    Return values:
    
+
    Return values:
    
   
    
     
    0 Success 
    
     
    OGGZ_ERR_BAD_OGGZ oggz does not refer to an existing OGGZ 
    
     
    OGGZ_ERR_INVALID Operation not suitable for this OGGZ 
    
     
    OGGZ_ERR_SYSTEM System error; check errno for details 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
+          
@@ -238,33 +239,33 @@
 
    
 
-
    
-Determine if a given logical bitstream is at bos (beginning of stream). 
-
    
-
    Parameters:
    
+
    Determine if a given logical bitstream is at bos (beginning of stream). 
    
+
    Parameters:
    
   
    
         
    int oggz_get_bos           int oggz_get_bos 
           (OGGZ * OGGZ * 
            oggz, 
         
    
         
    
 
    
     
    oggz An OGGZ handle 
    
     
    serialno Identify a logical bitstream within oggz, or -1 to query if all logical bitstreams in oggz are at bos 
    
   
    
+  
 
-
    Return values:
    
+
    Return values:
    
   
    
     
    1 The given stream is at bos 
    
     
    0 The given stream is not at bos 
    
     
    OGGZ_ERR_BAD_SERIALNO serialno does not identify an existing logical bitstream in oggz. 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
+          
@@ -282,34 +283,34 @@
 
    
 
-
    
-Determine if a given logical bitstream is at eos (end of stream). 
-
    
-
    Parameters:
    
+
    Determine if a given logical bitstream is at eos (end of stream). 
    
+
    Parameters:
    
   
    
         
    int oggz_get_eos           int oggz_get_eos 
           (OGGZ * OGGZ * 
            oggz, 
         
    
         
    
 
    
     
    oggz An OGGZ handle 
    
     
    serialno Identify a logical bitstream within oggz, or -1 to query if all logical bitstreams in oggz are at eos 
    
   
    
+  
 
-
    Return values:
    
+
    Return values:
    
   
    
     
    1 The given stream is at eos 
    
     
    0 The given stream is not at eos 
    
     
    OGGZ_ERR_BAD_SERIALNO serialno does not identify an existing logical bitstream in oggz. 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
-          
+          
+          
@@ -317,32 +318,33 @@
 
    
 
-
    
-Query the number of tracks (logical bitstreams). 
-
    
-When reading, this number is incremented every time a new track is found, so the returned value is only correct once the OGGZ is no longer at bos (beginning of stream): see oggz_get_bos() for determining this. 
    Parameters:
    
+
    Query the number of tracks (logical bitstreams). 
    
+
    When reading, this number is incremented every time a new track is found, so the returned value is only correct once the OGGZ is no longer at bos (beginning of stream): see oggz_get_bos() for determining this. 
    
+
    Parameters:
    
   
    
         
    int oggz_get_numtracks           int oggz_get_numtracks 
           (OGGZ *  oggz          OGGZ *  oggz
            ) 
           
         
    
 
    
     
    oggz An OGGZ handle 
    
   
    
+  
 
-
    Returns:
    The number of tracks in OGGZ 
    
-
    Return values:
    
+
    Returns:
    The number of tracks in OGGZ 
    
+
    Return values:
    
   
    
     
    OGGZ_ERR_BAD_SERIALNO serialno does not identify an existing logical bitstream in oggz. 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
+          
@@ -350,29 +352,29 @@
 
    
 
-
    
-Create a new OGGZ object. 
-
    
-
    Parameters:
    
+
    Create a new OGGZ object. 
    
+
    Parameters:
    
   
    
         
    OGGZ* oggz_new           OGGZ* oggz_new 
           (
           int  flags           flags
            ) 
           
         
    
 
    
     
    flags OGGZ_READ or OGGZ_WRITE 
    
   
    
+  
 
-
    Returns:
    A new OGGZ object 
    
-
    Return values:
    
+
    Returns:
    A new OGGZ object 
    
+
    Return values:
    
   
    
     
    NULL on system error; check errno for details 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
@@ -392,30 +394,30 @@
 
    
 
-
    
-Open an Ogg file, creating an OGGZ handle for it. 
-
    
-
    Parameters:
    
+
    Open an Ogg file, creating an OGGZ handle for it. 
    
+
    Parameters:
    
   
    
         
    OGGZ* oggz_open           OGGZ* oggz_open 
           (
           const char * 
            filename, 
 
    
     
    filename The file to open 
    
     
    flags OGGZ_READ or OGGZ_WRITE 
    
   
    
+  
 
-
    Returns:
    A new OGGZ handle 
    
-
    Return values:
    
+
    Returns:
    A new OGGZ handle 
    
+
    Return values:
    
   
    
     
    NULL System error; check errno for details 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
@@ -435,33 +437,33 @@
 
    
 
-
    
-Create an OGGZ handle associated with a stdio stream. 
-
    
-
    Parameters:
    
+
    Create an OGGZ handle associated with a stdio stream. 
    
+
    Parameters:
    
   
    
         
    OGGZ* oggz_open_stdio           OGGZ* oggz_open_stdio 
           (
           FILE * 
            file, 
 
    
     
    file An open FILE handle 
    
     
    flags OGGZ_READ or OGGZ_WRITE 
    
   
    
+  
 
-
    Returns:
    A new OGGZ handle 
    
-
    Return values:
    
+
    Returns:
    A new OGGZ handle 
    
+
    Return values:
    
   
    
     
    NULL System error; check errno for details 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
-          
+          
+          
@@ -469,15 +471,15 @@
 
    
 
-
    
-Run an OGGZ until completion, or error. 
-
    
-This is a convenience function which repeatedly calls oggz_read() or oggz_write() as appropriate. For an OGGZ opened for reading, an OggzReadPacket or OggzReadPage callback should have been set before calling this function. For an OGGZ opened for writing, either an OggzHungry callback should have been set before calling this function, or you can use this function to write out all unwritten Ogg pages which are pending. 
    Parameters:
    
+
    Run an OGGZ until completion, or error. 
    
+
    This is a convenience function which repeatedly calls oggz_read() or oggz_write() as appropriate. For an OGGZ opened for reading, an OggzReadPacket or OggzReadPage callback should have been set before calling this function. For an OGGZ opened for writing, either an OggzHungry callback should have been set before calling this function, or you can use this function to write out all unwritten Ogg pages which are pending. 
    
+
    Parameters:
    
   
    
         
    long oggz_run           long oggz_run 
           (OGGZ *  oggz          OGGZ *  oggz
            ) 
           
         
    
 
    
     
    oggz An OGGZ handle previously opened for either reading or writing 
    
   
    
+  
 
-
    Return values:
    
+
    Return values:
    
   
@@ -487,18 +489,19 @@
     
    
     
    0 Success 
    
     
    OGGZ_ERR_BAD_OGGZ oggz does not refer to an existing OGGZ 
    OGGZ_ERR_STOP_ERR Operation was stopped by a user callback returning OGGZ_STOP_ERR 
    
     
    OGGZ_ERR_RECURSIVE_WRITE Attempt to initiate writing from within an OggzHungry callback 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
+          
@@ -516,34 +519,34 @@
 
    
 
-
    
-Set the blocksize to use internally for oggz_run(). 
-
    
-
    Parameters:
    
+
    Set the blocksize to use internally for oggz_run(). 
    
+
    Parameters:
    
   
    
         
    int oggz_run_set_blocksize           int oggz_run_set_blocksize 
           (OGGZ * OGGZ * 
            oggz, 
         
    
         
    
 
    
-    
+    
    
     
    oggz An OGGZ handle previously opened for either reading or writing 
    blocksize The blocksize to use within oggz_run() 
    blocksize The blocksize to use within oggz_run() 
    
   
    
+  
 
-
    Return values:
    
+
    Return values:
    
   
    
     
    0 Success 
    
     
    OGGZ_ERR_BAD_OGGZ oggz does not refer to an existing OGGZ 
    
     
    OGGZ_ERR_INVALID Invalid blocksize (run_blocksize <= 0) 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
-          
+          
+          
@@ -551,21 +554,20 @@
 
    
 
-
    
-Request a new serialno, as required for a new stream, ensuring the serialno is not yet used for any other streams managed by this OGGZ. 
-
    
-
    Parameters:
    
+
    Request a new serialno, as required for a new stream, ensuring the serialno is not yet used for any other streams managed by this OGGZ. 
    
+
    Parameters:
    
   
    
         
    long oggz_serialno_new           long oggz_serialno_new 
           (OGGZ *  oggz          OGGZ *  oggz
            ) 
           
         
    
 
    
     
    oggz An OGGZ handle 
    
   
    
+  
 
-
    Returns:
    A new serialno, not already occuring in any logical bitstreams in oggz. 
    
+
    Returns:
    A new serialno, not already occuring in any logical bitstreams in oggz. 
    
 
 
    
-
    
 
-
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by 
+
+
    Generated on Sat Apr 24 09:13:55 2010 for liboggz by 
 
-doxygen 1.5.6 
    
+doxygen 1.6.3 
    
 
 
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz_8h_source.html liboggz-1.1.1/doc/liboggz/html/oggz_8h_source.html
--- liboggz-1.1.0/doc/liboggz/html/oggz_8h_source.html	1970-01-01 00:00:00.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz_8h_source.html	2010-04-24 00:13:55.000000000 +0000
@@ -0,0 +1,118 @@
+
+
+
+
+liboggz: oggz.h Source File
+
+
+
+
+
+
+
    Generated on Sat Apr 24 09:13:55 2010 for liboggz by 
+
+doxygen 1.6.3 
    
+
+
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz_8h-source.html liboggz-1.1.1/doc/liboggz/html/oggz_8h-source.html
--- liboggz-1.1.0/doc/liboggz/html/oggz_8h-source.html	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz_8h-source.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,109 +0,0 @@
-
-
-liboggz: oggz.h Source File
-
-
-
-
-
-
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by 
-
-doxygen 1.5.6 
    
-
-
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__comments_8h.html liboggz-1.1.1/doc/liboggz/html/oggz__comments_8h.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__comments_8h.html	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__comments_8h.html	2010-04-24 00:13:55.000000000 +0000
@@ -1,10 +1,13 @@
-
-
+
+
+
+
 liboggz: oggz_comments.h File Reference
-
-
-
-
+
+
+
+
+
 
 
    
-
    oggz_comments.h File Reference
    Detailed Description
    
-Reading of comments. 
-
    
-Vorbis, Speex and Theora bitstreams use a comment format called "Vorbiscomment", defined here. Many standard comment names (such as TITLE, COPYRIGHT and GENRE) are defined in that document.
    
-The following general features of Vorbiscomment are relevant to this API:
      
-
    • Each stream has one comment packet, which occurs before any encoded audio data in the stream.
    • When reading, Oggz will decode the comment block before calling the second read() callback for each stream. Hence, retrieving comment data is possible once the read() callback has been called a second time.
    • When writing, Oggz allows you to set up the comments in memory, and provides a single function to generate a corresponding ogg_packet. It is your responsibility to then actually write that packet in sequence.
    
-
    
-Each comment block contains one Vendor string, which can be retrieved with oggz_comment_get_vendor().
    
-The rest of a comment block consists of name = value pairs, with the following restrictions:
      
-
    • Both the name and value must be non-empty
    • The name is case-insensitive and must consist of ASCII within the range 0x20 to 0x7D inclusive, 0x3D ('=') excluded.
    • The name is not unique; multiple entries may exist with equivalent name within a Vorbiscomment block.
    • The value may be any UTF-8 string.
    
-
    
+
    oggz_comments.h File Reference
    
+
    Reading of comments.  
+More...
    
+#include <oggz/oggz.h>
    
+
+
    Go to the source code of this file.
    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    Data Structures
    struct  OggzComment
     A comment.  More...
    Functions
    const char * oggz_comment_get_vendor (OGGZ *oggz, long serialno)
     Retrieve the vendor string.  
    int oggz_comment_set_vendor (OGGZ *oggz, long serialno, const char *vendor_string)
     Set the vendor string.  
    const OggzComment * oggz_comment_first (OGGZ *oggz, long serialno)
     Retrieve the first comment.  
    const OggzComment * oggz_comment_next (OGGZ *oggz, long serialno, const OggzComment *comment)
     Retrieve the next comment.  
    const OggzComment * oggz_comment_first_byname (OGGZ *oggz, long serialno, char *name)
     Retrieve the first comment with a given name.  
    const OggzComment * oggz_comment_next_byname (OGGZ *oggz, long serialno, const OggzComment *comment)
     Retrieve the next comment following and with the same name as a given comment.  
    int oggz_comment_add (OGGZ *oggz, long serialno, OggzComment *comment)
     Add a comment.  
    int oggz_comment_add_byname (OGGZ *oggz, long serialno, const char *name, const char *value)
     Add a comment by name and value.  
    int oggz_comment_remove (OGGZ *oggz, long serialno, OggzComment *comment)
     Remove a comment.  
    int oggz_comment_remove_byname (OGGZ *oggz, long serialno, char *name)
     Remove all comments with a given name.  
    ogg_packet * oggz_comments_generate (OGGZ *oggz, long serialno, int FLAC_final_metadata_block)
     Output a comment packet for the specified stream.  
    
+int oggz_comments_copy (OGGZ *src, long src_serialno, OGGZ *dest, long dest_serialno)
    void oggz_packet_destroy (ogg_packet *packet)
     Free a packet and its payload.  
    
+
    Detailed Description
    
+
    Reading of comments. 
    
+
    Vorbis, Speex and Theora bitstreams use a comment format called "Vorbiscomment", defined here. Many standard comment names (such as TITLE, COPYRIGHT and GENRE) are defined in that document.
    
+
    The following general features of Vorbiscomment are relevant to this API:
    
+
      
+
    • Each stream has one comment packet, which occurs before any encoded audio data in the stream.
      • 
+
    • When reading, Oggz will decode the comment block before calling the second read() callback for each stream. Hence, retrieving comment data is possible once the read() callback has been called a second time.
      • 
+
    • When writing, Oggz allows you to set up the comments in memory, and provides a single function to generate a corresponding ogg_packet. It is your responsibility to then actually write that packet in sequence.
      • 
+
    
+
    Each comment block contains one Vendor string, which can be retrieved with oggz_comment_get_vendor().
    
+
    The rest of a comment block consists of name = value pairs, with the following restrictions:
    
+
      
+
    • Both the name and value must be non-empty
      • 
+
    • The name is case-insensitive and must consist of ASCII within the range 0x20 to 0x7D inclusive, 0x3D ('=') excluded.
      • 
+
    • The name is not unique; multiple entries may exist with equivalent name within a Vorbiscomment block.
      • 
+
    • The value may be any UTF-8 string.
      • 
+
    
+
    
 Reading comments
    
-Oggz contains API methods to iterate through all comments associated with the logical bitstreams of an OGGZ* handle (oggz_comment_first() and oggz_comment_next(), and to iterate through comments matching a particular name (oggz_comment_first_byname() and oggz_comment_next_byname()). Given that multiple comments may exist with the same name, you should not use oggz_comment_first_byname() as a simple "get" function.
    
+
    Oggz contains API methods to iterate through all comments associated with the logical bitstreams of an OGGZ* handle (oggz_comment_first() and oggz_comment_next(), and to iterate through comments matching a particular name (oggz_comment_first_byname() and oggz_comment_next_byname()). Given that multiple comments may exist with the same name, you should not use oggz_comment_first_byname() as a simple "get" function.
    
+
    
 Writing comments
    
-For writing, Oggz contains API methods for adding comments (oggz_comment_add() and oggz_comment_add_byname()), for removing comments (oggz_comment_remove() and oggz_comment_remove_byname()) and for setting the vendor string (oggz_comment_set_vendor()). 
-
    
-#include <oggz/oggz.h>
    
-
-
    
-Go to the source code of this file.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

    Data Structures
    struct  OggzComment
     A comment.  More...

    Functions
    const char * oggz_comment_get_vendor (OGGZ *oggz, long serialno)
     Retrieve the vendor string.  
    int oggz_comment_set_vendor (OGGZ *oggz, long serialno, const char *vendor_string)
     Set the vendor string.  
    const OggzComment * oggz_comment_first (OGGZ *oggz, long serialno)
     Retrieve the first comment.  
    const OggzComment * oggz_comment_next (OGGZ *oggz, long serialno, const OggzComment *comment)
     Retrieve the next comment.  
    const OggzComment * oggz_comment_first_byname (OGGZ *oggz, long serialno, char *name)
     Retrieve the first comment with a given name.  
    const OggzComment * oggz_comment_next_byname (OGGZ *oggz, long serialno, const OggzComment *comment)
     Retrieve the next comment following and with the same name as a given comment.  
    int oggz_comment_add (OGGZ *oggz, long serialno, OggzComment *comment)
     Add a comment.  
    int oggz_comment_add_byname (OGGZ *oggz, long serialno, const char *name, const char *value)
     Add a comment by name and value.  
    int oggz_comment_remove (OGGZ *oggz, long serialno, OggzComment *comment)
     Remove a comment.  
    int oggz_comment_remove_byname (OGGZ *oggz, long serialno, char *name)
     Remove all comments with a given name.  
    ogg_packet * oggz_comments_generate (OGGZ *oggz, long serialno, int FLAC_final_metadata_block)
     Output a comment packet for the specified stream.  
    
-int oggz_comments_copy (OGGZ *src, long src_serialno, OGGZ *dest, long dest_serialno)
    void oggz_packet_destroy (ogg_packet *packet)
     Free a packet and its payload.  
    
-
    Function Documentation
    
-
+
    For writing, Oggz contains API methods for adding comments (oggz_comment_add() and oggz_comment_add_byname()), for removing comments (oggz_comment_remove() and oggz_comment_remove_byname()) and for setting the vendor string (oggz_comment_set_vendor()). 
    
+
    Function Documentation
    
+
 
    
 
    
       
-          
+          
-          
+          
@@ -114,35 +118,35 @@
 
    
 
-
    
-Add a comment. 
-
    
-
    Parameters:
    
+
    Add a comment. 
    
+
    Parameters:
    
   
    
         
    int oggz_comment_add           int oggz_comment_add 
           (OGGZ * OGGZ * 
            oggz, 
         
    
         
    
 
    
     
    oggz A OGGZ* handle (created with mode OGGZ_WRITE) 
    
     
    serialno Identify a logical bitstream within oggz 
    
     
    comment The comment to add 
    
   
    
+  
 
-
    Return values:
    
+
    Return values:
    
   
    
     
    0 Success 
    
     
    OGGZ_ERR_BAD oggz is not a valid OGGZ* handle 
    
     
    OGGZ_ERR_INVALID Operation not suitable for this OGGZ 
    
     
    OGGZ_ERR_OUT_OF_MEMORY Out of memory 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
    
+
 
    
 
    
       
-          
+          
-          
+          
@@ -172,36 +176,36 @@
 
    
 
-
    
-Add a comment by name and value. 
-
    
-
    Parameters:
    
+
    Add a comment by name and value. 
    
+
    Parameters:
    
   
    
         
    int oggz_comment_add_byname           int oggz_comment_add_byname 
           (OGGZ * OGGZ * 
            oggz, 
         
    
         
    
 
    
     
    oggz A OGGZ* handle (created with mode OGGZ_WRITE) 
    
     
    serialno Identify a logical bitstream within oggz 
    
     
    name The name of the comment to add 
    
     
    value The contents of the comment to add 
    
   
    
+  
 
-
    Return values:
    
+
    Return values:
    
   
    
     
    0 Success 
    
     
    OGGZ_ERR_BAD oggz is not a valid OGGZ* handle 
    
     
    OGGZ_ERR_INVALID Operation not suitable for this OGGZ 
    
     
    OGGZ_ERR_OUT_OF_MEMORY Out of memory 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
+          
@@ -219,32 +223,32 @@
 
    
 
-
    
-Retrieve the first comment. 
-
    
-
    Parameters:
    
+
    Retrieve the first comment. 
    
+
    Parameters:
    
   
    
         
    const OggzComment* oggz_comment_first           const OggzComment* oggz_comment_first 
           (OGGZ * OGGZ * 
            oggz, 
         
    
         
    
 
    
     
    oggz A OGGZ* handle 
    
     
    serialno Identify a logical bitstream within oggz 
    
   
    
+  
 
-
    Returns:
    A read-only copy of the first comment. 
    
-
    Return values:
    
+
    Returns:
    A read-only copy of the first comment. 
    
+
    Return values:
    
   
    
     
    NULL No comments exist for this OGGZ* object, or serialno does not identify an existing logical bitstream in oggz. 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
+          
@@ -268,34 +272,34 @@
 
    
 
-
    
-Retrieve the first comment with a given name. 
-
    
-
    Parameters:
    
+
    Retrieve the first comment with a given name. 
    
+
    Parameters:
    
   
    
         
    const OggzComment* oggz_comment_first_byname           const OggzComment* oggz_comment_first_byname 
           (OGGZ * OGGZ * 
            oggz, 
         
    
         
    
 
    
     
    oggz A OGGZ* handle 
    
     
    serialno Identify a logical bitstream within oggz 
    
     
    name the name of the comment to retrieve. 
    
   
    
+  
 
-
    Returns:
    A read-only copy of the first comment matching the given name. 
    
-
    Return values:
    
+
    Returns:
    A read-only copy of the first comment matching the given name. 
    
+
    Return values:
    
   
    
     
    NULL No match was found, or serialno does not identify an existing logical bitstream in oggz. 
    
   
    
+  
    
 
    
-
    Note:
    If name is NULL, the behaviour is the same as for oggz_comment_first() 
    
+
    Note:
    If name is NULL, the behaviour is the same as for oggz_comment_first() 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
+          
@@ -313,32 +317,32 @@
 
    
 
-
    
-Retrieve the vendor string. 
-
    
-
    Parameters:
    
+
    Retrieve the vendor string. 
    
+
    Parameters:
    
   
    
         
    const char* oggz_comment_get_vendor           const char* oggz_comment_get_vendor 
           (OGGZ * OGGZ * 
            oggz, 
         
    
         
    
 
    
     
    oggz A OGGZ* handle 
    
     
    serialno Identify a logical bitstream within oggz 
    
   
    
+  
 
-
    Returns:
    A read-only copy of the vendor string. 
    
-
    Return values:
    
+
    Returns:
    A read-only copy of the vendor string. 
    
+
    Return values:
    
   
    
     
    NULL No vendor string is associated with oggz, or oggz is NULL, or serialno does not identify an existing logical bitstream in oggz. 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
+          
@@ -362,33 +366,33 @@
 
    
 
-
    
-Retrieve the next comment. 
-
    
-
    Parameters:
    
+
    Retrieve the next comment. 
    
+
    Parameters:
    
   
    
         
    const OggzComment* oggz_comment_next           const OggzComment* oggz_comment_next 
           (OGGZ * OGGZ * 
            oggz, 
         
    
         
    
 
    
     
    oggz A OGGZ* handle 
    
     
    serialno Identify a logical bitstream within oggz 
    
     
    comment The previous comment. 
    
   
    
+  
 
-
    Returns:
    A read-only copy of the comment immediately following the given comment. 
    
-
    Return values:
    
+
    Returns:
    A read-only copy of the comment immediately following the given comment. 
    
+
    Return values:
    
   
    
     
    NULL serialno does not identify an existing logical bitstream in oggz. 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
+          
@@ -412,33 +416,33 @@
 
    
 
-
    
-Retrieve the next comment following and with the same name as a given comment. 
-
    
-
    Parameters:
    
+
    Retrieve the next comment following and with the same name as a given comment. 
    
+
    Parameters:
    
   
    
         
    const OggzComment* oggz_comment_next_byname           const OggzComment* oggz_comment_next_byname 
           (OGGZ * OGGZ * 
            oggz, 
         
    
         
    
 
    
     
    oggz A OGGZ* handle 
    
     
    serialno Identify a logical bitstream within oggz 
    
     
    comment A comment 
    
   
    
+  
 
-
    Returns:
    A read-only copy of the next comment with the same name as comment. 
    
-
    Return values:
    
+
    Returns:
    A read-only copy of the next comment with the same name as comment. 
    
+
    Return values:
    
   
    
     
    NULL No further comments with the same name exist for this OGGZ* object, or serialno does not identify an existing logical bitstream in oggz. 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
+          
@@ -462,17 +466,16 @@
 
    
 
-
    
-Remove a comment. 
-
    
-
    Parameters:
    
+
    Remove a comment. 
    
+
    Parameters:
    
   
    
         
    int oggz_comment_remove           int oggz_comment_remove 
           (OGGZ * OGGZ * 
            oggz, 
         
    
         
    
 
    
     
    oggz A OGGZ* handle (created with OGGZ_WRITE) 
    
     
    serialno Identify a logical bitstream within oggz 
    
     
    comment The comment to remove. 
    
   
    
+  
 
-
    Return values:
    
+
    Return values:
    
   
@@ -480,18 +483,19 @@
     
    
     
    1 Success: comment removed 
    
     
    0 No-op: comment not found, nothing to remove 
    OGGZ_ERR_INVALID Operation not suitable for this OGGZ 
    
     
    OGGZ_ERR_BAD_SERIALNO serialno does not identify an existing logical bitstream in oggz. 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
+          
@@ -515,35 +519,35 @@
 
    
 
-
    
-Remove all comments with a given name. 
-
    
-
    Parameters:
    
+
    Remove all comments with a given name. 
    
+
    Parameters:
    
   
    
         
    int oggz_comment_remove_byname           int oggz_comment_remove_byname 
           (OGGZ * OGGZ * 
            oggz, 
         
    
         
    
 
    
     
    oggz A OGGZ* handle (created with OGGZ_WRITE) 
    
     
    serialno Identify a logical bitstream within oggz 
    
     
    name The name of the comments to remove 
    
   
    
+  
 
-
    Return values:
    
+
    Return values:
    
   
    
     
    >= 0 The number of comments removed 
    
     
    OGGZ_ERR_BAD oggz is not a valid OGGZ* handle 
    
     
    OGGZ_ERR_INVALID Operation not suitable for this OGGZ 
    
     
    OGGZ_ERR_BAD_SERIALNO serialno does not identify an existing logical bitstream in oggz. 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
+          
@@ -567,36 +571,36 @@
 
    
 
-
    
-Set the vendor string. 
-
    
-
    Parameters:
    
+
    Set the vendor string. 
    
+
    Parameters:
    
   
    
         
    int oggz_comment_set_vendor           int oggz_comment_set_vendor 
           (OGGZ * OGGZ * 
            oggz, 
         
    
         
    
 
    
     
    oggz A OGGZ* handle 
    
     
    serialno Identify a logical bitstream within oggz 
    
     
    vendor_string The contents of the vendor string to add 
    
   
    
+  
 
-
    Return values:
    
+
    Return values:
    
   
    
     
    0 Success 
    
     
    OGGZ_ERR_BAD oggz is not a valid OGGZ* handle 
    
     
    OGGZ_ERR_INVALID Operation not suitable for this OGGZ 
    
     
    OGGZ_ERR_OUT_OF_MEMORY Out of memory 
    
   
    
+  
    
 
    
-
    Note:
    The vendor string should identify the library used to produce the stream, e.g. libvorbis 1.0 used "Xiph.Org libVorbis I 20020717". If copying a bitstream it should be the same as the source. 
    
+
    Note:
    The vendor string should identify the library used to produce the stream, e.g. libvorbis 1.0 used "Xiph.Org libVorbis I 20020717". If copying a bitstream it should be the same as the source. 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
+          
@@ -620,37 +624,37 @@
 
    
 
-
    
-Output a comment packet for the specified stream. 
-
    
-
    Parameters:
    
+
    Output a comment packet for the specified stream. 
    
+
    Parameters:
    
   
    
         
    ogg_packet* oggz_comments_generate           ogg_packet* oggz_comments_generate 
           (OGGZ * OGGZ * 
            oggz, 
         
    
         
    
 
    
     
    oggz A OGGZ* handle (created with OGGZ_WRITE) 
    
     
    serialno Identify a logical bitstream within oggz 
    
     
    FLAC_final_metadata_block Set this to zero unless the packet_type is FLAC, and there are no further metadata blocks to follow. See note below for details. 
    
   
    
+  
 
-
    Returns:
    A comment packet for the stream. When no longer needed it should be freed with oggz_packet_destroy(). 
    
-
    Return values:
    
+
    Returns:
    A comment packet for the stream. When no longer needed it should be freed with oggz_packet_destroy(). 
    
+
    Return values:
    
   
    
     
    NULL content type does not support comments, not enough memory or comment was too long for FLAC 
    
   
    
+  
    
 
    
-
    Note:
    FLAC streams may contain multiple metadata blocks of different types. When encapsulated in Ogg the first of these must be a Vorbis comment packet but PADDING, APPLICATION, SEEKTABLE, CUESHEET and PICTURE may follow. The last metadata block must have its first bit set to 1. Since liboggz does not know whether you will supply more metadata blocks you must tell it if this is the last (or only) metadata block by setting FLAC_final_metadata_block to 1. 
    
- As FLAC metadata blocks are limited in size to 16MB minus 1 byte, this function will refuse to produce longer comment packets for FLAC. 
    
+
    Note:
    FLAC streams may contain multiple metadata blocks of different types. When encapsulated in Ogg the first of these must be a Vorbis comment packet but PADDING, APPLICATION, SEEKTABLE, CUESHEET and PICTURE may follow. The last metadata block must have its first bit set to 1. Since liboggz does not know whether you will supply more metadata blocks you must tell it if this is the last (or only) metadata block by setting FLAC_final_metadata_block to 1. 
    
+ As FLAC metadata blocks are limited in size to 16MB minus 1 byte, this function will refuse to produce longer comment packets for FLAC. 
    
  See http://flac.sourceforge.net/format.html for more details. 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
+          
@@ -658,20 +662,19 @@
 
    
 
-
    
-Free a packet and its payload. 
-
    
-
    Parameters:
    
+
    Free a packet and its payload. 
    
+
    Parameters:
    
   
    
         
    void oggz_packet_destroy           void oggz_packet_destroy 
           (
           ogg_packet *  packet           packet
            ) 
           
         
    
 
    
-    
+    
    packet A packet previously returned from a function such as oggz_comment_generate(). User generated packets should not be passed. 
    packet A packet previously returned from a function such as oggz_comment_generate(). User generated packets should not be passed. 
    
   
    
+  
 
 
 
    
-
    
 
-
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by 
+
+
    Generated on Sat Apr 24 09:13:55 2010 for liboggz by 
 
-doxygen 1.5.6 
    
+doxygen 1.6.3 
    
 
 
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__comments_8h_source.html liboggz-1.1.1/doc/liboggz/html/oggz__comments_8h_source.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__comments_8h_source.html	1970-01-01 00:00:00.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__comments_8h_source.html	2010-04-24 00:13:55.000000000 +0000
@@ -0,0 +1,135 @@
+
+
+
+
+liboggz: oggz_comments.h Source File
+
+
+
+
+
+
+
    Generated on Sat Apr 24 09:13:55 2010 for liboggz by 
+
+doxygen 1.6.3 
    
+
+
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__comments_8h-source.html liboggz-1.1.1/doc/liboggz/html/oggz__comments_8h-source.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__comments_8h-source.html	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__comments_8h-source.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,126 +0,0 @@
-
-
-liboggz: oggz_comments.h Source File
-
-
-
-
-
-
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by 
-
-doxygen 1.5.6 
    
-
-
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__constants_8h.html liboggz-1.1.1/doc/liboggz/html/oggz__constants_8h.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__constants_8h.html	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__constants_8h.html	2010-04-24 00:13:55.000000000 +0000
@@ -1,10 +1,13 @@
-
-
+
+
+
+
 liboggz: oggz_constants.h File Reference
-
-
-
-
+
+
+
+
+
 
 
    
-
    oggz_constants.h File Reference
    Detailed Description
    
-General constants used by liboggz. 
-
    
-
-
    
-
-
    
-Go to the source code of this file.
-
-
-

    Enumerations
    enum  OggzFlags { 
    
-  OGGZ_READ =  0x00, 
-OGGZ_WRITE =  0x01, 
-OGGZ_NONSTRICT =  0x10, 
-OGGZ_AUTO =  0x20, 
-
    
-  OGGZ_PREFIX =  0x40, 
-OGGZ_SUFFIX =  0x80
-
    
+
    oggz_constants.h File Reference
    
+
    General constants used by liboggz.  
+More...
    
+
+
    Go to the source code of this file.
    
+
+
+
+
+
+
-
-
-
+
-
-
-
-
-
+
-
-
-
+
-
-
+
    Typedefs
    
+typedef enum OggzStreamContent OggzStreamContent
     Definition of stream content types. 
    Enumerations
    enum  OggzFlags { 
    
+  OGGZ_READ =  0x00, 
+OGGZ_WRITE =  0x01, 
+OGGZ_NONSTRICT =  0x10, 
+OGGZ_AUTO =  0x20, 
+
    
+  OGGZ_PREFIX =  0x40, 
+OGGZ_SUFFIX =  0x80
+
    
  }
     Flags to oggz_new(), oggz_open(), and oggz_openfd().  More...
    enum  OggzStopCtl { OGGZ_CONTINUE =  0, 
-OGGZ_STOP_OK =  1, 
-OGGZ_STOP_ERR =  -1
+
     
    Flags to oggz_new(), oggz_open(), and oggz_openfd(). 
    
+ More...
    enum  OggzStopCtl { OGGZ_CONTINUE =  0, 
+OGGZ_STOP_OK =  1, 
+OGGZ_STOP_ERR =  -1
  }
    enum  OggzFlushOpts { OGGZ_FLUSH_BEFORE =  0x01, 
-OGGZ_FLUSH_AFTER =  0x02
+
    enum  OggzFlushOpts { OGGZ_FLUSH_BEFORE =  0x01, 
+OGGZ_FLUSH_AFTER =  0x02
  }
     Flush options for oggz_write_feed; can be or'ed together.  More...
    enum  OggzStreamContent { 
    
+
     
    Flush options for oggz_write_feed; can be or'ed together. 
    
+ More...
    enum  OggzStreamContent { 
    
   OGGZ_CONTENT_THEORA =  0, 
 OGGZ_CONTENT_VORBIS, 
 OGGZ_CONTENT_SPEEX, 
 OGGZ_CONTENT_PCM, 
-
    
+
    
   OGGZ_CONTENT_CMML, 
 OGGZ_CONTENT_ANX2, 
 OGGZ_CONTENT_SKELETON, 
 OGGZ_CONTENT_FLAC0, 
-
    
+
    
   OGGZ_CONTENT_FLAC, 
 OGGZ_CONTENT_ANXDATA, 
 OGGZ_CONTENT_CELT, 
 OGGZ_CONTENT_KATE, 
-
    
+
    
   OGGZ_CONTENT_DIRAC, 
 OGGZ_CONTENT_UNKNOWN
-
    
+
    
  }
     Definition of stream content types. 
    enum  OggzError { 
    
-  OGGZ_ERR_OK =  0, 
-OGGZ_ERR_GENERIC =  -1, 
-OGGZ_ERR_BAD_OGGZ =  -2, 
-OGGZ_ERR_INVALID =  -3, 
-
    
-  OGGZ_ERR_NO_STREAMS =  -4, 
-OGGZ_ERR_BOS =  -5, 
-OGGZ_ERR_EOS =  -6, 
-OGGZ_ERR_BAD_METRIC =  -7, 
-
    
-  OGGZ_ERR_SYSTEM =  -10, 
-OGGZ_ERR_DISABLED =  -11, 
-OGGZ_ERR_NOSEEK =  -13, 
-OGGZ_ERR_STOP_OK =  -14, 
-
    
-  OGGZ_ERR_STOP_ERR =  -15, 
-OGGZ_ERR_IO_AGAIN =  -16, 
-OGGZ_ERR_HOLE_IN_DATA =  -17, 
-OGGZ_ERR_OUT_OF_MEMORY =  -18, 
-
    
-  OGGZ_ERR_BAD_SERIALNO =  -20, 
-OGGZ_ERR_BAD_BYTES =  -21, 
-OGGZ_ERR_BAD_B_O_S =  -22, 
-OGGZ_ERR_BAD_E_O_S =  -23, 
-
    
-  OGGZ_ERR_BAD_GRANULEPOS =  -24, 
-OGGZ_ERR_BAD_PACKETNO =  -25, 
-OGGZ_ERR_COMMENT_INVALID =  -129, 
-OGGZ_ERR_BAD_GUARD =  -210, 
-
    
-  OGGZ_ERR_RECURSIVE_WRITE =  -266
-
    
+
     
    Definition of stream content types. 
    
+
    enum  OggzError { 
    
+  OGGZ_ERR_OK =  0, 
+OGGZ_ERR_GENERIC =  -1, 
+OGGZ_ERR_BAD_OGGZ =  -2, 
+OGGZ_ERR_INVALID =  -3, 
+
    
+  OGGZ_ERR_NO_STREAMS =  -4, 
+OGGZ_ERR_BOS =  -5, 
+OGGZ_ERR_EOS =  -6, 
+OGGZ_ERR_BAD_METRIC =  -7, 
+
    
+  OGGZ_ERR_SYSTEM =  -10, 
+OGGZ_ERR_DISABLED =  -11, 
+OGGZ_ERR_NOSEEK =  -13, 
+OGGZ_ERR_STOP_OK =  -14, 
+
    
+  OGGZ_ERR_STOP_ERR =  -15, 
+OGGZ_ERR_IO_AGAIN =  -16, 
+OGGZ_ERR_HOLE_IN_DATA =  -17, 
+OGGZ_ERR_OUT_OF_MEMORY =  -18, 
+
    
+  OGGZ_ERR_BAD_SERIALNO =  -20, 
+OGGZ_ERR_BAD_BYTES =  -21, 
+OGGZ_ERR_BAD_B_O_S =  -22, 
+OGGZ_ERR_BAD_E_O_S =  -23, 
+
    
+  OGGZ_ERR_BAD_GRANULEPOS =  -24, 
+OGGZ_ERR_BAD_PACKETNO =  -25, 
+OGGZ_ERR_COMMENT_INVALID =  -129, 
+OGGZ_ERR_BAD_GUARD =  -210, 
+
    
+  OGGZ_ERR_RECURSIVE_WRITE =  -266
+
    
  }
     Definitions of error return values.  More...
     
    Definitions of error return values. 
    
+ More...
    
 
    
-
    Enumeration Type Documentation
    
-
+
    Detailed Description
    
+
    General constants used by liboggz. 
    
+
    Enumeration Type Documentation
    
+
 
    
 
    
       
-          
+          
    
         
    enum OggzError          enum OggzError
         
    
       
    
 
    
 
    
 
-
    
-Definitions of error return values. 
-
    
-
    Enumerator: 
    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
    Definitions of error return values. 
    
+
    Enumerator: 
    OGGZ_ERR_OK 
-No error. 
    OGGZ_ERR_GENERIC 
-generic error 
    OGGZ_ERR_BAD_OGGZ 
-oggz is not a valid OGGZ 
    OGGZ_ERR_INVALID 
-The requested operation is not suitable for this OGGZ. 
    OGGZ_ERR_NO_STREAMS 
-oggz contains no logical bitstreams 
    OGGZ_ERR_BOS 
-Operation is inappropriate for oggz in current bos state. 
    OGGZ_ERR_EOS 
-Operation is inappropriate for oggz in current eos state. 
    OGGZ_ERR_BAD_METRIC 
-Operation requires a valid metric, but none has been set. 
    OGGZ_ERR_SYSTEM 
-System specific error; check errno for details. 
    OGGZ_ERR_DISABLED 
-Functionality disabled at build time. 
    OGGZ_ERR_NOSEEK 
-Seeking operation is not possible for this OGGZ. 
    OGGZ_ERR_STOP_OK 
-Reading was stopped by an OggzReadCallback returning OGGZ_STOP_OK or writing was stopped by an OggzWriteHungry callback returning OGGZ_STOP_OK. 
    OGGZ_ERR_STOP_ERR 
-Reading was stopped by an OggzReadCallback returning OGGZ_STOP_ERR or writing was stopped by an OggzWriteHungry callback returning OGGZ_STOP_ERR. 
    OGGZ_ERR_IO_AGAIN 
-no data available from IO, try again 
    OGGZ_ERR_HOLE_IN_DATA 
-Hole (sequence number gap) detected in input data. 
    OGGZ_ERR_OUT_OF_MEMORY 
-Out of memory. 
    OGGZ_ERR_BAD_SERIALNO 
-The requested serialno does not exist in this OGGZ. 
    OGGZ_ERR_BAD_BYTES 
-Packet disallowed due to invalid byte length. 
    OGGZ_ERR_BAD_B_O_S 
-Packet disallowed due to invalid b_o_s (beginning of stream) flag. 
    OGGZ_ERR_BAD_E_O_S 
-Packet disallowed due to invalid e_o_s (end of stream) flag. 
    OGGZ_ERR_BAD_GRANULEPOS 
-Packet disallowed due to invalid granulepos. 
    OGGZ_ERR_BAD_PACKETNO 
-Packet disallowed due to invalid packetno. 
    OGGZ_ERR_COMMENT_INVALID 
-Comment violates VorbisComment restrictions. 
    OGGZ_ERR_BAD_GUARD 
-Guard provided by user has non-zero value. 
    OGGZ_ERR_RECURSIVE_WRITE 
-Attempt to call oggz_write() or oggz_write_output() from within a hungry() callback. 
    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    OGGZ_ERR_OK 
+
    No error. 
    
+
    OGGZ_ERR_GENERIC 
+
    generic error 
    
+
    OGGZ_ERR_BAD_OGGZ 
+
    oggz is not a valid OGGZ 
    
+
    OGGZ_ERR_INVALID 
+
    The requested operation is not suitable for this OGGZ. 
    
+
    OGGZ_ERR_NO_STREAMS 
+
    oggz contains no logical bitstreams 
    
+
    OGGZ_ERR_BOS 
+
    Operation is inappropriate for oggz in current bos state. 
    
+
    OGGZ_ERR_EOS 
+
    Operation is inappropriate for oggz in current eos state. 
    
+
    OGGZ_ERR_BAD_METRIC 
+
    Operation requires a valid metric, but none has been set. 
    
+
    OGGZ_ERR_SYSTEM 
+
    System specific error; check errno for details. 
    
+
    OGGZ_ERR_DISABLED 
+
    Functionality disabled at build time. 
    
+
    OGGZ_ERR_NOSEEK 
+
    Seeking operation is not possible for this OGGZ. 
    
+
    OGGZ_ERR_STOP_OK 
+
    Reading was stopped by an OggzReadCallback returning OGGZ_STOP_OK or writing was stopped by an OggzWriteHungry callback returning OGGZ_STOP_OK. 
    
+
    OGGZ_ERR_STOP_ERR 
+
    Reading was stopped by an OggzReadCallback returning OGGZ_STOP_ERR or writing was stopped by an OggzWriteHungry callback returning OGGZ_STOP_ERR. 
    
+
    OGGZ_ERR_IO_AGAIN 
+
    no data available from IO, try again 
    
+
    OGGZ_ERR_HOLE_IN_DATA 
+
    Hole (sequence number gap) detected in input data. 
    
+
    OGGZ_ERR_OUT_OF_MEMORY 
+
    Out of memory. 
    
+
    OGGZ_ERR_BAD_SERIALNO 
+
    The requested serialno does not exist in this OGGZ. 
    
+
    OGGZ_ERR_BAD_BYTES 
+
    Packet disallowed due to invalid byte length. 
    
+
    OGGZ_ERR_BAD_B_O_S 
+
    Packet disallowed due to invalid b_o_s (beginning of stream) flag. 
    
+
    OGGZ_ERR_BAD_E_O_S 
+
    Packet disallowed due to invalid e_o_s (end of stream) flag. 
    
+
    OGGZ_ERR_BAD_GRANULEPOS 
+
    Packet disallowed due to invalid granulepos. 
    
+
    OGGZ_ERR_BAD_PACKETNO 
+
    Packet disallowed due to invalid packetno. 
    
+
    OGGZ_ERR_COMMENT_INVALID 
+
    Comment violates VorbisComment restrictions. 
    
+
    OGGZ_ERR_BAD_GUARD 
+
    Guard provided by user has non-zero value. 
    
+
    OGGZ_ERR_RECURSIVE_WRITE 
+
    Attempt to call oggz_write() or oggz_write_output() from within a hungry() callback. 
    
+
    
 
    
+
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
    
         
    enum OggzFlags          enum OggzFlags
         
    
       
    
 
    
 
    
 
-
    
-Flags to oggz_new(), oggz_open(), and oggz_openfd(). 
-
    
-Can be or'ed together in the following combinations:
      
-
    • OGGZ_READ | OGGZ_AUTO
    • OGGZ_WRITE | OGGZ_NONSTRICT | OGGZ_PREFIX | OGGZ_SUFFIX 
    
-
    Enumerator: 
    
-
-
-
-
-
-
-
+
    Flags to oggz_new(), oggz_open(), and oggz_openfd(). 
    
+
    Can be or'ed together in the following combinations:
    
+
      
+
    • OGGZ_READ | OGGZ_AUTO
      • 
+
    • OGGZ_WRITE | OGGZ_NONSTRICT | OGGZ_PREFIX | OGGZ_SUFFIX 
      • 
+
    
+
    Enumerator: 
    OGGZ_READ 
-Read only. 
    OGGZ_WRITE 
-Write only. 
    OGGZ_NONSTRICT 
-Disable strict adherence to mapping constraints, eg for handling an incomplete stream. 
    OGGZ_AUTO 
-Scan for known headers while reading, and automatically set metrics appropriately. 
-
    
-Opening a file for reading with flags = OGGZ_READ | OGGZ_AUTO will allow seeking on Speex, Vorbis, FLAC, Theora, CMML and all Annodex streams in units of milliseconds, once all bos pages have been delivered. 
    OGGZ_PREFIX 
-Write Prefix: Assume that we are only writing the prefix of an Ogg stream, ie. 
-
    
-disable checking for conformance with end-of-stream constraints. 
    OGGZ_SUFFIX 
-Write Suffix: Assume that we are only writing the suffix of an Ogg stream, ie. 
-
    
-disable checking for conformance with beginning-of-stream constraints. 
    
+
+
+
+
+
+
    OGGZ_READ 
+
    Read only. 
    
+
    OGGZ_WRITE 
+
    Write only. 
    
+
    OGGZ_NONSTRICT 
+
    Disable strict adherence to mapping constraints, eg for handling an incomplete stream. 
    
+
    OGGZ_AUTO 
+
    Scan for known headers while reading, and automatically set metrics appropriately. 
    
+
    Opening a file for reading with flags = OGGZ_READ | OGGZ_AUTO will allow seeking on Speex, Vorbis, FLAC, Theora, CMML and all Annodex streams in units of milliseconds, once all bos pages have been delivered. 
    
+
    OGGZ_PREFIX 
+
    Write Prefix: Assume that we are only writing the prefix of an Ogg stream, ie. 
    
+
    disable checking for conformance with end-of-stream constraints. 
    
+
    OGGZ_SUFFIX 
+
    Write Suffix: Assume that we are only writing the suffix of an Ogg stream, ie. 
    
+
    disable checking for conformance with beginning-of-stream constraints. 
    
+
    
 
    
+
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
    
         
    enum OggzFlushOpts          enum OggzFlushOpts
         
    
       
    
 
    
 
    
 
-
    
-Flush options for oggz_write_feed; can be or'ed together. 
-
    
-
    Enumerator: 
    
-
-
-
+
    Flush options for oggz_write_feed; can be or'ed together. 
    
+
    Enumerator: 
    OGGZ_FLUSH_BEFORE 
-Flush all streams before beginning this packet. 
    OGGZ_FLUSH_AFTER 
-Flush after this packet. 
    
+
+
    OGGZ_FLUSH_BEFORE 
+
    Flush all streams before beginning this packet. 
    
+
    OGGZ_FLUSH_AFTER 
+
    Flush after this packet. 
    
+
    
 
    
+
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
    
         
    enum OggzStopCtl          enum OggzStopCtl
         
    
       
    
 
    
 
    
-
-
    
-
    Enumerator: 
    
-
-
-
-
+
    Enumerator: 
    OGGZ_CONTINUE 
-Continue calling read callbacks. 
    OGGZ_STOP_OK 
-Stop calling callbacks, but retain buffered packet data. 
    OGGZ_STOP_ERR 
-Stop calling callbacks, and purge buffered packet data. 
    
+
+
+
    OGGZ_CONTINUE 
+
    Continue calling read callbacks. 
    
+
    OGGZ_STOP_OK 
+
    Stop calling callbacks, but retain buffered packet data. 
    
+
    OGGZ_STOP_ERR 
+
    Stop calling callbacks, and purge buffered packet data. 
    
+
    
 
    
+
    
 
    
 
 
    
-
    
 
-
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by 
+
+
    Generated on Sat Apr 24 09:13:55 2010 for liboggz by 
 
-doxygen 1.5.6 
    
+doxygen 1.6.3 
    
 
 
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__constants_8h_source.html liboggz-1.1.1/doc/liboggz/html/oggz__constants_8h_source.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__constants_8h_source.html	1970-01-01 00:00:00.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__constants_8h_source.html	2010-04-24 00:13:55.000000000 +0000
@@ -0,0 +1,166 @@
+
+
+
+
+liboggz: oggz_constants.h Source File
+
+
+
+
+
+
+
    Generated on Sat Apr 24 09:13:55 2010 for liboggz by 
+
+doxygen 1.6.3 
    
+
+
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__constants_8h-source.html liboggz-1.1.1/doc/liboggz/html/oggz__constants_8h-source.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__constants_8h-source.html	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__constants_8h-source.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,157 +0,0 @@
-
-
-liboggz: oggz_constants.h Source File
-
-
-
-
-
-
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by 
-
-doxygen 1.5.6 
    
-
-
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__deprecated_8h.html liboggz-1.1.1/doc/liboggz/html/oggz__deprecated_8h.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__deprecated_8h.html	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__deprecated_8h.html	2010-04-24 00:13:55.000000000 +0000
@@ -1,10 +1,13 @@
-
-
+
+
+
+
 liboggz: oggz_deprecated.h File Reference
-
-
-
-
+
+
+
+
+
 
 
    
-
    oggz_deprecated.h File Reference
    Detailed Description
    
-Deprecated interfaces. 
-
    
-
-
    
-
-
    
-Go to the source code of this file.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
    oggz_deprecated.h File Reference
    
+
    Deprecated interfaces.  
+More...
    
+
+
    Go to the source code of this file.
    
+

    Defines
    #define OGGZ_ERR_USER_STOPPED   OGGZ_ERR_STOP_OK
     DEPRECATED CONSTANT.  
    #define OGGZ_ERR_READ_STOP_OK   OGGZ_ERR_STOP_OK
     DEPRECATED CONSTANT.  
    #define OGGZ_ERR_READ_STOP_ERR   OGGZ_ERR_STOP_ERR
     DEPRECATED CONSTANT.  

    Functions
    int oggz_set_metric_linear (OGGZ *oggz, long serialno, ogg_int64_t granule_rate_numerator, ogg_int64_t granule_rate_denominator)
     DEPRECATED FUNCTION This function has been replaced with the more clearly named oggz_set_granulerate().  
    ogg_packet * oggz_comment_generate (OGGZ *oggz, long serialno, OggzStreamContent packet_type, int FLAC_final_metadata_block)
     DEPRECATED FUNCTION This function has been replaced with oggz_comments_generate(), which does not require the packet_type argument.  
    
+
+
+
+
+
+
+
+
+
+
+
+
    Defines
    #define OGGZ_ERR_USER_STOPPED   OGGZ_ERR_STOP_OK
     DEPRECATED CONSTANT.  
    #define OGGZ_ERR_READ_STOP_OK   OGGZ_ERR_STOP_OK
     DEPRECATED CONSTANT.  
    #define OGGZ_ERR_READ_STOP_ERR   OGGZ_ERR_STOP_ERR
     DEPRECATED CONSTANT.  
    Functions
    int oggz_set_metric_linear (OGGZ *oggz, long serialno, ogg_int64_t granule_rate_numerator, ogg_int64_t granule_rate_denominator)
     DEPRECATED FUNCTION This function has been replaced with the more clearly named oggz_set_granulerate().  
    ogg_packet * oggz_comment_generate (OGGZ *oggz, long serialno, OggzStreamContent packet_type, int FLAC_final_metadata_block)
     DEPRECATED FUNCTION This function has been replaced with oggz_comments_generate(), which does not require the packet_type argument.  
    
 
    
-
    Define Documentation
    
-
+
    Detailed Description
    
+
    Deprecated interfaces. 
    
+
    Define Documentation
    
+
 
    
 
    
       
-          
+          
    
         
    #define OGGZ_ERR_READ_STOP_ERR   OGGZ_ERR_STOP_ERR          #define OGGZ_ERR_READ_STOP_ERR   OGGZ_ERR_STOP_ERR
         
    
       
    
 
    
 
    
 
-
    
-DEPRECATED CONSTANT. 
-
    
-OGGZ_ERR_READ_STOP_OK, OGGZ_ERR_READ_STOP_ERR were introduced to allow the user to differentiate between a cancelled oggz_read_*() returning due to error or an ok condition. From 0.9.4 similar functionality was added for oggz_write_*(), hence this constant was renamed. 
+
    DEPRECATED CONSTANT. 
    
+
    OGGZ_ERR_READ_STOP_OK, OGGZ_ERR_READ_STOP_ERR were introduced to allow the user to differentiate between a cancelled oggz_read_*() returning due to error or an ok condition. From 0.9.4 similar functionality was added for oggz_write_*(), hence this constant was renamed. 
    
+
+
    
 
    
-
    
-
+
 
    
 
    
       
-          
+          
    
         
    #define OGGZ_ERR_READ_STOP_OK   OGGZ_ERR_STOP_OK          #define OGGZ_ERR_READ_STOP_OK   OGGZ_ERR_STOP_OK
         
    
       
    
 
    
 
    
 
-
    
-DEPRECATED CONSTANT. 
-
    
-OGGZ_ERR_READ_STOP_OK, OGGZ_ERR_READ_STOP_ERR were introduced to allow the user to differentiate between a cancelled oggz_read_*() returning due to error or an ok condition. From 0.9.4 similar functionality was added for oggz_write_*(), hence this constant was renamed. 
+
    DEPRECATED CONSTANT. 
    
+
    OGGZ_ERR_READ_STOP_OK, OGGZ_ERR_READ_STOP_ERR were introduced to allow the user to differentiate between a cancelled oggz_read_*() returning due to error or an ok condition. From 0.9.4 similar functionality was added for oggz_write_*(), hence this constant was renamed. 
    
+
+
    
 
    
-
    
-
+
 
    
 
    
       
-          
+          
    
         
    #define OGGZ_ERR_USER_STOPPED   OGGZ_ERR_STOP_OK          #define OGGZ_ERR_USER_STOPPED   OGGZ_ERR_STOP_OK
         
    
       
    
 
    
 
    
 
-
    
-DEPRECATED CONSTANT. 
-
    
-OGGZ_ERR_USER_STOPPED was introduced during development (post 0.8.3), and is similar in functionality to and numerically equal to (ie. ABI compatible with) OGGZ_ERR_STOP_OK in <oggz/oggz_constants.h>. It was badly named, as the preferred functionality distinguishes between a user's OggzReadCallback returning OGGZ_STOP_OK or OGGZ_STOP_ERR; your code should distinguish between these two too :-) Hence, don't use this (unreleased) name in new code. 
-
    
-
    
-
    Function Documentation
    
-
+
    DEPRECATED CONSTANT. 
    
+
    OGGZ_ERR_USER_STOPPED was introduced during development (post 0.8.3), and is similar in functionality to and numerically equal to (ie. ABI compatible with) OGGZ_ERR_STOP_OK in <oggz/oggz_constants.h>. It was badly named, as the preferred functionality distinguishes between a user's OggzReadCallback returning OGGZ_STOP_OK or OGGZ_STOP_ERR; your code should distinguish between these two too :-) Hence, don't use this (unreleased) name in new code. 
    
+
+
+
+
    Function Documentation
    
+
 
    
 
    
       
-          
+          
-          
+          
@@ -115,7 +115,7 @@
         
-          
+          
@@ -133,38 +133,39 @@
 
    
 
-
    
-DEPRECATED FUNCTION This function has been replaced with oggz_comments_generate(), which does not require the packet_type argument. 
-
    
-Instead, the packet type is determined by the content type of the stream, which was discovered when the bos packet was passed to oggz_write_feed.
    
-Output a comment packet for the specified stream. 
    Parameters:
    
+
    DEPRECATED FUNCTION This function has been replaced with oggz_comments_generate(), which does not require the packet_type argument. 
    
+
    Instead, the packet type is determined by the content type of the stream, which was discovered when the bos packet was passed to oggz_write_feed.
    
+
    Output a comment packet for the specified stream. 
    
+
    Parameters:
    
   
    
         
    ogg_packet* oggz_comment_generate           ogg_packet* oggz_comment_generate 
           (OGGZ * OGGZ * 
            oggz, 
         
    
         
    
           
           OggzStreamContent OggzStreamContent 
            packet_type, 
         
    
         
    
 
    
     
    oggz A OGGZ* handle (created with OGGZ_WRITE) 
    
     
    serialno Identify a logical bitstream within oggz 
    
     
    packet_type Type of comment packet to generate, FLAC, OggPCM, Speex, Theora and Vorbis are supported 
    
     
    FLAC_final_metadata_block Set this to zero unless the packet_type is FLAC, and there are no further metadata blocks to follow. See note below for details. 
    
   
    
+  
 
-
    Returns:
    A comment packet for the stream. When no longer needed it should be freed with oggz_packet_destroy(). 
    
-
    Return values:
    
+
    Returns:
    A comment packet for the stream. When no longer needed it should be freed with oggz_packet_destroy(). 
    
+
    Return values:
    
   
    
     
    NULL content type does not support comments, not enough memory or comment was too long for FLAC 
    
   
    
+  
    
 
    
-
    Note:
    FLAC streams may contain multiple metadata blocks of different types. When encapsulated in Ogg the first of these must be a Vorbis comment packet but PADDING, APPLICATION, SEEKTABLE, CUESHEET and PICTURE may follow. The last metadata block must have its first bit set to 1. Since liboggz does not know whether you will supply more metadata blocks you must tell it if this is the last (or only) metadata block by setting FLAC_final_metadata_block to 1. 
    
- As FLAC metadata blocks are limited in size to 16MB minus 1 byte, this function will refuse to produce longer comment packets for FLAC. 
    
+
    Note:
    FLAC streams may contain multiple metadata blocks of different types. When encapsulated in Ogg the first of these must be a Vorbis comment packet but PADDING, APPLICATION, SEEKTABLE, CUESHEET and PICTURE may follow. The last metadata block must have its first bit set to 1. Since liboggz does not know whether you will supply more metadata blocks you must tell it if this is the last (or only) metadata block by setting FLAC_final_metadata_block to 1. 
    
+ As FLAC metadata blocks are limited in size to 16MB minus 1 byte, this function will refuse to produce longer comment packets for FLAC. 
    
  See http://flac.sourceforge.net/format.html for more details. 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
+          
@@ -194,30 +195,31 @@
 
    
 
-
    
-DEPRECATED FUNCTION This function has been replaced with the more clearly named oggz_set_granulerate(). 
-
    
-Specify that a logical bitstream has a linear metric 
    Parameters:
    
+
    DEPRECATED FUNCTION This function has been replaced with the more clearly named oggz_set_granulerate(). 
    
+
    Specify that a logical bitstream has a linear metric 
    
+
    Parameters:
    
   
    
         
    int oggz_set_metric_linear           int oggz_set_metric_linear 
           (OGGZ * OGGZ * 
            oggz, 
         
    
         
    
 
    
     
    oggz An OGGZ handle 
    
     
    serialno Identify the logical bitstream in oggz to attach this linear metric to. A value of -1 indicates that the metric should be attached to all unattached logical bitstreams in oggz. 
    
     
    granule_rate_numerator The numerator of the granule rate 
    
     
    granule_rate_denominator The denominator of the granule rate 
    
   
    
+  
 
-
    Returns:
    0 Success 
    
-
    Return values:
    
+
    Returns:
    0 Success 
    
+
    Return values:
    
   
    
     
    OGGZ_ERR_BAD_SERIALNO serialno does not identify an existing logical bitstream in oggz. 
    
     
    OGGZ_ERR_BAD_OGGZ oggz does not refer to an existing OGGZ 
    
   
    
+  
    
 
    
 
 
    
-
    
 
-
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by 
+
+
    Generated on Sat Apr 24 09:13:55 2010 for liboggz by 
 
-doxygen 1.5.6 
    
+doxygen 1.6.3 
    
 
 
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__deprecated_8h_source.html liboggz-1.1.1/doc/liboggz/html/oggz__deprecated_8h_source.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__deprecated_8h_source.html	1970-01-01 00:00:00.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__deprecated_8h_source.html	2010-04-24 00:13:55.000000000 +0000
@@ -0,0 +1,82 @@
+
+
+
+
+liboggz: oggz_deprecated.h Source File
+
+
+
+
+
+
+
    Generated on Sat Apr 24 09:13:55 2010 for liboggz by 
+
+doxygen 1.6.3 
    
+
+
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__deprecated_8h-source.html liboggz-1.1.1/doc/liboggz/html/oggz__deprecated_8h-source.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__deprecated_8h-source.html	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__deprecated_8h-source.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-
-
-liboggz: oggz_deprecated.h Source File
-
-
-
-
-
-
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by 
-
-doxygen 1.5.6 
    
-
-
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__io_8h.html liboggz-1.1.1/doc/liboggz/html/oggz__io_8h.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__io_8h.html	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__io_8h.html	2010-04-24 00:13:55.000000000 +0000
@@ -1,10 +1,13 @@
-
-
+
+
+
+
 liboggz: oggz_io.h File Reference
-
-
-
-
+
+
+
+
+
 
 
    
-
    oggz_io.h File Reference
    Detailed Description
    
-Overriding the functions used for input and output of raw data. 
-
    
-OggzIO provides a way of overriding the functions Oggz uses to access its raw input or output data. This is required in many situations where the raw stream cannot be accessed via stdio, but can be accessed by other means. This is typically useful within media frameworks, where accessing and moving around in the data is possible only using methods provided by the framework.
    
-The functions you provide for overriding IO will be used by Oggz whenever you call oggz_read() or oggz_write(). They will also be used repeatedly by Oggz when you call oggz_seek().
    
-
    Note:
    Opening a file with oggz_open() or oggz_open_stdio() is equivalent to calling oggz_new() and setting stdio based functions for data IO. 
    
-
-
    
-
-
    
-Go to the source code of this file.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
    oggz_io.h File Reference
    
+
    Overriding the functions used for input and output of raw data.  
+More...
    
+
+
    Go to the source code of this file.
    
+

    Typedefs
    typedef size_t(* OggzIORead )(void *user_handle, void *buf, size_t n)
     This is the signature of a function which you provide for Oggz to call when it needs to acquire raw input data.  
    typedef size_t(* OggzIOWrite )(void *user_handle, void *buf, size_t n)
     This is the signature of a function which you provide for Oggz to call when it needs to output raw data.  
    typedef int(* OggzIOSeek )(void *user_handle, long offset, int whence)
     This is the signature of a function which you provide for Oggz to call when it needs to seek on the raw input or output data.  
    typedef long(* OggzIOTell )(void *user_handle)
     This is the signature of a function which you provide for Oggz to call when it needs to determine the current offset of the raw input or output data.  
    typedef int(* OggzIOFlush )(void *user_handle)
     This is the signature of a function which you provide for Oggz to call when it needs to flush the output data.  

    Functions
    int oggz_io_set_read (OGGZ *oggz, OggzIORead read, void *user_handle)
     Set a function for Oggz to call when it needs to read input data.  
    void * oggz_io_get_read_user_handle (OGGZ *oggz)
     Retrieve the user_handle associated with the function you have provided for reading input data.  
    int oggz_io_set_write (OGGZ *oggz, OggzIOWrite write, void *user_handle)
     Set a function for Oggz to call when it needs to write output data.  
    void * oggz_io_get_write_user_handle (OGGZ *oggz)
     Retrieve the user_handle associated with the function you have provided for writing output data.  
    int oggz_io_set_seek (OGGZ *oggz, OggzIOSeek seek, void *user_handle)
     Set a function for Oggz to call when it needs to seek on its raw data.  
    void * oggz_io_get_seek_user_handle (OGGZ *oggz)
     Retrieve the user_handle associated with the function you have provided for seeking on input or output data.  
    int oggz_io_set_tell (OGGZ *oggz, OggzIOTell tell, void *user_handle)
     Set a function for Oggz to call when it needs to determine the offset within its input data (if OGGZ_READ) or output data (if OGGZ_WRITE).  
    void * oggz_io_get_tell_user_handle (OGGZ *oggz)
     Retrieve the user_handle associated with the function you have provided for determining the current offset in input or output data.  
    int oggz_io_set_flush (OGGZ *oggz, OggzIOFlush flush, void *user_handle)
     Set a function for Oggz to call when it needs to flush its output.  
    void * oggz_io_get_flush_user_handle (OGGZ *oggz)
     Retrieve the user_handle associated with the function you have provided for flushing output.  
    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    Typedefs
    typedef size_t(* OggzIORead )(void *user_handle, void *buf, size_t n)
     This is the signature of a function which you provide for Oggz to call when it needs to acquire raw input data.  
    typedef size_t(* OggzIOWrite )(void *user_handle, void *buf, size_t n)
     This is the signature of a function which you provide for Oggz to call when it needs to output raw data.  
    typedef int(* OggzIOSeek )(void *user_handle, long offset, int whence)
     This is the signature of a function which you provide for Oggz to call when it needs to seek on the raw input or output data.  
    typedef long(* OggzIOTell )(void *user_handle)
     This is the signature of a function which you provide for Oggz to call when it needs to determine the current offset of the raw input or output data.  
    typedef int(* OggzIOFlush )(void *user_handle)
     This is the signature of a function which you provide for Oggz to call when it needs to flush the output data.  
    Functions
    int oggz_io_set_read (OGGZ *oggz, OggzIORead read, void *user_handle)
     Set a function for Oggz to call when it needs to read input data.  
    void * oggz_io_get_read_user_handle (OGGZ *oggz)
     Retrieve the user_handle associated with the function you have provided for reading input data.  
    int oggz_io_set_write (OGGZ *oggz, OggzIOWrite write, void *user_handle)
     Set a function for Oggz to call when it needs to write output data.  
    void * oggz_io_get_write_user_handle (OGGZ *oggz)
     Retrieve the user_handle associated with the function you have provided for writing output data.  
    int oggz_io_set_seek (OGGZ *oggz, OggzIOSeek seek, void *user_handle)
     Set a function for Oggz to call when it needs to seek on its raw data.  
    void * oggz_io_get_seek_user_handle (OGGZ *oggz)
     Retrieve the user_handle associated with the function you have provided for seeking on input or output data.  
    int oggz_io_set_tell (OGGZ *oggz, OggzIOTell tell, void *user_handle)
     Set a function for Oggz to call when it needs to determine the offset within its input data (if OGGZ_READ) or output data (if OGGZ_WRITE).  
    void * oggz_io_get_tell_user_handle (OGGZ *oggz)
     Retrieve the user_handle associated with the function you have provided for determining the current offset in input or output data.  
    int oggz_io_set_flush (OGGZ *oggz, OggzIOFlush flush, void *user_handle)
     Set a function for Oggz to call when it needs to flush its output.  
    void * oggz_io_get_flush_user_handle (OGGZ *oggz)
     Retrieve the user_handle associated with the function you have provided for flushing output.  
    
 
    
-
    Typedef Documentation
    
-
+
    Detailed Description
    
+
    Overriding the functions used for input and output of raw data. 
    
+
    OggzIO provides a way of overriding the functions Oggz uses to access its raw input or output data. This is required in many situations where the raw stream cannot be accessed via stdio, but can be accessed by other means. This is typically useful within media frameworks, where accessing and moving around in the data is possible only using methods provided by the framework.
    
+
    The functions you provide for overriding IO will be used by Oggz whenever you call oggz_read() or oggz_write(). They will also be used repeatedly by Oggz when you call oggz_seek().
    
+
    Note:
    Opening a file with oggz_open() or oggz_open_stdio() is equivalent to calling oggz_new() and setting stdio based functions for data IO. 
    
+
    Typedef Documentation
    
+
 
    
 
    
       
-          
+          
    
         
    typedef int(* OggzIOFlush)(void *user_handle)          typedef int(* OggzIOFlush)(void *user_handle)
         
    
       
    
 
    
 
    
 
-
    
-This is the signature of a function which you provide for Oggz to call when it needs to flush the output data. 
-
    
-The behaviour of this function is similar to that of fflush() in stdio.
    
-
    Parameters:
    
+
    This is the signature of a function which you provide for Oggz to call when it needs to flush the output data. 
    
+
    The behaviour of this function is similar to that of fflush() in stdio.
    
+
    Parameters:
    
   
    
     
    user_handle A generic pointer you have provided earlier 
    
   
    
+  
    
 
    
-
    Return values:
    
+
    Return values:
    
   
    
     
    0 Success 
    
     
    <  0 An error condition 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
    
+
 
    
 
    
       
-          
+          
    
         
    typedef size_t(* OggzIORead)(void *user_handle, void *buf, size_t n)          typedef size_t(* OggzIORead)(void *user_handle, void *buf, size_t n)
         
    
       
    
 
    
 
    
 
-
    
-This is the signature of a function which you provide for Oggz to call when it needs to acquire raw input data. 
-
    
-
    Parameters:
    
+
    This is the signature of a function which you provide for Oggz to call when it needs to acquire raw input data. 
    
+
    Parameters:
    
   
    
     
    user_handle A generic pointer you have provided earlier 
    
     
    n The length in bytes that Oggz wants to read 
    
     
    buf The buffer that you read data into 
    
   
    
+  
    
 
    
-
    Return values:
    
+
    Return values:
    
   
    
     
    >  0 The number of bytes successfully read into the buffer 
    
     
    0 to indicate that there is no more data to read (End of file) 
    
     
    <  0 An error condition 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
    
         
    typedef int(* OggzIOSeek)(void *user_handle, long offset, int whence)          typedef int(* OggzIOSeek)(void *user_handle, long offset, int whence)
         
    
       
    
 
    
 
    
 
-
    
-This is the signature of a function which you provide for Oggz to call when it needs to seek on the raw input or output data. 
-
    
-
    Parameters:
    
+
    This is the signature of a function which you provide for Oggz to call when it needs to seek on the raw input or output data. 
    
+
    Parameters:
    
   
    
     
    user_handle A generic pointer you have provided earlier 
    
     
    offset The offset in bytes to seek to 
    
     
    whence SEEK_SET, SEEK_CUR or SEEK_END (as for stdio.h) 
    
   
    
+  
    
 
    
-
    Return values:
    
+
    Return values:
    
   
    
     
    >= 0 The offset seeked to 
    
     
    <  0 An error condition
    
   
    
+  
    
 
    
-
    Note:
    If you provide an OggzIOSeek function, you MUST also provide an OggzIOTell function, or else all your seeks will fail. 
    
+
    Note:
    If you provide an OggzIOSeek function, you MUST also provide an OggzIOTell function, or else all your seeks will fail. 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
    
         
    typedef long(* OggzIOTell)(void *user_handle)          typedef long(* OggzIOTell)(void *user_handle)
         
    
       
    
 
    
 
    
 
-
    
-This is the signature of a function which you provide for Oggz to call when it needs to determine the current offset of the raw input or output data. 
-
    
-
    Parameters:
    
+
    This is the signature of a function which you provide for Oggz to call when it needs to determine the current offset of the raw input or output data. 
    
+
    Parameters:
    
   
    
     
    user_handle A generic pointer you have provided earlier 
    
   
    
+  
    
 
    
-
    Return values:
    
+
    Return values:
    
   
    
     
    >= 0 The offset 
    
     
    <  0 An error condition 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
    
         
    typedef size_t(* OggzIOWrite)(void *user_handle, void *buf, size_t n)          typedef size_t(* OggzIOWrite)(void *user_handle, void *buf, size_t n)
         
    
       
    
 
    
 
    
 
-
    
-This is the signature of a function which you provide for Oggz to call when it needs to output raw data. 
-
    
-
    Parameters:
    
+
    This is the signature of a function which you provide for Oggz to call when it needs to output raw data. 
    
+
    Parameters:
    
   
    
     
    user_handle A generic pointer you have provided earlier 
    
     
    n The length in bytes of the data 
    
     
    buf A buffer containing data to write 
    
   
    
+  
    
 
    
-
    Return values:
    
+
    Return values:
    
   
    
     
    >= 0 The number of bytes successfully written (may be less than n if a write error has occurred) 
    
     
    <  0 An error condition 
    
   
    
+  
    
 
    
 
 
    
-
    
-
    Function Documentation
    
-
+
+
    Function Documentation
    
+
 
    
 
    
       
-          
+          
-          
-          
+          
+          
@@ -243,27 +236,26 @@
 
    
 
-
    
-Retrieve the user_handle associated with the function you have provided for flushing output. 
-
    
-
    Parameters:
    
+
    Retrieve the user_handle associated with the function you have provided for flushing output. 
    
+
    Parameters:
    
   
    
         
    void* oggz_io_get_flush_user_handle           void* oggz_io_get_flush_user_handle 
           (OGGZ *  oggz          OGGZ *  oggz
            ) 
           
         
    
 
    
     
    oggz An OGGZ handle 
    
   
    
+  
 
-
    Returns:
    the associated user_handle 
    
+
    Returns:
    the associated user_handle 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
-          
+          
+          
@@ -271,27 +263,26 @@
 
    
 
-
    
-Retrieve the user_handle associated with the function you have provided for reading input data. 
-
    
-
    Parameters:
    
+
    Retrieve the user_handle associated with the function you have provided for reading input data. 
    
+
    Parameters:
    
   
    
         
    void* oggz_io_get_read_user_handle           void* oggz_io_get_read_user_handle 
           (OGGZ *  oggz          OGGZ *  oggz
            ) 
           
         
    
 
    
     
    oggz An OGGZ handle 
    
   
    
+  
 
-
    Returns:
    the associated user_handle 
    
+
    Returns:
    the associated user_handle 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
-          
+          
+          
@@ -299,27 +290,26 @@
 
    
 
-
    
-Retrieve the user_handle associated with the function you have provided for seeking on input or output data. 
-
    
-
    Parameters:
    
+
    Retrieve the user_handle associated with the function you have provided for seeking on input or output data. 
    
+
    Parameters:
    
   
    
         
    void* oggz_io_get_seek_user_handle           void* oggz_io_get_seek_user_handle 
           (OGGZ *  oggz          OGGZ *  oggz
            ) 
           
         
    
 
    
     
    oggz An OGGZ handle 
    
   
    
+  
 
-
    Returns:
    the associated user_handle 
    
+
    Returns:
    the associated user_handle 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
-          
+          
+          
@@ -327,27 +317,26 @@
 
    
 
-
    
-Retrieve the user_handle associated with the function you have provided for determining the current offset in input or output data. 
-
    
-
    Parameters:
    
+
    Retrieve the user_handle associated with the function you have provided for determining the current offset in input or output data. 
    
+
    Parameters:
    
   
    
         
    void* oggz_io_get_tell_user_handle           void* oggz_io_get_tell_user_handle 
           (OGGZ *  oggz          OGGZ *  oggz
            ) 
           
         
    
 
    
     
    oggz An OGGZ handle 
    
   
    
+  
 
-
    Returns:
    the associated user_handle 
    
+
    Returns:
    the associated user_handle 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
-          
+          
+          
@@ -355,32 +344,31 @@
 
    
 
-
    
-Retrieve the user_handle associated with the function you have provided for writing output data. 
-
    
-
    Parameters:
    
+
    Retrieve the user_handle associated with the function you have provided for writing output data. 
    
+
    Parameters:
    
   
    
         
    void* oggz_io_get_write_user_handle           void* oggz_io_get_write_user_handle 
           (OGGZ *  oggz          OGGZ *  oggz
            ) 
           
         
    
 
    
     
    oggz An OGGZ handle 
    
   
    
+  
 
-
    Returns:
    the associated user_handle 
    
+
    Returns:
    the associated user_handle 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
+          
-          
+          
@@ -398,42 +386,42 @@
 
    
 
-
    
-Set a function for Oggz to call when it needs to flush its output. 
-
    
-The meaning of this is similar to that of fflush() in stdio.
    
-
    Parameters:
    
+
    Set a function for Oggz to call when it needs to flush its output. 
    
+
    The meaning of this is similar to that of fflush() in stdio.
    
+
    Parameters:
    
   
    
         
    int oggz_io_set_flush           int oggz_io_set_flush 
           (OGGZ * OGGZ * 
            oggz, 
         
    
         
    
           
           OggzIOFlush OggzIOFlush 
            flush, 
         
    
         
    
 
    
     
    oggz An OGGZ handle 
    
     
    flush Your flushing function 
    
     
    user_handle Any arbitrary data you wish to pass to the function 
    
   
    
+  
 
-
    Return values:
    
+
    Return values:
    
   
    
     
    0 Success 
    
     
    OGGZ_ERR_BAD_OGGZ oggz does not refer to an existing OGGZ 
    
     
    OGGZ_ERR_INVALID Operation not suitable for this OGGZ; oggz not open for writing. 
    
     
    OGGZ_ERR_OUT_OF_MEMORY Out of memory 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
+          
-          
+          
@@ -451,41 +439,41 @@
 
    
 
-
    
-Set a function for Oggz to call when it needs to read input data. 
-
    
-
    Parameters:
    
+
    Set a function for Oggz to call when it needs to read input data. 
    
+
    Parameters:
    
   
    
         
    int oggz_io_set_read           int oggz_io_set_read 
           (OGGZ * OGGZ * 
            oggz, 
         
    
         
    
           
           OggzIORead OggzIORead 
            read, 
         
    
         
    
 
    
     
    oggz An OGGZ handle 
    
     
    read Your reading function 
    
     
    user_handle Any arbitrary data you wish to pass to the function 
    
   
    
+  
 
-
    Return values:
    
+
    Return values:
    
   
    
     
    0 Success 
    
     
    OGGZ_ERR_BAD_OGGZ oggz does not refer to an existing OGGZ 
    
     
    OGGZ_ERR_INVALID Operation not suitable for this OGGZ; oggz not open for reading. 
    
     
    OGGZ_ERR_OUT_OF_MEMORY Out of memory 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
+          
-          
+          
@@ -503,42 +491,42 @@
 
    
 
-
    
-Set a function for Oggz to call when it needs to seek on its raw data. 
-
    
-
    Parameters:
    
+
    Set a function for Oggz to call when it needs to seek on its raw data. 
    
+
    Parameters:
    
   
    
         
    int oggz_io_set_seek           int oggz_io_set_seek 
           (OGGZ * OGGZ * 
            oggz, 
         
    
         
    
           
           OggzIOSeek OggzIOSeek 
            seek, 
         
    
         
    
 
    
     
    oggz An OGGZ handle 
    
     
    seek Your seeking function 
    
     
    user_handle Any arbitrary data you wish to pass to the function 
    
   
    
+  
 
-
    Return values:
    
+
    Return values:
    
   
    
     
    0 Success 
    
     
    OGGZ_ERR_BAD_OGGZ oggz does not refer to an existing OGGZ 
    
     
    OGGZ_ERR_INVALID Operation not suitable for this OGGZ 
    
     
    OGGZ_ERR_OUT_OF_MEMORY Out of memory
    
   
    
+  
    
 
    
-
    Note:
    If you provide an OggzIOSeek function, you MUST also provide an OggzIOTell function, or else all your seeks will fail. 
    
+
    Note:
    If you provide an OggzIOSeek function, you MUST also provide an OggzIOTell function, or else all your seeks will fail. 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
+          
-          
+          
@@ -556,41 +544,41 @@
 
    
 
-
    
-Set a function for Oggz to call when it needs to determine the offset within its input data (if OGGZ_READ) or output data (if OGGZ_WRITE). 
-
    
-
    Parameters:
    
+
    Set a function for Oggz to call when it needs to determine the offset within its input data (if OGGZ_READ) or output data (if OGGZ_WRITE). 
    
+
    Parameters:
    
   
    
         
    int oggz_io_set_tell           int oggz_io_set_tell 
           (OGGZ * OGGZ * 
            oggz, 
         
    
         
    
           
           OggzIOTell OggzIOTell 
            tell, 
         
    
         
    
 
    
     
    oggz An OGGZ handle 
    
     
    tell Your tell function 
    
     
    user_handle Any arbitrary data you wish to pass to the function 
    
   
    
+  
 
-
    Return values:
    
+
    Return values:
    
   
    
     
    0 Success 
    
     
    OGGZ_ERR_BAD_OGGZ oggz does not refer to an existing OGGZ 
    
     
    OGGZ_ERR_INVALID Operation not suitable for this OGGZ 
    
     
    OGGZ_ERR_OUT_OF_MEMORY Out of memory 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
+          
-          
+          
@@ -608,30 +596,30 @@
 
    
 
-
    
-Set a function for Oggz to call when it needs to write output data. 
-
    
-
    Parameters:
    
+
    Set a function for Oggz to call when it needs to write output data. 
    
+
    Parameters:
    
   
    
         
    int oggz_io_set_write           int oggz_io_set_write 
           (OGGZ * OGGZ * 
            oggz, 
         
    
         
    
           
           OggzIOWrite OggzIOWrite 
            write, 
         
    
         
    
 
    
     
    oggz An OGGZ handle 
    
     
    write Your writing function 
    
     
    user_handle Any arbitrary data you wish to pass to the function 
    
   
    
+  
 
-
    Return values:
    
+
    Return values:
    
   
    
     
    0 Success 
    
     
    OGGZ_ERR_BAD_OGGZ oggz does not refer to an existing OGGZ 
    
     
    OGGZ_ERR_INVALID Operation not suitable for this OGGZ; oggz not open for writing. 
    
     
    OGGZ_ERR_OUT_OF_MEMORY Out of memory 
    
   
    
+  
    
 
    
 
 
    
-
    
 
-
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by 
+
+
    Generated on Sat Apr 24 09:13:55 2010 for liboggz by 
 
-doxygen 1.5.6 
    
+doxygen 1.6.3 
    
 
 
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__io_8h_source.html liboggz-1.1.1/doc/liboggz/html/oggz__io_8h_source.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__io_8h_source.html	1970-01-01 00:00:00.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__io_8h_source.html	2010-04-24 00:13:55.000000000 +0000
@@ -0,0 +1,98 @@
+
+
+
+
+liboggz: oggz_io.h Source File
+
+
+
+
+
+
+
    Generated on Sat Apr 24 09:13:55 2010 for liboggz by 
+
+doxygen 1.6.3 
    
+
+
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__io_8h-source.html liboggz-1.1.1/doc/liboggz/html/oggz__io_8h-source.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__io_8h-source.html	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__io_8h-source.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,89 +0,0 @@
-
-
-liboggz: oggz_io.h Source File
-
-
-
-
-
-
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by 
-
-doxygen 1.5.6 
    
-
-
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__off__t_8h.html liboggz-1.1.1/doc/liboggz/html/oggz__off__t_8h.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__off__t_8h.html	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__off__t_8h.html	2010-04-24 00:13:55.000000000 +0000
@@ -1,10 +1,13 @@
-
-
+
+
+
+
 liboggz: oggz_off_t.h File Reference
-
-
-
-
+
+
+
+
+
 
 
    
-
    oggz_off_t.h File Reference
    Detailed Description
    
-Architecture-dependent type and printf format for file position. 
-
    
-Allows Large File Sizes on systems supporting 64-bit off_t types. 
-
    
-#include <oggz/oggz_off_t_generated.h>
    
+
    oggz_off_t.h File Reference
    
+
    Architecture-dependent type and printf format for file position.  
+More...
    
+#include <oggz/oggz_off_t_generated.h>
    
 
-
    
-Go to the source code of this file.
-
+
    Go to the source code of this file.
    
+
    
 
    
+
    Detailed Description
    
+
    Architecture-dependent type and printf format for file position. 
    
+
    Allows Large File Sizes on systems supporting 64-bit off_t types. 
    
 
    
-
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by 
+
    Generated on Sat Apr 24 09:13:55 2010 for liboggz by 
 
-doxygen 1.5.6 
    
+doxygen 1.6.3 
    
 
 
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__off__t_8h_source.html liboggz-1.1.1/doc/liboggz/html/oggz__off__t_8h_source.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__off__t_8h_source.html	1970-01-01 00:00:00.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__off__t_8h_source.html	2010-04-24 00:13:55.000000000 +0000
@@ -0,0 +1,77 @@
+
+
+
+
+liboggz: oggz_off_t.h Source File
+
+
+
+
+
+
+
    Generated on Sat Apr 24 09:13:55 2010 for liboggz by 
+
+doxygen 1.6.3 
    
+
+
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__off__t_8h-source.html liboggz-1.1.1/doc/liboggz/html/oggz__off__t_8h-source.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__off__t_8h-source.html	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__off__t_8h-source.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-
-
-liboggz: oggz_off_t.h Source File
-
-
-
-
-
-
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by 
-
-doxygen 1.5.6 
    
-
-
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__packet_8h.html liboggz-1.1.1/doc/liboggz/html/oggz__packet_8h.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__packet_8h.html	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__packet_8h.html	2010-04-20 12:55:03.000000000 +0000
@@ -1,10 +1,13 @@
-
-
+
+
+
+
 liboggz: oggz_packet.h File Reference
-
-
-
-
+
+
+
+
+
 
 
    
-
    oggz_packet.h File Reference
    Detailed Description
    
-Packet positioning. 
-
    
-oggz_packet derives from ogg_packet, and includes position information. 
-
    
-
-
    
-Go to the source code of this file.
-
-
-
-
-
-
+
    oggz_packet.h File Reference
    
+
    Packet positioning.  
+More...
    
 
-
+
    Go to the source code of this file.
    
+

    Data Structures
    struct  oggz_position
     The position of an oggz_packet.  More...
    struct  oggz_packet
     An ogg_packet and its position in the stream.  More...
    
+
+
+
+
+
    Data Structures
    struct  oggz_position
     The position of an oggz_packet.  More...
    struct  oggz_packet
     An ogg_packet and its position in the stream.  More...
    
 
    
+
    Detailed Description
    
+
    Packet positioning. 
    
+
    oggz_packet derives from ogg_packet, and includes position information. This positioning information can be copied and used for subsequent calls to oggz_seek_position(). 
    
 
    
-
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by 
+
    Generated on Tue Apr 20 21:55:03 2010 for liboggz by 
 
-doxygen 1.5.6 
    
+doxygen 1.6.3 
    
 
 
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__packet_8h_source.html liboggz-1.1.1/doc/liboggz/html/oggz__packet_8h_source.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__packet_8h_source.html	1970-01-01 00:00:00.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__packet_8h_source.html	2010-04-20 12:55:03.000000000 +0000
@@ -0,0 +1,88 @@
+
+
+
+
+liboggz: oggz_packet.h Source File
+
+
+
+
+
+
+
    Generated on Tue Apr 20 21:55:03 2010 for liboggz by 
+
+doxygen 1.6.3 
    
+
+
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__packet_8h-source.html liboggz-1.1.1/doc/liboggz/html/oggz__packet_8h-source.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__packet_8h-source.html	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__packet_8h-source.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-
-
-liboggz: oggz_packet.h Source File
-
-
-
-
-
-
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by 
-
-doxygen 1.5.6 
    
-
-
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__read_8h.html liboggz-1.1.1/doc/liboggz/html/oggz__read_8h.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__read_8h.html	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__read_8h.html	2010-04-24 00:13:55.000000000 +0000
@@ -1,10 +1,13 @@
-
-
+
+
+
+
 liboggz: oggz_read.h File Reference
-
-
-
-
+
+
+
+
+
 
 
    
-
    oggz_read.h File Reference
    Detailed Description
    
-Interfaces for reading Ogg files and streams. 
-
    
-
-
    
-#include <oggz/oggz_packet.h>
    
-
-
    
-Go to the source code of this file.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
    oggz_read.h File Reference
    
+
    Interfaces for reading Ogg files and streams.  
+More...
    
+
+
    Go to the source code of this file.
    
+

    Typedefs
    typedef int(* OggzReadPacket )(OGGZ *oggz, oggz_packet *packet, long serialno, void *user_data)
     This is the signature of a callback which you must provide for Oggz to call whenever it finds a new packet in the Ogg stream associated with oggz.  
    typedef int(* OggzReadPage )(OGGZ *oggz, const ogg_page *og, long serialno, void *user_data)
     This is the signature of a callback which you must provide for Oggz to call whenever it finds a new page in the Ogg stream associated with oggz.  

    Functions
    int oggz_set_read_callback (OGGZ *oggz, long serialno, OggzReadPacket read_packet, void *user_data)
     Set a callback for Oggz to call when a new Ogg packet is found in the stream.  
    int oggz_set_read_page (OGGZ *oggz, long serialno, OggzReadPage read_page, void *user_data)
     Set a callback for Oggz to call when a new Ogg page is found in the stream.  
    long oggz_read (OGGZ *oggz, long n)
     Read n bytes into oggz, calling any read callbacks on the fly.  
    long oggz_read_input (OGGZ *oggz, unsigned char *buf, long n)
     Input data into oggz.  
    int oggz_purge (OGGZ *oggz)
     Erase any input buffered in Oggz.  
    OggzStreamContent oggz_stream_get_content (OGGZ *oggz, long serialno)
     Determine the content type of the oggz stream referred to by serialno.  
    const char * oggz_stream_get_content_type (OGGZ *oggz, long serialno)
     Return human-readable string representation of content type of oggz stream referred to by serialno.  
    int oggz_stream_get_numheaders (OGGZ *oggz, long serialno)
     Determine the number of headers of the oggz stream referred to by serialno.  
    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    Typedefs
    typedef int(* OggzReadPacket )(OGGZ *oggz, ogg_packet *op, long serialno, void *user_data)
     This is the signature of a callback which you must provide for Oggz to call whenever it finds a new packet in the Ogg stream associated with oggz.  
    typedef int(* OggzReadPage )(OGGZ *oggz, const ogg_page *og, long serialno, void *user_data)
     This is the signature of a callback which you must provide for Oggz to call whenever it finds a new page in the Ogg stream associated with oggz.  
    Functions
    int oggz_set_read_callback (OGGZ *oggz, long serialno, OggzReadPacket read_packet, void *user_data)
     Set a callback for Oggz to call when a new Ogg packet is found in the stream.  
    int oggz_set_read_page (OGGZ *oggz, long serialno, OggzReadPage read_page, void *user_data)
     Set a callback for Oggz to call when a new Ogg page is found in the stream.  
    long oggz_read (OGGZ *oggz, long n)
     Read n bytes into oggz, calling any read callbacks on the fly.  
    long oggz_read_input (OGGZ *oggz, unsigned char *buf, long n)
     Input data into oggz.  
    int oggz_purge (OGGZ *oggz)
     Erase any input buffered in Oggz.  
    OggzStreamContent oggz_stream_get_content (OGGZ *oggz, long serialno)
     Determine the content type of the oggz stream referred to by serialno.  
    const char * oggz_stream_get_content_type (OGGZ *oggz, long serialno)
     Return human-readable string representation of content type of oggz stream referred to by serialno.  
    int oggz_stream_get_numheaders (OGGZ *oggz, long serialno)
     Determine the number of headers of the oggz stream referred to by serialno.  
    
 
    
-
    Function Documentation
    
-
+
    Detailed Description
    
+
    Interfaces for reading Ogg files and streams. 
    
+
    Function Documentation
    
+
 
    
 
    
       
-          
+          
-          
-          
+          
+          
@@ -76,34 +73,34 @@
 
    
 
-
    
-Erase any input buffered in Oggz. 
-
    
-This discards any input read from the underlying IO system but not yet delivered as ogg_packets.
    
-
    Parameters:
    
+
    Erase any input buffered in Oggz. 
    
+
    This discards any input read from the underlying IO system but not yet delivered as ogg_packets.
    
+
    Parameters:
    
   
    
         
    int oggz_purge           int oggz_purge 
           (OGGZ *  oggz          OGGZ *  oggz
            ) 
           
         
    
 
    
     
    oggz An OGGZ handle 
    
   
    
+  
 
-
    Return values:
    
+
    Return values:
    
   
    
     
    0 Success 
    
     
    OGGZ_ERR_SYSTEM Error seeking on underlying IO. 
    
     
    OGGZ_ERR_BAD_OGGZ oggz does not refer to an existing OGGZ 
    
     
    OGGZ_ERR_INVALID Operation not suitable for this OGGZ 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
    
+
 
    
 
    
       
-          
+          
-          
+          
@@ -121,33 +118,33 @@
 
    
 
-
    
-Determine the content type of the oggz stream referred to by serialno. 
-
    
-
    Parameters:
    
+
    Determine the content type of the oggz stream referred to by serialno. 
    
+
    Parameters:
    
   
    
         
    OggzStreamContent oggz_stream_get_content           OggzStreamContent oggz_stream_get_content 
           (OGGZ * OGGZ * 
            oggz, 
         
    
         
    
 
    
     
    oggz An OGGZ handle 
    
     
    serialno An ogg stream serialno 
    
   
    
+  
 
-
    Return values:
    
+
    Return values:
    
   
    
     
    OGGZ_CONTENT_THEORA..OGGZ_CONTENT_UNKNOWN content successfully identified 
    
     
    OGGZ_ERR_BAD_OGGZ oggz does not refer to an existing OGGZ 
    
     
    OGGZ_ERR_BAD_SERIALNO serialno does not refer to an existing stream 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
+          
@@ -165,32 +162,32 @@
 
    
 
-
    
-Return human-readable string representation of content type of oggz stream referred to by serialno. 
-
    
-
    Parameters:
    
+
    Return human-readable string representation of content type of oggz stream referred to by serialno. 
    
+
    Parameters:
    
   
    
         
    const char* oggz_stream_get_content_type           const char* oggz_stream_get_content_type 
           (OGGZ * OGGZ * 
            oggz, 
         
    
         
    
 
    
     
    oggz An OGGZ handle 
    
     
    serialno An ogg stream serialno 
    
   
    
+  
 
-
    Return values:
    
+
    Return values:
    
   
    
     
    string the name of the content type 
    
     
    NULL oggz or serialno invalid 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
+          
@@ -208,28 +205,28 @@
 
    
 
-
    
-Determine the number of headers of the oggz stream referred to by serialno. 
-
    
-
    Parameters:
    
+
    Determine the number of headers of the oggz stream referred to by serialno. 
    
+
    Parameters:
    
   
    
         
    int oggz_stream_get_numheaders           int oggz_stream_get_numheaders 
           (OGGZ * OGGZ * 
            oggz, 
         
    
         
    
 
    
     
    oggz An OGGZ handle 
    
     
    serialno An ogg stream serialno 
    
   
    
+  
 
-
    Return values:
    
+
    Return values:
    
   
    
     
    OGGZ_CONTENT_THEORA..OGGZ_CONTENT_UNKNOWN content successfully identified 
    
     
    OGGZ_ERR_BAD_OGGZ oggz does not refer to an existing OGGZ 
    
     
    OGGZ_ERR_BAD_SERIALNO serialno does not refer to an existing stream 
    
   
    
+  
    
 
    
 
 
    
-
    
 
-
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by 
+
+
    Generated on Sat Apr 24 09:13:55 2010 for liboggz by 
 
-doxygen 1.5.6 
    
+doxygen 1.6.3 
    
 
 
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__read_8h_source.html liboggz-1.1.1/doc/liboggz/html/oggz__read_8h_source.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__read_8h_source.html	1970-01-01 00:00:00.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__read_8h_source.html	2010-04-24 00:13:55.000000000 +0000
@@ -0,0 +1,92 @@
+
+
+
+
+liboggz: oggz_read.h Source File
+
+
+
+
+
+
+
    Generated on Sat Apr 24 09:13:55 2010 for liboggz by 
+
+doxygen 1.6.3 
    
+
+
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__read_8h-source.html liboggz-1.1.1/doc/liboggz/html/oggz__read_8h-source.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__read_8h-source.html	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__read_8h-source.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,85 +0,0 @@
-
-
-liboggz: oggz_read.h Source File
-
-
-
-
-
-
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by 
-
-doxygen 1.5.6 
    
-
-
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__seek_8h.html liboggz-1.1.1/doc/liboggz/html/oggz__seek_8h.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__seek_8h.html	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__seek_8h.html	2010-04-24 00:13:55.000000000 +0000
@@ -1,10 +1,13 @@
-
-
+
+
+
+
 liboggz: oggz_seek.h File Reference
-
-
-
-
+
+
+
+
+
 
 
    
-
    oggz_seek.h File Reference
    Detailed Description
    
-Seeking within files. 
-
    
-
-
    
-
-
    
-Go to the source code of this file.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
    oggz_seek.h File Reference
    
+
    Seeking within files.  
+More...
    
+
+
    Go to the source code of this file.
    
+

    Typedefs
    typedef ogg_int64_t(* OggzMetric )(OGGZ *oggz, long serialno, ogg_int64_t granulepos, void *user_data)
     This is the signature of a function to correlate Ogg streams.  

    Functions
    ogg_int64_t oggz_tell_units (OGGZ *oggz)
     Query the current offset in milliseconds, or custom units as specified by a Metric function you have provided.  
    ogg_int64_t oggz_seek_units (OGGZ *oggz, ogg_int64_t units, int whence)
     Seek to an offset in milliseconds, or custom units as specified by a Metric function you have provided.  
    ogg_int64_t oggz_tell_granulepos (OGGZ *oggz)
     Provide the exact stored granulepos (from the page header) if relevant to the current packet, or a constructed granulepos if the stored granulepos does not belong to this packet, or -1 if this codec does not have support for granulepos interpolation.  
    oggz_off_t oggz_tell (OGGZ *oggz)
     Query the file offset in bytes corresponding to the data read.  
    oggz_off_t oggz_seek (OGGZ *oggz, oggz_off_t offset, int whence)
     Seek to a specific byte offset.  
    int oggz_get_preroll (OGGZ *oggz, long serialno)
     Retrieve the preroll of a logical bitstream.  
    int oggz_set_preroll (OGGZ *oggz, long serialno, int preroll)
     Specify the preroll of a logical bitstream.  
    int oggz_get_granuleshift (OGGZ *oggz, long serialno)
     Retrieve the granuleshift of a logical bitstream.  
    int oggz_set_granuleshift (OGGZ *oggz, long serialno, int granuleshift)
     Specify the granuleshift of a logical bitstream.  
    int oggz_get_granulerate (OGGZ *oggz, long serialno, ogg_int64_t *granulerate_n, ogg_int64_t *granulerate_d)
     Retrieve the granulerate of a logical bitstream.  
    int oggz_set_granulerate (OGGZ *oggz, long serialno, ogg_int64_t granule_rate_numerator, ogg_int64_t granule_rate_denominator)
     Specify the granulerate of a logical bitstream.  
    int oggz_set_metric (OGGZ *oggz, long serialno, OggzMetric metric, void *user_data)
     Set the OggzMetric to use for an OGGZ handle.  
    int oggz_set_data_start (OGGZ *oggz, oggz_off_t offset)
     Tell Oggz to remember the given offset as the start of data.  
    ogg_int64_t oggz_bounded_seek_set (OGGZ *oggz, ogg_int64_t unit_target, ogg_int64_t offset_begin, ogg_int64_t offset_end)
     Seeks Oggz to time unit_target, but with the bounds of the offset range [offset_begin, offset_end].  
    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    Typedefs
    typedef ogg_int64_t(* OggzMetric )(OGGZ *oggz, long serialno, ogg_int64_t granulepos, void *user_data)
     This is the signature of a function to correlate Ogg streams.  
    Functions
    ogg_int64_t oggz_tell_units (OGGZ *oggz)
     Query the current offset in milliseconds, or custom units as specified by a Metric function you have provided.  
    ogg_int64_t oggz_seek_units (OGGZ *oggz, ogg_int64_t units, int whence)
     Seek to an offset in milliseconds, or custom units as specified by a Metric function you have provided.  
    ogg_int64_t oggz_tell_granulepos (OGGZ *oggz)
     Provide the exact stored granulepos (from the page header) if relevant to the current packet, or a constructed granulepos if the stored granulepos does not belong to this packet, or -1 if this codec does not have support for granulepos interpolation.  
    oggz_off_t oggz_tell (OGGZ *oggz)
     Query the file offset in bytes corresponding to the data read.  
    oggz_off_t oggz_seek (OGGZ *oggz, oggz_off_t offset, int whence)
     Seek to a specific byte offset.  
    int oggz_get_preroll (OGGZ *oggz, long serialno)
     Retrieve the preroll of a logical bitstream.  
    int oggz_set_preroll (OGGZ *oggz, long serialno, int preroll)
     Specify the preroll of a logical bitstream.  
    int oggz_get_granuleshift (OGGZ *oggz, long serialno)
     Retrieve the granuleshift of a logical bitstream.  
    int oggz_set_granuleshift (OGGZ *oggz, long serialno, int granuleshift)
     Specify the granuleshift of a logical bitstream.  
    int oggz_get_granulerate (OGGZ *oggz, long serialno, ogg_int64_t *granulerate_n, ogg_int64_t *granulerate_d)
     Retrieve the granulerate of a logical bitstream.  
    int oggz_set_granulerate (OGGZ *oggz, long serialno, ogg_int64_t granule_rate_numerator, ogg_int64_t granule_rate_denominator)
     Specify the granulerate of a logical bitstream.  
    int oggz_set_metric (OGGZ *oggz, long serialno, OggzMetric metric, void *user_data)
     Set the OggzMetric to use for an OGGZ handle.  
    int oggz_set_data_start (OGGZ *oggz, oggz_off_t offset)
     Tell Oggz to remember the given offset as the start of data.  
    ogg_int64_t oggz_bounded_seek_set (OGGZ *oggz, ogg_int64_t unit_target, ogg_int64_t offset_begin, ogg_int64_t offset_end)
     Seeks Oggz to time unit_target, but with the bounds of the offset range [offset_begin, offset_end].  
    
 
    
-
    Function Documentation
    
-
+
    Detailed Description
    
+
    Seeking within files. 
    
+
    Function Documentation
    
+
 
    
 
    
       
-          
+          
-          
+          
@@ -111,29 +104,30 @@
 
    
 
-
    
-Seeks Oggz to time unit_target, but with the bounds of the offset range [offset_begin, offset_end]. 
-
    
-This is useful when seeking in network streams where only parts of a media are buffered, and retrieving unbuffered parts is expensive. 
    Parameters:
    
+
    Seeks Oggz to time unit_target, but with the bounds of the offset range [offset_begin, offset_end]. 
    
+
    This is useful when seeking in network streams where only parts of a media are buffered, and retrieving unbuffered parts is expensive. 
    
+
    Parameters:
    
   
    
         
    ogg_int64_t oggz_bounded_seek_set           ogg_int64_t oggz_bounded_seek_set 
           (OGGZ * OGGZ * 
            oggz, 
         
    
         
    
 
    
     
    oggz An OGGZ handle previously opened for reading 
    
     
    unit_target The seek target, in milliseconds, or custom units 
    
     
    offset_begin Start of offset range to seek inside, in bytes 
    
     
    offset_end End of offset range to seek inside, in bytes, pass -1 for end of media 
    
   
    
+  
 
-
    Returns:
    The new position, in milliseconds or custom units 
    
-
    Return values:
    
+
    Returns:
    The new position, in milliseconds or custom units 
    
+
    Return values:
    
   
    
     
    -1 on failure (unit_target is not within range) 
    
   
    
+  
    
 
    
 
 
    
-
    
 
    
-
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by 
+
+
    Generated on Sat Apr 24 09:13:55 2010 for liboggz by 
 
-doxygen 1.5.6 
    
+doxygen 1.6.3 
    
 
 
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__seek_8h_source.html liboggz-1.1.1/doc/liboggz/html/oggz__seek_8h_source.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__seek_8h_source.html	1970-01-01 00:00:00.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__seek_8h_source.html	2010-04-24 00:13:55.000000000 +0000
@@ -0,0 +1,122 @@
+
+
+
+
+liboggz: oggz_seek.h Source File
+
+
+
+
+
+
+
    Generated on Sat Apr 24 09:13:55 2010 for liboggz by 
+
+doxygen 1.6.3 
    
+
+
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__seek_8h-source.html liboggz-1.1.1/doc/liboggz/html/oggz__seek_8h-source.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__seek_8h-source.html	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__seek_8h-source.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,113 +0,0 @@
-
-
-liboggz: oggz_seek.h Source File
-
-
-
-
-
-
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by 
-
-doxygen 1.5.6 
    
-
-
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__stream_8h.html liboggz-1.1.1/doc/liboggz/html/oggz__stream_8h.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__stream_8h.html	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__stream_8h.html	2010-04-24 00:13:55.000000000 +0000
@@ -1,10 +1,13 @@
-
-
+
+
+
+
 liboggz: oggz_stream.h File Reference
-
-
-
-
+
+
+
+
+
 
 
    
-
    oggz_stream.h File Reference
    Detailed Description
    
-Interfaces for querying Ogg streams. 
-
    
-
-
    
-
-
    
-Go to the source code of this file.
-
-
-
-
-
-
-
-
-
-
-
+
    oggz_stream.h File Reference
    
+
    Interfaces for querying Ogg streams.  
+More...
    
+
+
    Go to the source code of this file.
    
+

    Functions
    OggzStreamContent oggz_stream_get_content (OGGZ *oggz, long serialno)
     Determine the content type of the oggz stream referred to by serialno.  
    const char * oggz_stream_get_content_type (OGGZ *oggz, long serialno)
     Return human-readable string representation of content type of oggz stream referred to by serialno.  
    int oggz_stream_get_numheaders (OGGZ *oggz, long serialno)
     Determine the number of headers of the oggz stream referred to by serialno.  
    
+
+
+
+
+
+
+
    Functions
    OggzStreamContent oggz_stream_get_content (OGGZ *oggz, long serialno)
     Determine the content type of the oggz stream referred to by serialno.  
    const char * oggz_stream_get_content_type (OGGZ *oggz, long serialno)
     Return human-readable string representation of content type of oggz stream referred to by serialno.  
    int oggz_stream_get_numheaders (OGGZ *oggz, long serialno)
     Determine the number of headers of the oggz stream referred to by serialno.  
    
 
    
-
    Function Documentation
    
-
+
    Detailed Description
    
+
    Interfaces for querying Ogg streams. 
    
+
    Function Documentation
    
+
 
    
 
    
       
-          
+          
-          
+          
@@ -62,33 +67,33 @@
 
    
 
-
    
-Determine the content type of the oggz stream referred to by serialno. 
-
    
-
    Parameters:
    
+
    Determine the content type of the oggz stream referred to by serialno. 
    
+
    Parameters:
    
   
    
         
    OggzStreamContent oggz_stream_get_content           OggzStreamContent oggz_stream_get_content 
           (OGGZ * OGGZ * 
            oggz, 
         
    
         
    
 
    
     
    oggz An OGGZ handle 
    
     
    serialno An ogg stream serialno 
    
   
    
+  
 
-
    Return values:
    
+
    Return values:
    
   
    
     
    OGGZ_CONTENT_THEORA..OGGZ_CONTENT_UNKNOWN content successfully identified 
    
     
    OGGZ_ERR_BAD_OGGZ oggz does not refer to an existing OGGZ 
    
     
    OGGZ_ERR_BAD_SERIALNO serialno does not refer to an existing stream 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
    
+
 
    
 
    
       
-          
+          
-          
+          
@@ -106,32 +111,32 @@
 
    
 
-
    
-Return human-readable string representation of content type of oggz stream referred to by serialno. 
-
    
-
    Parameters:
    
+
    Return human-readable string representation of content type of oggz stream referred to by serialno. 
    
+
    Parameters:
    
   
    
         
    const char* oggz_stream_get_content_type           const char* oggz_stream_get_content_type 
           (OGGZ * OGGZ * 
            oggz, 
         
    
         
    
 
    
     
    oggz An OGGZ handle 
    
     
    serialno An ogg stream serialno 
    
   
    
+  
 
-
    Return values:
    
+
    Return values:
    
   
    
     
    string the name of the content type 
    
     
    NULL oggz or serialno invalid 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
+          
@@ -149,28 +154,28 @@
 
    
 
-
    
-Determine the number of headers of the oggz stream referred to by serialno. 
-
    
-
    Parameters:
    
+
    Determine the number of headers of the oggz stream referred to by serialno. 
    
+
    Parameters:
    
   
    
         
    int oggz_stream_get_numheaders           int oggz_stream_get_numheaders 
           (OGGZ * OGGZ * 
            oggz, 
         
    
         
    
 
    
     
    oggz An OGGZ handle 
    
     
    serialno An ogg stream serialno 
    
   
    
+  
 
-
    Return values:
    
+
    Return values:
    
   
    
     
    OGGZ_CONTENT_THEORA..OGGZ_CONTENT_UNKNOWN content successfully identified 
    
     
    OGGZ_ERR_BAD_OGGZ oggz does not refer to an existing OGGZ 
    
     
    OGGZ_ERR_BAD_SERIALNO serialno does not refer to an existing stream 
    
   
    
+  
    
 
    
 
 
    
-
    
 
-
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by 
+
+
    Generated on Sat Apr 24 09:13:55 2010 for liboggz by 
 
-doxygen 1.5.6 
    
+doxygen 1.6.3 
    
 
 
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__stream_8h_source.html liboggz-1.1.1/doc/liboggz/html/oggz__stream_8h_source.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__stream_8h_source.html	1970-01-01 00:00:00.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__stream_8h_source.html	2010-04-24 00:13:55.000000000 +0000
@@ -0,0 +1,72 @@
+
+
+
+
+liboggz: oggz_stream.h Source File
+
+
+
+
+
+
+
    Generated on Sat Apr 24 09:13:55 2010 for liboggz by 
+
+doxygen 1.6.3 
    
+
+
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__stream_8h-source.html liboggz-1.1.1/doc/liboggz/html/oggz__stream_8h-source.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__stream_8h-source.html	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__stream_8h-source.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-
-
-liboggz: oggz_stream.h Source File
-
-
-
-
-
-
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by 
-
-doxygen 1.5.6 
    
-
-
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__table_8h.html liboggz-1.1.1/doc/liboggz/html/oggz__table_8h.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__table_8h.html	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__table_8h.html	2010-04-24 00:13:55.000000000 +0000
@@ -1,10 +1,13 @@
-
-
+
+
+
+
 liboggz: oggz_table.h File Reference
-
-
-
-
+
+
+
+
+
 
 
    
-
    oggz_table.h File Reference
    Detailed Description
    
-A lookup table. 
-
    
-OggzTable is provided for convenience to allow the storage of serialno-specific data. 
-
    
-
-
    
-Go to the source code of this file.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
    oggz_table.h File Reference
    
+
    A lookup table.  
+More...
    
+
+
    Go to the source code of this file.
    
+

    Typedefs
    
-typedef void OggzTable
     A table of key-value pairs. 

    Functions
    OggzTable * oggz_table_new (void)
     Instantiate a new OggzTable.  
    void oggz_table_delete (OggzTable *table)
     Delete an OggzTable.  
    void * oggz_table_insert (OggzTable *table, long key, void *data)
     Insert an element into a table.  
    int oggz_table_remove (OggzTable *table, long key)
     Remove the element of an OggzTable indexed by a given key.  
    void * oggz_table_lookup (OggzTable *table, long key)
     Retrieve the element of an OggzTable indexed by a given key.  
    int oggz_table_size (OggzTable *table)
     Query the number of elements in an OggzTable.  
    void * oggz_table_nth (OggzTable *table, int n, long *key)
     Retrieve the nth element of an OggzTable, and optionally its key.  
    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    Typedefs
    
+typedef void OggzTable
     A table of key-value pairs. 
    Functions
    OggzTable * oggz_table_new (void)
     Instantiate a new OggzTable.  
    void oggz_table_delete (OggzTable *table)
     Delete an OggzTable.  
    void * oggz_table_insert (OggzTable *table, long key, void *data)
     Insert an element into a table.  
    int oggz_table_remove (OggzTable *table, long key)
     Remove the element of an OggzTable indexed by a given key.  
    void * oggz_table_lookup (OggzTable *table, long key)
     Retrieve the element of an OggzTable indexed by a given key.  
    int oggz_table_size (OggzTable *table)
     Query the number of elements in an OggzTable.  
    void * oggz_table_nth (OggzTable *table, int n, long *key)
     Retrieve the nth element of an OggzTable, and optionally its key.  
    
 
    
-
    Function Documentation
    
-
+
    Detailed Description
    
+
    A lookup table. 
    
+
    OggzTable is provided for convenience to allow the storage of serialno-specific data. 
    
+
    Function Documentation
    
+
 
    
 
    
       
-          
+          
-          
-          
+          
+          
@@ -70,25 +71,24 @@
 
    
 
-
    
-Delete an OggzTable. 
-
    
-
    Parameters:
    
+
    Delete an OggzTable. 
    
+
    Parameters:
    
   
    
         
    void oggz_table_delete           void oggz_table_delete 
           (OggzTable *  table          OggzTable *  table
            ) 
           
         
    
 
    
     
    table An OggzTable 
    
   
    
+  
 
 
 
    
-
    
-
+
    
+
 
    
 
    
       
-          
+          
-          
+          
@@ -112,33 +112,34 @@
 
    
 
-
    
-Insert an element into a table. 
-
    
-If a previous value existed for this key, it is overwritten with the new data element. 
    Parameters:
    
+
    Insert an element into a table. 
    
+
    If a previous value existed for this key, it is overwritten with the new data element. 
    
+
    Parameters:
    
   
    
         
    void* oggz_table_insert           void* oggz_table_insert 
           (OggzTable * OggzTable * 
            table, 
         
    
         
    
 
    
     
    table An OggzTable 
    
     
    key Key to access this data element 
    
     
    data The new element to add 
    
   
    
+  
 
-
    Return values:
    
+
    Return values:
    
   
    
     
    data If the element was successfully added 
    
     
    NULL If adding the element failed due to a realloc() error 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
+          
@@ -156,33 +157,33 @@
 
    
 
-
    
-Retrieve the element of an OggzTable indexed by a given key. 
-
    
-
    Parameters:
    
+
    Retrieve the element of an OggzTable indexed by a given key. 
    
+
    Parameters:
    
   
    
         
    void* oggz_table_lookup           void* oggz_table_lookup 
           (OggzTable * OggzTable * 
            table, 
         
    
         
    
 
    
     
    table An OggzTable 
    
     
    key a key 
    
   
    
+  
 
-
    Returns:
    The element indexed by key 
    
-
    Return values:
    
+
    Returns:
    The element indexed by key 
    
+
    Return values:
    
   
    
     
    NULL table is undefined, or no element is indexed by key 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
+          
@@ -190,26 +191,25 @@
 
    
 
-
    
-Instantiate a new OggzTable. 
-
    
-
    Returns:
    A new OggzTable 
    
-
    Return values:
    
+
    Instantiate a new OggzTable. 
    
+
    Returns:
    A new OggzTable 
    
+
    Return values:
    
   
    
         
    OggzTable* oggz_table_new           OggzTable* oggz_table_new 
           (
           void           
            ) 
           
         
    
 
    
     
    NULL Could not allocate memory for table 
    
   
    
+  
 
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
+          
@@ -233,33 +233,33 @@
 
    
 
-
    
-Retrieve the nth element of an OggzTable, and optionally its key. 
-
    
-
    Parameters:
    
+
    Retrieve the nth element of an OggzTable, and optionally its key. 
    
+
    Parameters:
    
   
    
         
    void* oggz_table_nth           void* oggz_table_nth 
           (OggzTable * OggzTable * 
            table, 
         
    
         
    
 
    
     
    table An OggzTable 
    
     
    n An index into the table 
    
     
    key Return pointer for key corresponding to nth data element of table. Ignored if NULL. 
    
   
    
+  
 
-
    Returns:
    The nth data element of table 
    
-
    Return values:
    
+
    Returns:
    The nth data element of table 
    
+
    Return values:
    
   
    
     
    NULL table is undefined, or n is out of range 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
+          
@@ -277,33 +277,33 @@
 
    
 
-
    
-Remove the element of an OggzTable indexed by a given key. 
-
    
-
    Parameters:
    
+
    Remove the element of an OggzTable indexed by a given key. 
    
+
    Parameters:
    
   
    
         
    int oggz_table_remove           int oggz_table_remove 
           (OggzTable * OggzTable * 
            table, 
         
    
         
    
 
    
     
    table An OggzTable 
    
     
    key a key 
    
   
    
+  
 
-
    Return values:
    
+
    Return values:
    
   
    
     
    0 Success 
    
     
    -1 Not found 
    
   
    
+  
    
 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
-          
-          
+          
+          
@@ -311,21 +311,20 @@
 
    
 
-
    
-Query the number of elements in an OggzTable. 
-
    
-
    Parameters:
    
+
    Query the number of elements in an OggzTable. 
    
+
    Parameters:
    
   
    
         
    int oggz_table_size           int oggz_table_size 
           (OggzTable *  table          OggzTable *  table
            ) 
           
         
    
 
    
     
    table An OggzTable 
    
   
    
+  
 
-
    Returns:
    the number of elements in table 
    
+
    Returns:
    the number of elements in table 
    
 
 
    
-
    
 
-
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by 
+
+
    Generated on Sat Apr 24 09:13:55 2010 for liboggz by 
 
-doxygen 1.5.6 
    
+doxygen 1.6.3 
    
 
 
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__table_8h_source.html liboggz-1.1.1/doc/liboggz/html/oggz__table_8h_source.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__table_8h_source.html	1970-01-01 00:00:00.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__table_8h_source.html	2010-04-24 00:13:55.000000000 +0000
@@ -0,0 +1,90 @@
+
+
+
+
+liboggz: oggz_table.h Source File
+
+
+
+
+
+
+
    Generated on Sat Apr 24 09:13:55 2010 for liboggz by 
+
+doxygen 1.6.3 
    
+
+
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__table_8h-source.html liboggz-1.1.1/doc/liboggz/html/oggz__table_8h-source.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__table_8h-source.html	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__table_8h-source.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-
-
-liboggz: oggz_table.h Source File
-
-
-
-
-
-
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by 
-
-doxygen 1.5.6 
    
-
-
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__write_8h.html liboggz-1.1.1/doc/liboggz/html/oggz__write_8h.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__write_8h.html	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__write_8h.html	2010-04-24 00:13:55.000000000 +0000
@@ -1,10 +1,13 @@
-
-
+
+
+
+
 liboggz: oggz_write.h File Reference
-
-
-
-
+
+
+
+
+
 
 
    
-
    oggz_write.h File Reference
    Detailed Description
    
-Interfaces for writing Ogg files and streams. 
-
    
-
-
    
-
-
    
-Go to the source code of this file.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
    oggz_write.h File Reference
    
+
    Interfaces for writing Ogg files and streams.  
+More...
    
+
+
    Go to the source code of this file.
    
+

    Typedefs
    typedef int(* OggzWriteHungry )(OGGZ *oggz, int empty, void *user_data)
     This is the signature of a callback which Oggz will call when oggz is hungry .  

    Functions
    int oggz_write_set_hungry_callback (OGGZ *oggz, OggzWriteHungry hungry, int only_when_empty, void *user_data)
     Set a callback for Oggz to call when oggz is hungry .  
    int oggz_write_feed (OGGZ *oggz, ogg_packet *op, long serialno, int flush, int *guard)
     Add a packet to oggz's packet queue.  
    long oggz_write_output (OGGZ *oggz, unsigned char *buf, long n)
     Output data from an OGGZ handle.  
    long oggz_write (OGGZ *oggz, long n)
     Write n bytes from an OGGZ handle.  
    long oggz_write_get_next_page_size (OGGZ *oggz)
     Query the number of bytes in the next page to be written.  
    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    Typedefs
    typedef int(* OggzWriteHungry )(OGGZ *oggz, int empty, void *user_data)
     This is the signature of a callback which Oggz will call when oggz is hungry .  
    Functions
    int oggz_write_set_hungry_callback (OGGZ *oggz, OggzWriteHungry hungry, int only_when_empty, void *user_data)
     Set a callback for Oggz to call when oggz is hungry .  
    int oggz_write_feed (OGGZ *oggz, ogg_packet *op, long serialno, int flush, int *guard)
     Add a packet to oggz's packet queue.  
    long oggz_write_output (OGGZ *oggz, unsigned char *buf, long n)
     Output data from an OGGZ handle.  
    long oggz_write (OGGZ *oggz, long n)
     Write n bytes from an OGGZ handle.  
    long oggz_write_get_next_page_size (OGGZ *oggz)
     Query the number of bytes in the next page to be written.  
    
 
    
+
    Detailed Description
    
+
    Interfaces for writing Ogg files and streams. 
    
 
    
-
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by 
+
    Generated on Sat Apr 24 09:13:55 2010 for liboggz by 
 
-doxygen 1.5.6 
    
+doxygen 1.6.3 
    
 
 
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__write_8h_source.html liboggz-1.1.1/doc/liboggz/html/oggz__write_8h_source.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__write_8h_source.html	1970-01-01 00:00:00.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__write_8h_source.html	2010-04-24 00:13:55.000000000 +0000
@@ -0,0 +1,82 @@
+
+
+
+
+liboggz: oggz_write.h Source File
+
+
+
+
+
+
+
    Generated on Sat Apr 24 09:13:55 2010 for liboggz by 
+
+doxygen 1.6.3 
    
+
+
diff -Nru liboggz-1.1.0/doc/liboggz/html/oggz__write_8h-source.html liboggz-1.1.1/doc/liboggz/html/oggz__write_8h-source.html
--- liboggz-1.1.0/doc/liboggz/html/oggz__write_8h-source.html	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/oggz__write_8h-source.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-
-
-liboggz: oggz_write.h Source File
-
-
-
-
-
-
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by 
-
-doxygen 1.5.6 
    
-
-
diff -Nru liboggz-1.1.0/doc/liboggz/html/structOggzComment.html liboggz-1.1.1/doc/liboggz/html/structOggzComment.html
--- liboggz-1.1.0/doc/liboggz/html/structOggzComment.html	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/structOggzComment.html	2010-04-24 00:13:55.000000000 +0000
@@ -1,10 +1,13 @@
-
-
+
+
+
+
 liboggz: OggzComment Struct Reference
-
-
-
-
+
+
+
+
+
 
 
    
-
    OggzComment Struct Reference
    #include <oggz_comments.h>
-
    
-
    Detailed Description
    
-A comment. 
-
-
-
+
    OggzComment Struct Reference
    
+
    A comment.  
+More...
    
 
-
-
-
-
+
    #include <oggz_comments.h>
    
+

    Data Fields
    char * name
     The name of the comment, eg.  
    
-char * value
     The value of the comment, as UTF-8. 
    
+
+
+
+
+
    Data Fields
    char * name
     The name of the comment, eg.  
    
+char * value
     The value of the comment, as UTF-8. 
    
 
    
-
    Field Documentation
    
-
+
    Detailed Description
    
+
    A comment. 
    
+
    Field Documentation
    
+
 
    
 
    
       
-          
+          
    
         
    char* OggzComment::name          char* OggzComment::name
         
    
       
    
 
    
 
    
 
-
    
-The name of the comment, eg. 
-
    
-"AUTHOR" 
+
    The name of the comment, eg. 
    
+
    "AUTHOR" 
    
+
+
    
 
    
-
    
-
    The documentation for this struct was generated from the following file:
+
    The documentation for this struct was generated from the following file:
 
-
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by 
+
    Generated on Sat Apr 24 09:13:55 2010 for liboggz by 
 
-doxygen 1.5.6 
    
+doxygen 1.6.3 
    
 
 
diff -Nru liboggz-1.1.0/doc/liboggz/html/structoggz__packet.html liboggz-1.1.1/doc/liboggz/html/structoggz__packet.html
--- liboggz-1.1.0/doc/liboggz/html/structoggz__packet.html	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/structoggz__packet.html	2010-04-20 12:55:03.000000000 +0000
@@ -1,10 +1,13 @@
-
-
+
+
+
+
 liboggz: oggz_packet Struct Reference
-
-
-
-
+
+
+
+
+
 
 
    
-
    oggz_packet Struct Reference
    #include <oggz_packet.h>
-
    
-
    Detailed Description
    
-An ogg_packet and its position in the stream. 
-
-
-
+
    oggz_packet Struct Reference
    
+
    An ogg_packet and its position in the stream.  
+More...
    
 
-
-
-
-
+
    #include <oggz_packet.h>
    
+

    Data Fields
    
-ogg_packet op
     The ogg_packet structure, defined in <ogg/ogg.h>. 
    
-oggz_position pos
     Its position. 
    
+
+
+
+
+
    Data Fields
    
+ogg_packet op
     The ogg_packet structure, defined in <ogg/ogg.h> 
    
+oggz_position pos
     Its position. 
    
 
    
-
    The documentation for this struct was generated from the following file:
+
    Detailed Description
    
+
    An ogg_packet and its position in the stream. 
    
+
    The documentation for this struct was generated from the following file:
 
    
-
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by 
+
    Generated on Tue Apr 20 21:55:03 2010 for liboggz by 
 
-doxygen 1.5.6 
    
+doxygen 1.6.3 
    
 
 
diff -Nru liboggz-1.1.0/doc/liboggz/html/structoggz__position.html liboggz-1.1.1/doc/liboggz/html/structoggz__position.html
--- liboggz-1.1.0/doc/liboggz/html/structoggz__position.html	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/structoggz__position.html	2010-04-20 12:55:03.000000000 +0000
@@ -1,10 +1,13 @@
-
-
+
+
+
+
 liboggz: oggz_position Struct Reference
-
-
-
-
+
+
+
+
+
 
 
    
-
    oggz_position Struct Reference
    #include <oggz_packet.h>
-
    
-
    Detailed Description
    
-The position of an oggz_packet. 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
    oggz_position Struct Reference
    
+
    The position of an oggz_packet.  
+More...
    
+
+
    #include <oggz_packet.h>
    
+

    Data Fields
    ogg_int64_t calc_granulepos
     Granulepos calculated by inspection of codec data.  
    
-oggz_off_t begin_page_offset
     Byte offset of the start of the page on which this packet begins. 
    
-oggz_off_t end_page_offset
     Byte offset of the start of the page on which this packet ends. 
    int pages
     Number of pages this packet spans.  
    int begin_segment_index
     Index into begin_page's lacing values for the segment that begins this packet.  
    
+
+
+
+
+
+
+
+
+
+
+
    Data Fields
    ogg_int64_t calc_granulepos
     Granulepos calculated by inspection of codec data.  
    
+oggz_off_t begin_page_offset
     Byte offset of the start of the page on which this packet begins. 
    
+oggz_off_t end_page_offset
     Byte offset of the start of the page on which this packet ends. 
    int pages
     Number of pages this packet spans.  
    int begin_segment_index
     Index into begin_page's lacing values for the segment that begins this packet.  
    
 
    
-
    Field Documentation
    
-
+
    Detailed Description
    
+
    The position of an oggz_packet. 
    
+
    Field Documentation
    
+
 
    
 
    
       
-          
+          
    
         
    ogg_int64_t oggz_position::calc_granulepos          int oggz_position::begin_segment_index
         
    
       
    
 
    
 
    
 
-
    
-Granulepos calculated by inspection of codec data. 
-
    
--1 if unknown 
+
    Index into begin_page's lacing values for the segment that begins this packet. 
    
+
    NB. if begin_page is continued then the first of these packets will not be reported by ogg_sync_packetout() after a seek. -1 if unknown. 
    
+
+
    
 
    
-
    
-
+
 
    
 
    
       
-          
+          
    
         
    int oggz_position::pages          ogg_int64_t oggz_position::calc_granulepos
         
    
       
    
 
    
 
    
 
-
    
-Number of pages this packet spans. 
-
    
+
    Granulepos calculated by inspection of codec data. 
    
+
    -1 if unknown 
    
 
 
    
-
    
-
+
+
 
    
 
    
       
-          
+          
    
         
    int oggz_position::begin_segment_index          int oggz_position::pages
         
    
       
    
 
    
 
    
 
-
    
-Index into begin_page's lacing values for the segment that begins this packet. 
-
    
-NB. if begin_page is continued then the first of these packets will not be reported by ogg_sync_packetout() after a seek. -1 if unknown. 
-
    
-
    
-
    The documentation for this struct was generated from the following file:
+
    Number of pages this packet spans. 
    
+
+
+
+
    The documentation for this struct was generated from the following file:
 
-
    Generated on Thu Oct 8 18:21:26 2009 for liboggz by 
+
    Generated on Tue Apr 20 21:55:03 2010 for liboggz by 
 
-doxygen 1.5.6 
    
+doxygen 1.6.3 
    
 
 
diff -Nru liboggz-1.1.0/doc/liboggz/html/tabs.css liboggz-1.1.1/doc/liboggz/html/tabs.css
--- liboggz-1.1.0/doc/liboggz/html/tabs.css	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/html/tabs.css	2010-04-24 00:13:55.000000000 +0000
@@ -32,7 +32,7 @@
    float            : left;
    background       : url("tab_r.gif") no-repeat right top;
    border-bottom    : 1px solid #84B0C7;
-   font-size        : x-small;
+   font-size        : 80%;
    font-weight      : bold;
    text-decoration  : none;
 }
@@ -57,7 +57,7 @@
    white-space      : nowrap;
 }
 
-DIV.tabs INPUT
+DIV.tabs #MSearchBox
 {
    float            : right;
    display          : inline;
@@ -66,7 +66,7 @@
 
 DIV.tabs TD
 {
-   font-size        : x-small;
+   font-size        : 80%;
    font-weight      : bold;
    text-decoration  : none;
 }
@@ -99,4 +99,7 @@
    background       : none;
    border           : none;
    border-bottom    : 1px solid #84B0C7;
+   text-align       : center;
+   margin           : 2px;
+   padding          : 2px;
 }
diff -Nru liboggz-1.1.0/doc/liboggz/latex/annotated.tex liboggz-1.1.1/doc/liboggz/latex/annotated.tex
--- liboggz-1.1.0/doc/liboggz/latex/annotated.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/annotated.tex	2010-04-24 00:13:55.000000000 +0000
@@ -1,6 +1,4 @@
 \section{Data Structures}
-Here are the data structures with brief descriptions:\begin{CompactList}
-\item\contentsline{section}{{\bf oggz\_\-packet} (An ogg\_\-packet and its position in the stream )}{\pageref{structoggz__packet}}{}
-\item\contentsline{section}{{\bf oggz\_\-position} (The position of an \doxyref{oggz\_\-packet}{p.}{structoggz__packet} )}{\pageref{structoggz__position}}{}
+Here are the data structures with brief descriptions:\begin{DoxyCompactList}
 \item\contentsline{section}{{\bf OggzComment} (A comment )}{\pageref{structOggzComment}}{}
-\end{CompactList}
+\end{DoxyCompactList}
diff -Nru liboggz-1.1.0/doc/liboggz/latex/doxygen.sty liboggz-1.1.1/doc/liboggz/latex/doxygen.sty
--- liboggz-1.1.0/doc/liboggz/latex/doxygen.sty	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/doxygen.sty	2010-04-24 00:13:55.000000000 +0000
@@ -1,33 +1,286 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{doxygen}
-\RequirePackage{calc}
+
+% Packages used by this style file
+\RequirePackage{alltt}
 \RequirePackage{array}
+\RequirePackage{calc}
+\RequirePackage{color}
+\RequirePackage{fancyhdr}
+\RequirePackage{verbatim}
+
+% Setup fancy headings
 \pagestyle{fancyplain}
-\newcommand{\clearemptydoublepage}{\newpage{\pagestyle{empty}\cleardoublepage}}
-\renewcommand{\chaptermark}[1]{\markboth{#1}{}}
-\renewcommand{\sectionmark}[1]{\markright{\thesection\ #1}}
-\lhead[\fancyplain{}{\bfseries\thepage}]
-        {\fancyplain{}{\bfseries\rightmark}}
-\rhead[\fancyplain{}{\bfseries\leftmark}]
-        {\fancyplain{}{\bfseries\thepage}}
-\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Thu Oct 8 18:21:26 2009 for liboggz by Doxygen }]{}
-\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Thu Oct 8 18:21:26 2009 for liboggz by Doxygen }}
+\newcommand{\clearemptydoublepage}{%
+  \newpage{\pagestyle{empty}\cleardoublepage}%
+}
+\renewcommand{\chaptermark}[1]{%
+  \markboth{#1}{}%
+}
+\renewcommand{\sectionmark}[1]{%
+  \markright{\thesection\ #1}%
+}
+\lhead[\fancyplain{}{\bfseries\thepage}]{%
+  \fancyplain{}{\bfseries\rightmark}%
+}
+\rhead[\fancyplain{}{\bfseries\leftmark}]{%
+  \fancyplain{}{\bfseries\thepage}%
+}
+\rfoot[\fancyplain{}{\bfseries\scriptsize%
+  Generated on Sat Apr 24 09:13:55 2010 for liboggz by Doxygen }]{}
+\lfoot[]{\fancyplain{}{\bfseries\scriptsize%
+  Generated on Sat Apr 24 09:13:55 2010 for liboggz by Doxygen }}
 \cfoot{}
-\newenvironment{Code}
-{\footnotesize}
-{\normalsize}
+
+%---------- Internal commands used in this style file ----------------
+
+% Generic environment used by all paragraph-based environments defined
+% below. Note that the command \title{...} needs to be defined inside
+% those environments!
+\newenvironment{DoxyDesc}[1]{%
+  \begin{list}{}%
+  {%
+    \settowidth{\labelwidth}{40pt}%
+    \setlength{\leftmargin}{\labelwidth}%
+    \setlength{\parsep}{0pt}%
+    \setlength{\itemsep}{-4pt}%
+    \renewcommand{\makelabel}{\entrylabel}%
+  }%
+  \item[#1]%
+}{%
+  \end{list}%
+}
+
+%---------- Commands used by doxygen LaTeX output generator ----------
+
+% Used by 
     ... 
    
+\newenvironment{DoxyPre}{%
+  \small%
+  \begin{alltt}%
+}{%
+  \end{alltt}%
+  \normalsize%
+}
+
+% Used by @code ... @endcode
+\newenvironment{DoxyCode}{%
+  \footnotesize%
+  \verbatim%
+}{%
+  \endverbatim%
+  \normalsize%
+}
+
+% Used by @example, @include, @includelineno and @dontinclude
+\newenvironment{DoxyCodeInclude}{%
+  \DoxyCode%
+}{%
+  \endDoxyCode%
+}
+
+% Used by @verbatim ... @endverbatim
+\newenvironment{DoxyVerb}{%
+  \footnotesize%
+  \verbatim%
+}{%
+  \endverbatim%
+  \normalsize%
+}
+
+% Used by @verbinclude
+\newenvironment{DoxyVerbInclude}{%
+  \DoxyVerb%
+}{%
+  \endDoxyVerb%
+}
+
+% Used by numbered lists (using '-#' or 
       ... 
    )
+\newenvironment{DoxyEnumerate}{%
+  \enumerate%
+}{%
+  \endenumerate%
+}
+
+% Used by bullet lists (using '-', @li, @arg, or 
       ... 
    )
+\newenvironment{DoxyItemize}{%
+  \itemize%
+}{%
+  \enditemize%
+}
+
+% Used by description lists (using 
     ... 
    )
+\newenvironment{DoxyDescription}{%
+  \description%
+}{%
+  \enddescription%
+}
+
+% Used by @image, @dotfile, and @dot ... @enddot
+% (only if caption is specified)
+\newenvironment{DoxyImage}{%
+  \begin{figure}[H]%
+  \begin{center}%
+}{%
+  \end{center}%
+  \end{figure}%
+}
+
+% Used by @image, @dotfile, @dot ... @enddot, and @msc ... @endmsc
+% (only if no caption is specified)
+\newenvironment{DoxyImageNoCaption}{%
+}{%
+}
+
+% Used by @attention
+\newenvironment{DoxyAttention}[1]{%
+  \begin{DoxyDesc}{#1}%
+}{%
+  \end{DoxyDesc}%
+}
+
+% Used by @author and @authors
+\newenvironment{DoxyAuthor}[1]{%
+  \begin{DoxyDesc}{#1}%
+}{%
+  \end{DoxyDesc}%
+}
+
+% Used by @date
+\newenvironment{DoxyDate}[1]{%
+  \begin{DoxyDesc}{#1}%
+}{%
+  \end{DoxyDesc}%
+}
+
+% Used by @invariant
+\newenvironment{DoxyInvariant}[1]{%
+  \begin{DoxyDesc}{#1}%
+}{%
+  \end{DoxyDesc}%
+}
+
+% Used by @note
+\newenvironment{DoxyNote}[1]{%
+  \begin{DoxyDesc}{#1}%
+}{%
+  \end{DoxyDesc}%
+}
+
+% Used by @post
+\newenvironment{DoxyPostcond}[1]{%
+  \begin{DoxyDesc}{#1}%
+}{%
+  \end{DoxyDesc}%
+}
+
+% Used by @pre
+\newenvironment{DoxyPrecond}[1]{%
+  \begin{DoxyDesc}{#1}%
+}{%
+  \end{DoxyDesc}%
+}
+
+% Used by @remark
+\newenvironment{DoxyRemark}[1]{%
+  \begin{DoxyDesc}{#1}%
+}{%
+  \end{DoxyDesc}%
+}
+
+% Used by @return
+\newenvironment{DoxyReturn}[1]{%
+  \begin{DoxyDesc}{#1}%
+}{%
+  \end{DoxyDesc}%
+}
+
+% Used by @since
+\newenvironment{DoxySince}[1]{%
+  \begin{DoxyDesc}{#1}%
+}{%
+  \end{DoxyDesc}%
+}
+
+% Used by @see
+\newenvironment{DoxySeeAlso}[1]{%
+  \begin{DoxyDesc}{#1}%
+}{%
+  \end{DoxyDesc}%
+}
+
+% Used by @version
+\newenvironment{DoxyVersion}[1]{%
+  \begin{DoxyDesc}{#1}%
+}{%
+  \end{DoxyDesc}%
+}
+
+% Used by @warning
+\newenvironment{DoxyWarning}[1]{%
+  \begin{DoxyDesc}{#1}%
+}{%
+  \end{DoxyDesc}%
+}
+
+% Used by @internal
+\newenvironment{DoxyInternal}[1]{%
+  \paragraph*{#1}%
+}{%
+}
+
+% Used by @par and @paragraph
+\newenvironment{DoxyParagraph}[1]{%
+  \begin{list}{}%
+  {%
+    \settowidth{\labelwidth}{40pt}%
+    \setlength{\leftmargin}{\labelwidth}%
+    \setlength{\parsep}{0pt}%
+    \setlength{\itemsep}{-4pt}%
+    \renewcommand{\makelabel}{\entrylabel}%
+  }%
+  \item[#1]%
+}{%
+  \end{list}%
+}
+
+% Used by parameter lists
+\newenvironment{DoxyParams}[1]{%
+  \begin{DoxyDesc}{#1}%
+    \begin{description}%
+}{%
+    \end{description}%
+  \end{DoxyDesc}%
+}
+
+% Used by return value lists
+\newenvironment{DoxyRetVals}[1]{%
+  \begin{DoxyDesc}{#1}%
+    \begin{description}%
+}{%
+    \end{description}%
+  \end{DoxyDesc}%
+}
+
+% Used by exception lists
+\newenvironment{DoxyExceptions}[1]{%
+  \begin{DoxyDesc}{#1}%
+    \begin{description}%
+}{%
+    \end{description}%
+  \end{DoxyDesc}%
+}
+
+% Used by template parameter lists
+\newenvironment{DoxyTemplParams}[1]{%
+  \begin{DoxyDesc}{#1}%
+    \begin{description}%
+}{%
+    \end{description}%
+  \end{DoxyDesc}%
+}
+
 \newcommand{\doxyref}[3]{\textbf{#1} (\textnormal{#2}\,\pageref{#3})}
-\newenvironment{DocInclude}
-{\footnotesize}
-{\normalsize}
-\newenvironment{VerbInclude}
-{\footnotesize}
-{\normalsize}
-\newenvironment{Image}
-{\begin{figure}[H]}
-{\end{figure}}
-\newenvironment{ImageNoCaption}{}{}
-\newenvironment{CompactList}
+\newenvironment{DoxyCompactList}
 {\begin{list}{}{
   \setlength{\leftmargin}{0.5cm}
   \setlength{\itemsep}{0pt}
@@ -35,7 +288,7 @@
   \setlength{\topsep}{0pt}
   \renewcommand{\makelabel}{\hfill}}}
 {\end{list}}
-\newenvironment{CompactItemize}
+\newenvironment{DoxyCompactItemize}
 {
   \begin{itemize}
   \setlength{\itemsep}{-3pt}
@@ -76,3 +329,22 @@
 \addtocounter{secnumdepth}{1}
 \sloppy
 \usepackage[T1]{fontenc}
+\makeatletter
+\renewcommand{\paragraph}{\@startsection{paragraph}{4}{0ex}%
+   {-3.25ex plus -1ex minus -0.2ex}%
+   {1.5ex plus 0.2ex}%
+   {\normalfont\normalsize\bfseries}}
+\makeatother
+\stepcounter{secnumdepth}
+\stepcounter{tocdepth}
+\definecolor{comment}{rgb}{0.5,0.0,0.0}
+\definecolor{keyword}{rgb}{0.0,0.5,0.0}
+\definecolor{keywordtype}{rgb}{0.38,0.25,0.125}
+\definecolor{keywordflow}{rgb}{0.88,0.5,0.0}
+\definecolor{preprocessor}{rgb}{0.5,0.38,0.125}
+\definecolor{stringliteral}{rgb}{0.0,0.125,0.25}
+\definecolor{charliteral}{rgb}{0.0,0.5,0.5}
+\definecolor{vhdldigit}{rgb}{1.0,0.0,1.0}
+\definecolor{vhdlkeyword}{rgb}{0.43,0.0,0.43}
+\definecolor{vhdllogic}{rgb}{1.0,0.0,0.0}
+\definecolor{vhdlchar}{rgb}{0.0,0.0,0.0}
diff -Nru liboggz-1.1.0/doc/liboggz/latex/files.tex liboggz-1.1.1/doc/liboggz/latex/files.tex
--- liboggz-1.1.0/doc/liboggz/latex/files.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/files.tex	2010-04-24 00:13:55.000000000 +0000
@@ -1,15 +1,14 @@
 \section{File List}
-Here is a list of all documented files with brief descriptions:\begin{CompactList}
+Here is a list of all documented files with brief descriptions:\begin{DoxyCompactList}
 \item\contentsline{section}{{\bf oggz.h} (The liboggz C API )}{\pageref{oggz_8h}}{}
 \item\contentsline{section}{{\bf oggz\_\-comments.h} (Reading of comments )}{\pageref{oggz__comments_8h}}{}
 \item\contentsline{section}{{\bf oggz\_\-constants.h} (General constants used by liboggz )}{\pageref{oggz__constants_8h}}{}
 \item\contentsline{section}{{\bf oggz\_\-deprecated.h} (Deprecated interfaces )}{\pageref{oggz__deprecated_8h}}{}
 \item\contentsline{section}{{\bf oggz\_\-io.h} (Overriding the functions used for input and output of raw data )}{\pageref{oggz__io_8h}}{}
-\item\contentsline{section}{{\bf oggz\_\-off\_\-t.h} (Architecture-dependent type and printf format for file position )}{\pageref{oggz__off__t_8h}}{}
-\item\contentsline{section}{{\bf oggz\_\-packet.h} (Packet positioning )}{\pageref{oggz__packet_8h}}{}
+\item\contentsline{section}{{\bf oggz\_\-off\_\-t.h} (Architecture-\/dependent type and printf format for file position )}{\pageref{oggz__off__t_8h}}{}
 \item\contentsline{section}{{\bf oggz\_\-read.h} (Interfaces for reading Ogg files and streams )}{\pageref{oggz__read_8h}}{}
 \item\contentsline{section}{{\bf oggz\_\-seek.h} (Seeking within files )}{\pageref{oggz__seek_8h}}{}
 \item\contentsline{section}{{\bf oggz\_\-stream.h} (Interfaces for querying Ogg streams )}{\pageref{oggz__stream_8h}}{}
 \item\contentsline{section}{{\bf oggz\_\-table.h} (A lookup table )}{\pageref{oggz__table_8h}}{}
 \item\contentsline{section}{{\bf oggz\_\-write.h} (Interfaces for writing Ogg files and streams )}{\pageref{oggz__write_8h}}{}
-\end{CompactList}
+\end{DoxyCompactList}
Binary files /tmp/GIASVvyEjg/liboggz-1.1.0/doc/liboggz/latex/FreeSans.ttf and /tmp/nrfEOV0ko8/liboggz-1.1.1/doc/liboggz/latex/FreeSans.ttf differ
diff -Nru liboggz-1.1.0/doc/liboggz/latex/group__basics.tex liboggz-1.1.1/doc/liboggz/latex/group__basics.tex
--- liboggz-1.1.0/doc/liboggz/latex/group__basics.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/group__basics.tex	2010-04-24 00:13:55.000000000 +0000
@@ -3,11 +3,12 @@
 \subsection{Scope}\label{group__basics_Scope}
 This section provides a minimal introduction to Ogg concepts, covering only that which is required to use liboggz.
 
-For more detailed information, see the {\tt Ogg} homepage or IETF {\tt RFC 3533} {\em The Ogg File Format version 0\/}.\subsection{Terminology}\label{group__basics_Terminology}
+For more detailed information, see the {\tt Ogg} homepage or IETF {\tt RFC 3533} {\itshape The Ogg File Format version 0\/}.\subsection{Terminology}\label{group__basics_Terminology}
 The monospace text below is quoted directly from RFC 3533. For each concept introduced, tips related to liboggz are provided in bullet points.\subsubsection{Physical and Logical Bitstreams}\label{group__basics_bitstreams}
-The raw data of an Ogg stream, as read directly from a file or network socket, is called a {\em physical bitstream\/}.
+The raw data of an Ogg stream, as read directly from a file or network socket, is called a {\itshape physical bitstream\/}.
 
-\small\begin{alltt}
+
+\begin{DoxyPre}
    The result of an Ogg encapsulation is called the "Physical (Ogg)
    Bitstream".  It encapsulates one or several encoder-created
    bitstreams, which are called "Logical Bitstreams".  A logical
@@ -16,61 +17,69 @@
    "Packets".  The packets are created by the encoder of that logical
    bitstream and represent meaningful entities for that encoder only
    (e.g., an uncompressed stream may use video frames as packets).
-\end{alltt}
-\normalsize 
+\end{DoxyPre}
 \subsubsection{Packets and Pages}\label{group__basics_pages}
-Within the Ogg format, packets are written into {\em pages\/}. You can think of pages like pages in a book, and packets as items of the actual text. Consider, for example, individual poems or short stories as the packets. Pages are of course all the same size, and a few very short packets could be written into a single page. On the other hand, a very long packet will use many pages.
+Within the Ogg format, packets are written into {\itshape pages\/}. You can think of pages like pages in a book, and packets as items of the actual text. Consider, for example, individual poems or short stories as the packets. Pages are of course all the same size, and a few very short packets could be written into a single page. On the other hand, a very long packet will use many pages.
+
+
+\begin{DoxyItemize}
+\item liboggz handles the details of writing packets into pages, and of reading packets from pages; your application deals only with {\ttfamily ogg\_\-packet} structures.
+\item Each {\ttfamily ogg\_\-packet} structure contains a block of data and its length in bytes, plus other information related to the stream structure as explained below.
+\end{DoxyItemize}\subsubsection{serialno}\label{group__basics_serialno}
+Each logical bitstream is uniquely identified by a serial number or {\itshape serialno\/}.
 
-\begin{itemize}
-\item liboggz handles the details of writing packets into pages, and of reading packets from pages; your application deals only with {\tt ogg\_\-packet} structures.\item Each {\tt ogg\_\-packet} structure contains a block of data and its length in bytes, plus other information related to the stream structure as explained below.\end{itemize}
-\subsubsection{serialno}\label{group__basics_serialno}
-Each logical bitstream is uniquely identified by a serial number or {\em serialno\/}.
 
-\begin{itemize}
-\item Packets are always associated with a {\em serialno\/}. This is not actually part of the {\tt ogg\_\-packet} structure, so wherever you see an {\tt ogg\_\-packet} in the liboggz API, you will see an accompanying {\em serialno\/}.\end{itemize}
+\begin{DoxyItemize}
+\item Packets are always associated with a {\itshape serialno\/}. This is not actually part of the {\ttfamily ogg\_\-packet} structure, so wherever you see an {\ttfamily ogg\_\-packet} in the liboggz API, you will see an accompanying {\itshape serialno\/}.
+\end{DoxyItemize}
 
 
-\small\begin{alltt}
+\begin{DoxyPre}
    This unique serial number is created randomly and does not have any
    connection to the content or encoder of the logical bitstream it
    represents.
-\end{alltt}
-\normalsize 
+\end{DoxyPre}
 
 
-\begin{itemize}
-\item Use \doxyref{oggz\_\-serialno\_\-new()}{p.}{oggz_8h_af89877e3e89408387d422f487bcf094} to generate a new serial number for each logical bitstream you write.\item Use an \doxyref{OggzTable }{p.}{oggz__table_8h}, keyed by {\em serialno\/}, to store and retrieve data related to each logical bitstream.\end{itemize}
-\subsubsection{b\_\-o\_\-s and e\_\-o\_\-s}\label{group__basics_boseos}
-\small\begin{alltt}
+
+\begin{DoxyItemize}
+\item Use \doxyref{oggz\_\-serialno\_\-new()}{p.}{oggz_8h_aaf89877e3e89408387d422f487bcf094} to generate a new serial number for each logical bitstream you write.
+\item Use an \doxyref{OggzTable }{p.}{oggz__table_8h}, keyed by {\itshape serialno\/}, to store and retrieve data related to each logical bitstream.
+\end{DoxyItemize}\subsubsection{b\_\-o\_\-s and e\_\-o\_\-s}\label{group__basics_boseos}
+
+\begin{DoxyPre}
    bos page: The initial page (beginning of stream) of a logical
       bitstream which contains information to identify the codec type
-      and other decoding-relevant information.\end{alltt}
-\normalsize 
+      and other decoding-relevant information.\end{DoxyPre}
+
 
 
-\small\begin{alltt}   eos page: The final page (end of stream) of a logical bitstream.
-\end{alltt}
-\normalsize 
+\begin{DoxyPre}   eos page: The final page (end of stream) of a logical bitstream.
+\end{DoxyPre}
 
 
-\begin{itemize}
-\item Every {\tt ogg\_\-packet} contains {\em b\_\-o\_\-s\/} and {\em e\_\-o\_\-s\/} flags. Of course each of these will be set only once per logical bitstream. See the Structuring section below for rules on setting {\em b\_\-o\_\-s\/} and {\em e\_\-o\_\-s\/} when interleaving logical bitstreams.\item This documentation will refer to {\em bos\/} and {\em eos\/} {\em packets\/} (not {\em pages\/}) as that is more closely represented by the API. The {\em bos\/} packet is the only packet on the {\em bos\/} page, and the {\em eos\/} packet is the last packet on the {\em eos\/} page.\end{itemize}
-\subsubsection{granulepos}\label{group__basics_granulepos}
-\small\begin{alltt}
+
+\begin{DoxyItemize}
+\item Every {\ttfamily ogg\_\-packet} contains {\itshape b\_\-o\_\-s\/} and {\itshape e\_\-o\_\-s\/} flags. Of course each of these will be set only once per logical bitstream. See the Structuring section below for rules on setting {\itshape b\_\-o\_\-s\/} and {\itshape e\_\-o\_\-s\/} when interleaving logical bitstreams.
+\item This documentation will refer to {\itshape bos\/} and {\itshape eos\/} {\itshape packets\/} (not {\itshape pages\/}) as that is more closely represented by the API. The {\itshape bos\/} packet is the only packet on the {\itshape bos\/} page, and the {\itshape eos\/} packet is the last packet on the {\itshape eos\/} page.
+\end{DoxyItemize}\subsubsection{granulepos}\label{group__basics_granulepos}
+
+\begin{DoxyPre}
    granule position: An increasing position number for a specific
       logical bitstream stored in the page header.  Its meaning is
       dependent on the codec for that logical bitstream
-\end{alltt}
-\normalsize 
+\end{DoxyPre}
+
 
 
-\begin{itemize}
-\item Every {\tt ogg\_\-packet} contains a {\em granulepos\/}. The {\em granulepos\/} of each packet is used mostly for \doxyref{seeking. }{p.}{group__seek__api}\end{itemize}
-\subsection{Structuring}\label{group__basics_Structuring}
+\begin{DoxyItemize}
+\item Every {\ttfamily ogg\_\-packet} contains a {\itshape granulepos\/}. The {\itshape granulepos\/} of each packet is used mostly for \doxyref{seeking. }{p.}{group__seek__api}
+\end{DoxyItemize}\subsection{Structuring}\label{group__basics_Structuring}
 The general structure of an Ogg stream is governed by various rules.\subsubsection{Secondary header packets}\label{group__basics_secondaries}
 Some data sources require initial setup information such as comments and codebooks to be present near the beginning of the stream (directly following the b\_\-o\_\-s packets.
 
-\small\begin{alltt}
+
+\begin{DoxyPre}
    Ogg also allows but does not require secondary header packets after
    the bos page for logical bitstreams and these must also precede any
    data packets in any logical bitstream.  These subsequent header
@@ -79,50 +88,53 @@
    bos pages of all logical bitstreams containing one initial header
    packet per page, followed by the subsidiary header packets of all
    streams, followed by pages containing data packets.
-\end{alltt}
-\normalsize 
+\end{DoxyPre}
+
 
 
-\begin{itemize}
-\item liboggz handles the framing of {\em packets\/} into low-level {\em pages\/}. To ensure that the pages used by secondary headers contain no data packets, set the {\em flush\/} parameter of \doxyref{oggz\_\-write\_\-feed()}{p.}{group__write__api_g6ccaceb107db1fd2eae047dbdbaa5889} to {\em OGGZ\_\-FLUSH\_\-AFTER\/} when queueing the last of the secondary headers.\item or, equivalently, set {\em flush\/} to {\em OGGZ\_\-FLUSH\_\-BEFORE\/} when queueing the first of the data packets.\end{itemize}
-\subsubsection{Sequencing b\_\-o\_\-s and e\_\-o\_\-s packets}\label{group__basics_boseosseq}
-The following rules apply for sequencing {\em bos\/} and {\em eos\/} packets in a physical bitstream: \small\begin{alltt}
+\begin{DoxyItemize}
+\item liboggz handles the framing of {\itshape packets\/} into low-\/level {\itshape pages\/}. To ensure that the pages used by secondary headers contain no data packets, set the {\itshape flush\/} parameter of \doxyref{oggz\_\-write\_\-feed()}{p.}{group__write__api_ga6ccaceb107db1fd2eae047dbdbaa5889} to {\itshape OGGZ\_\-FLUSH\_\-AFTER\/} when queueing the last of the secondary headers.
+\item or, equivalently, set {\itshape flush\/} to {\itshape OGGZ\_\-FLUSH\_\-BEFORE\/} when queueing the first of the data packets.
+\end{DoxyItemize}\subsubsection{Sequencing b\_\-o\_\-s and e\_\-o\_\-s packets}\label{group__basics_boseosseq}
+The following rules apply for sequencing {\itshape bos\/} and {\itshape eos\/} packets in a physical bitstream: 
+\begin{DoxyPre}
    ... All bos pages of all logical bitstreams MUST appear together at
-   the beginning of the Ogg bitstream.\end{alltt}
-\normalsize 
+   the beginning of the Ogg bitstream.\end{DoxyPre}
 
 
-\small\begin{alltt}   ... eos pages for the logical bitstreams need not all occur
+
+\begin{DoxyPre}   ... eos pages for the logical bitstreams need not all occur
    contiguously.  Eos pages may be 'nil' pages, that is, pages
    containing no content but simply a page header with position
    information and the eos flag set in the page header.
-\end{alltt}
-\normalsize 
+\end{DoxyPre}
+
+
 
+\begin{DoxyItemize}
+\item \doxyref{oggz\_\-write\_\-feed()}{p.}{group__write__api_ga6ccaceb107db1fd2eae047dbdbaa5889} will fail with a return value of {\itshape OGGZ\_\-ERR\_\-BOS\/} if an attempt is made to queue a late {\itshape bos\/} packet
+\end{DoxyItemize}\subsubsection{Interleaving logical bitstreams}\label{group__basics_interleaving}
 
-\begin{itemize}
-\item \doxyref{oggz\_\-write\_\-feed()}{p.}{group__write__api_g6ccaceb107db1fd2eae047dbdbaa5889} will fail with a return value of {\em OGGZ\_\-ERR\_\-BOS\/} if an attempt is made to queue a late {\em bos\/} packet\end{itemize}
-\subsubsection{Interleaving logical bitstreams}\label{group__basics_interleaving}
-\small\begin{alltt}
+\begin{DoxyPre}
    It is possible to consecutively chain groups of concurrently
    multiplexed bitstreams.  The groups, when unchained, MUST stand on
    their own as a valid concurrently multiplexed bitstream.  The
    following diagram shows a schematic example of such a physical
    bitstream that obeys all the rules of both grouped and chained
-   multiplexed bitstreams.\end{alltt}
-\normalsize 
+   multiplexed bitstreams.\end{DoxyPre}
 
 
-\small\begin{alltt}               physical bitstream with pages of
+
+\begin{DoxyPre}               physical bitstream with pages of
           different logical bitstreams grouped and chained
       -------------------------------------------------------------
       |*A*|*B*|*C*|A|A|C|B|A|B|A\#|C|...|B|C|B\#|C\#|*D*|D|...|D\#|
       -------------------------------------------------------------
-       bos bos bos             eos           eos eos bos       eos\end{alltt}
-\normalsize 
+       bos bos bos             eos           eos eos bos       eos\end{DoxyPre}
+
 
 
-\small\begin{alltt}   In this example, there are two chained physical bitstreams, the first
+\begin{DoxyPre}   In this example, there are two chained physical bitstreams, the first
    of which is a grouped stream of three logical bitstreams A, B, and C.
    The second physical bitstream is chained after the end of the grouped
    bitstream, which ends after the last eos page of all its grouped
@@ -132,21 +144,22 @@
    need not conform to a regular order.  And it can be seen that a
    grouped bitstream can end long before the other bitstreams in the
    group end.
-\end{alltt}
-\normalsize 
+\end{DoxyPre}
+
 
 
-\begin{itemize}
-\item \doxyref{oggz\_\-write\_\-feed()}{p.}{group__write__api_g6ccaceb107db1fd2eae047dbdbaa5889} will fail, returning an explicit error value, if an attempt is made to queue a packet in violation of these rules.\end{itemize}
-\subsection{References}\label{group__basics_References}
-This introduction to the Ogg format is derived from IETF {\tt RFC 3533} {\em The Ogg File Format version 0\/} in accordance with the following copyright statement pertaining to the text of RFC 3533:
+\begin{DoxyItemize}
+\item \doxyref{oggz\_\-write\_\-feed()}{p.}{group__write__api_ga6ccaceb107db1fd2eae047dbdbaa5889} will fail, returning an explicit error value, if an attempt is made to queue a packet in violation of these rules.
+\end{DoxyItemize}\subsection{References}\label{group__basics_References}
+This introduction to the Ogg format is derived from IETF {\tt RFC 3533} {\itshape The Ogg File Format version 0\/} in accordance with the following copyright statement pertaining to the text of RFC 3533:
 
-\small\begin{alltt}
-   Copyright (C) The Internet Society (2003).  All Rights Reserved.\end{alltt}
-\normalsize 
 
+\begin{DoxyPre}
+   Copyright (C) The Internet Society (2003).  All Rights Reserved.\end{DoxyPre}
 
-\small\begin{alltt}   This document and translations of it may be copied and furnished to
+
+
+\begin{DoxyPre}   This document and translations of it may be copied and furnished to
    others, and derivative works that comment on or otherwise explain it
    or assist in its implementation may be prepared, copied, published
    and distributed, in whole or in part, without restriction of any
@@ -158,22 +171,20 @@
    developing Internet standards in which case the procedures for
    copyrights defined in the Internet Standards process must be
    followed, or as required to translate it into languages other than
-   English.\end{alltt}
-\normalsize 
+   English.\end{DoxyPre}
+
 
 
-\small\begin{alltt}   The limited permissions granted above are perpetual and will not be
-   revoked by the Internet Society or its successors or assigns.\end{alltt}
-\normalsize 
+\begin{DoxyPre}   The limited permissions granted above are perpetual and will not be
+   revoked by the Internet Society or its successors or assigns.\end{DoxyPre}
 
 
-\small\begin{alltt}   This document and the information contained herein is provided on an
+
+\begin{DoxyPre}   This document and the information contained herein is provided on an
    "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
    TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
    BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
    HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
    MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-\end{alltt}
-\normalsize 
- 
-
+\end{DoxyPre}
+ 
\ No newline at end of file
diff -Nru liboggz-1.1.0/doc/liboggz/latex/group__building.tex liboggz-1.1.1/doc/liboggz/latex/group__building.tex
--- liboggz-1.1.0/doc/liboggz/latex/group__building.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/group__building.tex	2010-04-24 00:13:55.000000000 +0000
@@ -1,29 +1,28 @@
 \section{Building against liboggz}
 \label{group__building}\index{Building against liboggz@{Building against liboggz}}
 \subsection{Using GNU autoconf}\label{group__building_autoconf}
-If you are using GNU autoconf, you do not need to call pkg-config directly. Use the following macro to determine if liboggz is available:
+If you are using GNU autoconf, you do not need to call pkg-\/config directly. Use the following macro to determine if liboggz is available:
 
-\small\begin{alltt}
+
+\begin{DoxyPre}
  PKG\_CHECK\_MODULES(OGGZ, oggz >= 0.6.0,
                    HAVE\_OGGZ="yes", HAVE\_OGGZ="no")
  if test "x$HAVE\_OGGZ" = "xyes" ; then
    AC\_SUBST(OGGZ\_CFLAGS)
    AC\_SUBST(OGGZ\_LIBS)
  fi
- \end{alltt}
-\normalsize 
+ \end{DoxyPre}
+
 
+If liboggz is found, HAVE\_\-OGGZ will be set to \char`\"{}yes\char`\"{}, and the autoconf variables OGGZ\_\-CFLAGS and OGGZ\_\-LIBS will be set appropriately.\subsection{Determining compiler options with pkg-\/config}\label{group__building_pkg-config}
+If you are not using GNU autoconf in your project, you can use the pkg-\/config tool directly to determine the correct compiler options.
 
-If liboggz is found, HAVE\_\-OGGZ will be set to \char`\"{}yes\char`\"{}, and the autoconf variables OGGZ\_\-CFLAGS and OGGZ\_\-LIBS will be set appropriately.\subsection{Determining compiler options with pkg-config}\label{group__building_pkg-config}
-If you are not using GNU autoconf in your project, you can use the pkg-config tool directly to determine the correct compiler options.
 
-\small\begin{alltt}
- OGGZ\_CFLAGS=`pkg-config --cflags oggz`\end{alltt}
-\normalsize 
+\begin{DoxyPre}
+ OGGZ\_CFLAGS=`pkg-config --cflags oggz`\end{DoxyPre}
 
 
-\small\begin{alltt} OGGZ\_LIBS=`pkg-config --libs oggz`
- \end{alltt}
-\normalsize 
- 
 
+\begin{DoxyPre} OGGZ\_LIBS=`pkg-config --libs oggz`
+ \end{DoxyPre}
+ 
\ No newline at end of file
diff -Nru liboggz-1.1.0/doc/liboggz/latex/group__configuration.tex liboggz-1.1.1/doc/liboggz/latex/group__configuration.tex
--- liboggz-1.1.0/doc/liboggz/latex/group__configuration.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/group__configuration.tex	2010-04-24 00:13:55.000000000 +0000
@@ -4,10 +4,15 @@
 It is possible to customize the functionality of liboggz by using various ./configure flags when building it from source. You can build a smaller version of liboggz to only read or write. By default, both reading and writing support is built.
 
 For general information about using ./configure, see the file \doxyref{INSTALL }{p.}{group__install}\subsubsection{Removing writing support}\label{group__configuration_no_encode}
-Configuring with {\em --disable-write\/} will remove all support for writing:\begin{itemize}
-\item All internal write related functions will not be built\item Any attempt to call \doxyref{oggz\_\-new()}{p.}{oggz_8h_6eb34d123389ae38d993601f9e7bb9d6}, \doxyref{oggz\_\-open()}{p.}{oggz_8h_65197cdd03f755f7ebfabf2fdff4c7db} or \doxyref{oggz\_\-open\_\-stdio()}{p.}{oggz_8h_c49e9de0bc4ef1d91b43b13605f98b19} with {\em flags\/} == OGGZ\_\-WRITE will fail, returning NULL\item Any attempt to call \doxyref{oggz\_\-write()}{p.}{group__write__api_g3c97d94ea425d64546adf9c368b71904}, \doxyref{oggz\_\-write\_\-output()}{p.}{group__write__api_g5606dff01964caec4582eb172fde0c1c}, \doxyref{oggz\_\-write\_\-feed()}{p.}{group__write__api_g6ccaceb107db1fd2eae047dbdbaa5889}, \doxyref{oggz\_\-write\_\-set\_\-hungry\_\-callback()}{p.}{group__write__api_gf362c030bc7a7f57cb23f2b863a59389}, or \doxyref{oggz\_\-write\_\-get\_\-next\_\-page\_\-size()}{p.}{group__write__api_gb25da7d2cbf39585357f2a426d3dba2f} will return OGGZ\_\-ERR\_\-DISABLED\end{itemize}
-\subsubsection{Removing reading support}\label{group__configuration_no_decode}
-Configuring with {\em --disable-read\/} will remove all support for reading:\begin{itemize}
-\item All internal reading related functions will not be built\item Any attempt to call \doxyref{oggz\_\-new()}{p.}{oggz_8h_6eb34d123389ae38d993601f9e7bb9d6}, \doxyref{oggz\_\-open()}{p.}{oggz_8h_65197cdd03f755f7ebfabf2fdff4c7db} or \doxyref{oggz\_\-open\_\-stdio()}{p.}{oggz_8h_c49e9de0bc4ef1d91b43b13605f98b19} with {\em flags\/} == OGGZ\_\-READ will fail, returning NULL\item Any attempt to call \doxyref{oggz\_\-read()}{p.}{group__read__api_g3ce7a31de5da56375057436c6b5108f2}, \doxyref{oggz\_\-read\_\-input()}{p.}{group__read__api_g77d4158dd119f496f73311ace7f630d6}, \doxyref{oggz\_\-set\_\-read\_\-callback()}{p.}{group__read__api_g6d5aae4f7f186fffe19d4fd3cd63148d}, \doxyref{oggz\_\-seek()}{p.}{group__seek__api_geef4b261d443701207954e5a636d6817}, or \doxyref{oggz\_\-seek\_\-units()}{p.}{group__seek__api_g60bac88ef3695629efacec43a21927e5} will return OGGZ\_\-ERR\_\-DISABLED \end{itemize}
-
-
+Configuring with {\itshape -\/-\/disable-\/write\/} will remove all support for writing:
+\begin{DoxyItemize}
+\item All internal write related functions will not be built
+\item Any attempt to call \doxyref{oggz\_\-new()}{p.}{oggz_8h_a6eb34d123389ae38d993601f9e7bb9d6}, \doxyref{oggz\_\-open()}{p.}{oggz_8h_a65197cdd03f755f7ebfabf2fdff4c7db} or \doxyref{oggz\_\-open\_\-stdio()}{p.}{oggz_8h_ac49e9de0bc4ef1d91b43b13605f98b19} with {\itshape flags\/} == OGGZ\_\-WRITE will fail, returning NULL
+\item Any attempt to call \doxyref{oggz\_\-write()}{p.}{group__write__api_ga3c97d94ea425d64546adf9c368b71904}, \doxyref{oggz\_\-write\_\-output()}{p.}{group__write__api_ga5606dff01964caec4582eb172fde0c1c}, \doxyref{oggz\_\-write\_\-feed()}{p.}{group__write__api_ga6ccaceb107db1fd2eae047dbdbaa5889}, \doxyref{oggz\_\-write\_\-set\_\-hungry\_\-callback()}{p.}{group__write__api_gaf362c030bc7a7f57cb23f2b863a59389}, or \doxyref{oggz\_\-write\_\-get\_\-next\_\-page\_\-size()}{p.}{group__write__api_gab25da7d2cbf39585357f2a426d3dba2f} will return OGGZ\_\-ERR\_\-DISABLED
+\end{DoxyItemize}\subsubsection{Removing reading support}\label{group__configuration_no_decode}
+Configuring with {\itshape -\/-\/disable-\/read\/} will remove all support for reading:
+\begin{DoxyItemize}
+\item All internal reading related functions will not be built
+\item Any attempt to call \doxyref{oggz\_\-new()}{p.}{oggz_8h_a6eb34d123389ae38d993601f9e7bb9d6}, \doxyref{oggz\_\-open()}{p.}{oggz_8h_a65197cdd03f755f7ebfabf2fdff4c7db} or \doxyref{oggz\_\-open\_\-stdio()}{p.}{oggz_8h_ac49e9de0bc4ef1d91b43b13605f98b19} with {\itshape flags\/} == OGGZ\_\-READ will fail, returning NULL
+\item Any attempt to call \doxyref{oggz\_\-read()}{p.}{group__read__api_ga3ce7a31de5da56375057436c6b5108f2}, \doxyref{oggz\_\-read\_\-input()}{p.}{group__read__api_ga77d4158dd119f496f73311ace7f630d6}, \doxyref{oggz\_\-set\_\-read\_\-callback()}{p.}{group__read__api_ga6d5aae4f7f186fffe19d4fd3cd63148d}, \doxyref{oggz\_\-seek()}{p.}{group__seek__api_gaeef4b261d443701207954e5a636d6817}, or \doxyref{oggz\_\-seek\_\-units()}{p.}{group__seek__api_ga60bac88ef3695629efacec43a21927e5} will return OGGZ\_\-ERR\_\-DISABLED 
+\end{DoxyItemize}
\ No newline at end of file
diff -Nru liboggz-1.1.0/doc/liboggz/latex/group__force__feed.tex liboggz-1.1.1/doc/liboggz/latex/group__force__feed.tex
--- liboggz-1.1.0/doc/liboggz/latex/group__force__feed.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/group__force__feed.tex	2010-04-24 00:13:55.000000000 +0000
@@ -1,19 +1,32 @@
 \section{Writing by force feeding Oggz}
 \label{group__force__feed}\index{Writing by force feeding Oggz@{Writing by force feeding Oggz}}
-This process is illustrated in the following diagram:
 
- \begin{Image}
-\begin{center}
-\includegraphics[width=10cm]{forcefeed}\caption{Force Feeding Oggz}
-\end{center}
-\end{Image}
 
-
-The following example code generates a stream of ten packets, each containing a single byte ('A', 'B', ... , 'J'):
+Force feeding involves synchronously:
+\begin{DoxyItemize}
+\item Creating an {\itshape ogg\_\-packet\/} structure
+\item Adding it to the packet queue with \doxyref{oggz\_\-write\_\-feed()}{p.}{group__write__api_ga6ccaceb107db1fd2eae047dbdbaa5889}
+\item Calling \doxyref{oggz\_\-write()}{p.}{group__write__api_ga3c97d94ea425d64546adf9c368b71904} or \doxyref{oggz\_\-write\_\-output()}{p.}{group__write__api_ga5606dff01964caec4582eb172fde0c1c}, repeatedly as necessary, to generate the Ogg bitstream. 
+\end{DoxyItemize} 
 
 
+Force feeding involves synchronously:
+\begin{DoxyItemize}
+\item Creating an {\itshape ogg\_\-packet\/} structure
+\item Adding it to the packet queue with \doxyref{oggz\_\-write\_\-feed()}{p.}{group__write__api_ga6ccaceb107db1fd2eae047dbdbaa5889}
+\item Calling \doxyref{oggz\_\-write()}{p.}{group__write__api_ga3c97d94ea425d64546adf9c368b71904} or \doxyref{oggz\_\-write\_\-output()}{p.}{group__write__api_ga5606dff01964caec4582eb172fde0c1c}, repeatedly as necessary, to generate the Ogg bitstream. 
+\end{DoxyItemize}This process is illustrated in the following diagram:
 
-\begin{DocInclude}\begin{verbatim}\end{verbatim}
-\end{DocInclude}
  
+\begin{DoxyImage}
+\includegraphics[width=10cm]{forcefeed}
+\caption{Force Feeding Oggz}
+\end{DoxyImage}
+
+
+The following example code generates a stream of ten packets, each containing a single byte ('A', 'B', ... , 'J'):
+
 
+\begin{DoxyCodeInclude}
+\end{DoxyCodeInclude}
+ 
\ No newline at end of file
diff -Nru liboggz-1.1.0/doc/liboggz/latex/group__hungry.tex liboggz-1.1.1/doc/liboggz/latex/group__hungry.tex
--- liboggz-1.1.0/doc/liboggz/latex/group__hungry.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/group__hungry.tex	2010-04-24 00:13:55.000000000 +0000
@@ -1,25 +1,30 @@
 \section{Writing with OggzHungry callbacks}
 \label{group__hungry}\index{Writing with OggzHungry callbacks@{Writing with OggzHungry callbacks}}
-An OggzHungry callback will:\begin{itemize}
-\item Create an {\em ogg\_\-packet\/} structure\item Add it to the packet queue with \doxyref{oggz\_\-write\_\-feed()}{p.}{group__write__api_g6ccaceb107db1fd2eae047dbdbaa5889}\end{itemize}
 
 
-Once you have set such a callback with \doxyref{oggz\_\-write\_\-set\_\-hungry\_\-callback()}{p.}{group__write__api_gf362c030bc7a7f57cb23f2b863a59389}, simply call \doxyref{oggz\_\-write()}{p.}{group__write__api_g3c97d94ea425d64546adf9c368b71904} or \doxyref{oggz\_\-write\_\-output()}{p.}{group__write__api_g5606dff01964caec4582eb172fde0c1c} repeatedly, and Oggz will call your callback to provide packets when it is hungry.
+You can add packets to the Oggz packet queue only when it is \char`\"{}hungry\char`\"{} by providing an OggzHungry callback.  
 
-This process is illustrated in the following diagram:
 
- \begin{Image}
-\begin{center}
-\includegraphics[width=10cm]{hungry}\caption{Using OggzHungry}
-\end{center}
-\end{Image}
+You can add packets to the Oggz packet queue only when it is \char`\"{}hungry\char`\"{} by providing an OggzHungry callback. An OggzHungry callback will:
+\begin{DoxyItemize}
+\item Create an {\itshape ogg\_\-packet\/} structure
+\item Add it to the packet queue with \doxyref{oggz\_\-write\_\-feed()}{p.}{group__write__api_ga6ccaceb107db1fd2eae047dbdbaa5889}
+\end{DoxyItemize}
 
+Once you have set such a callback with \doxyref{oggz\_\-write\_\-set\_\-hungry\_\-callback()}{p.}{group__write__api_gaf362c030bc7a7f57cb23f2b863a59389}, simply call \doxyref{oggz\_\-write()}{p.}{group__write__api_ga3c97d94ea425d64546adf9c368b71904} or \doxyref{oggz\_\-write\_\-output()}{p.}{group__write__api_ga5606dff01964caec4582eb172fde0c1c} repeatedly, and Oggz will call your callback to provide packets when it is hungry.
 
-The following example code generates a stream of ten packets, each containing a single byte ('A', 'B', ... , 'J'):
+This process is illustrated in the following diagram:
 
+ 
+\begin{DoxyImage}
+\includegraphics[width=10cm]{hungry}
+\caption{Using OggzHungry}
+\end{DoxyImage}
 
 
-\begin{DocInclude}\begin{verbatim}\end{verbatim}
-\end{DocInclude}
- 
+The following example code generates a stream of ten packets, each containing a single byte ('A', 'B', ... , 'J'):
+
 
+\begin{DoxyCodeInclude}
+\end{DoxyCodeInclude}
+ 
\ No newline at end of file
diff -Nru liboggz-1.1.0/doc/liboggz/latex/group__install.tex liboggz-1.1.1/doc/liboggz/latex/group__install.tex
--- liboggz-1.1.0/doc/liboggz/latex/group__install.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/group__install.tex	2010-04-24 00:13:55.000000000 +0000
@@ -2,8 +2,6 @@
 \label{group__install}\index{Installation@{Installation}}
 \subsection{INSTALL}\label{group__install_install}
 
-
-\begin{DocInclude}\begin{verbatim}\end{verbatim}
-\end{DocInclude}
- 
-
+\begin{DoxyCodeInclude}
+\end{DoxyCodeInclude}
+ 
\ No newline at end of file
diff -Nru liboggz-1.1.0/doc/liboggz/latex/group__metric.tex liboggz-1.1.1/doc/liboggz/latex/group__metric.tex
--- liboggz-1.1.0/doc/liboggz/latex/group__metric.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/group__metric.tex	2010-04-24 00:13:55.000000000 +0000
@@ -1,5 +1,29 @@
 \section{Using OggzMetric}
 \label{group__metric}\index{Using OggzMetric@{Using OggzMetric}}
+\subsection*{Typedefs}
+\begin{DoxyCompactItemize}
+\item 
+typedef ogg\_\-int64\_\-t($\ast$ {\bf OggzMetric} )({\bf OGGZ} $\ast$oggz, long serialno, ogg\_\-int64\_\-t granulepos, void $\ast$user\_\-data)
+\begin{DoxyCompactList}\small\item\em This is the signature of a function to correlate Ogg streams. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
+\subsection*{Functions}
+\begin{DoxyCompactItemize}
+\item 
+int {\bf oggz\_\-get\_\-preroll} ({\bf OGGZ} $\ast$oggz, long serialno)
+\begin{DoxyCompactList}\small\item\em Retrieve the preroll of a logical bitstream. \item\end{DoxyCompactList}\item 
+int {\bf oggz\_\-set\_\-preroll} ({\bf OGGZ} $\ast$oggz, long serialno, int preroll)
+\begin{DoxyCompactList}\small\item\em Specify the preroll of a logical bitstream. \item\end{DoxyCompactList}\item 
+int {\bf oggz\_\-get\_\-granuleshift} ({\bf OGGZ} $\ast$oggz, long serialno)
+\begin{DoxyCompactList}\small\item\em Retrieve the granuleshift of a logical bitstream. \item\end{DoxyCompactList}\item 
+int {\bf oggz\_\-set\_\-granuleshift} ({\bf OGGZ} $\ast$oggz, long serialno, int granuleshift)
+\begin{DoxyCompactList}\small\item\em Specify the granuleshift of a logical bitstream. \item\end{DoxyCompactList}\item 
+int {\bf oggz\_\-get\_\-granulerate} ({\bf OGGZ} $\ast$oggz, long serialno, ogg\_\-int64\_\-t $\ast$granulerate\_\-n, ogg\_\-int64\_\-t $\ast$granulerate\_\-d)
+\begin{DoxyCompactList}\small\item\em Retrieve the granulerate of a logical bitstream. \item\end{DoxyCompactList}\item 
+int {\bf oggz\_\-set\_\-granulerate} ({\bf OGGZ} $\ast$oggz, long serialno, ogg\_\-int64\_\-t granule\_\-rate\_\-numerator, ogg\_\-int64\_\-t granule\_\-rate\_\-denominator)
+\begin{DoxyCompactList}\small\item\em Specify the granulerate of a logical bitstream. \item\end{DoxyCompactList}\item 
+int {\bf oggz\_\-set\_\-metric} ({\bf OGGZ} $\ast$oggz, long serialno, {\bf OggzMetric} metric, void $\ast$user\_\-data)
+\begin{DoxyCompactList}\small\item\em Set the OggzMetric to use for an OGGZ handle. \item\end{DoxyCompactList}\item 
+int {\bf oggz\_\-set\_\-data\_\-start} ({\bf OGGZ} $\ast$oggz, oggz\_\-off\_\-t offset)
+\begin{DoxyCompactList}\small\item\em Tell Oggz to remember the given offset as the start of data. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
 
 
 \subsection{Detailed Description}
@@ -13,232 +37,190 @@
 
 For most others it is simply a matter of providing a \char`\"{}granulerate\char`\"{}: a frame or sampling rate, if each packet's granulepos represents a sample number.
 
-\begin{itemize}
-\item Set the {\em granule\_\-rate\_\-numerator\/} and {\em granule\_\-rate\_\-denominator\/} appropriately using \doxyref{oggz\_\-set\_\-granulerate()}{p.}{group__metric_ga2a86ec590161bc2295a2c8e91cefa49}\end{itemize}
 
+\begin{DoxyItemize}
+\item Set the {\itshape granule\_\-rate\_\-numerator\/} and {\itshape granule\_\-rate\_\-denominator\/} appropriately using \doxyref{oggz\_\-set\_\-granulerate()}{p.}{group__metric_gaa2a86ec590161bc2295a2c8e91cefa49}
+\end{DoxyItemize}
 
 Some codecs use a \char`\"{}granuleshift\char`\"{} to divide a granulepos into two halves; the first describing a dependency on a previous packet, the second giving the offset since that packet. This is used to mark keyframes and intermediate frames.
 
-\begin{itemize}
-\item Set the {\em granuleshift\/} appropriately using \doxyref{oggz\_\-set\_\-granuleshift()}{p.}{group__metric_g7ca67e0344580bf1541b9fbde39d481b}\end{itemize}
-\subsubsection{Custom Metrics}\label{group__metric_custom}
-For streams with non-linear granulepos, you need to set a custom metric:
-
-\begin{itemize}
-\item Implement an OggzMetric callback\item Set the OggzMetric callback using \doxyref{oggz\_\-set\_\-metric()}{p.}{group__metric_g5a630e8dcd04e1dd6601d8f56f0af3f6}\end{itemize}
-\subsection{Seeking with OggzMetrics}\label{group__metric_using}
-To seek, use \doxyref{oggz\_\-seek\_\-units()}{p.}{group__seek__api_g60bac88ef3695629efacec43a21927e5}. Oggz will perform a ratio search through the Ogg bitstream, using the OggzMetric callback to determine its position relative to the desired unit.
 
-\begin{Desc}
-\item[Note:]\end{Desc}
-Many data streams begin with headers describing such things as codec setup parameters. One of the assumptions Monty makes is:
+\begin{DoxyItemize}
+\item Set the {\itshape granuleshift\/} appropriately using \doxyref{oggz\_\-set\_\-granuleshift()}{p.}{group__metric_ga7ca67e0344580bf1541b9fbde39d481b}
+\end{DoxyItemize}\subsubsection{Custom Metrics}\label{group__metric_custom}
+For streams with non-\/linear granulepos, you need to set a custom metric:
 
-\begin{itemize}
-\item Given pre-cached decode headers, a player may seek into a stream at any point and begin decode.\end{itemize}
 
+\begin{DoxyItemize}
+\item Implement an OggzMetric callback
+\item Set the OggzMetric callback using \doxyref{oggz\_\-set\_\-metric()}{p.}{group__metric_ga5a630e8dcd04e1dd6601d8f56f0af3f6}
+\end{DoxyItemize}\subsection{Seeking with OggzMetrics}\label{group__metric_using}
+To seek, use \doxyref{oggz\_\-seek\_\-units()}{p.}{group__seek__api_ga60bac88ef3695629efacec43a21927e5}. Oggz will perform a ratio search through the Ogg bitstream, using the OggzMetric callback to determine its position relative to the desired unit.
 
-Thus, the first action taken by applications dealing with such data is to read in and cache the decode headers; thereafter the application can safely seek to arbitrary points in the data.
+\begin{DoxyNote}{Note}
 
-This impacts seeking because the portion of the bitstream containing decode headers should not be considered part of the metric space. To inform Oggz not to seek earlier than the end of the decode headers, use \doxyref{oggz\_\-set\_\-data\_\-start()}{p.}{group__metric_gaec9a54e9b231797d245042ce23b619a}. 
+\end{DoxyNote}
+Many data streams begin with headers describing such things as codec setup parameters. One of the assumptions Monty makes is:
 
-\subsection*{Typedefs}
-\begin{CompactItemize}
-\item 
-typedef ogg\_\-int64\_\-t($\ast$ {\bf OggzMetric} )({\bf OGGZ} $\ast$oggz, long serialno, ogg\_\-int64\_\-t granulepos, void $\ast$user\_\-data)
-\begin{CompactList}\small\item\em This is the signature of a function to correlate Ogg streams. \item\end{CompactList}\end{CompactItemize}
-\subsection*{Functions}
-\begin{CompactItemize}
-\item 
-int {\bf oggz\_\-get\_\-preroll} ({\bf OGGZ} $\ast$oggz, long serialno)
-\begin{CompactList}\small\item\em Retrieve the preroll of a logical bitstream. \item\end{CompactList}\item 
-int {\bf oggz\_\-set\_\-preroll} ({\bf OGGZ} $\ast$oggz, long serialno, int preroll)
-\begin{CompactList}\small\item\em Specify the preroll of a logical bitstream. \item\end{CompactList}\item 
-int {\bf oggz\_\-get\_\-granuleshift} ({\bf OGGZ} $\ast$oggz, long serialno)
-\begin{CompactList}\small\item\em Retrieve the granuleshift of a logical bitstream. \item\end{CompactList}\item 
-int {\bf oggz\_\-set\_\-granuleshift} ({\bf OGGZ} $\ast$oggz, long serialno, int granuleshift)
-\begin{CompactList}\small\item\em Specify the granuleshift of a logical bitstream. \item\end{CompactList}\item 
-int {\bf oggz\_\-get\_\-granulerate} ({\bf OGGZ} $\ast$oggz, long serialno, ogg\_\-int64\_\-t $\ast$granulerate\_\-n, ogg\_\-int64\_\-t $\ast$granulerate\_\-d)
-\begin{CompactList}\small\item\em Retrieve the granulerate of a logical bitstream. \item\end{CompactList}\item 
-int {\bf oggz\_\-set\_\-granulerate} ({\bf OGGZ} $\ast$oggz, long serialno, ogg\_\-int64\_\-t granule\_\-rate\_\-numerator, ogg\_\-int64\_\-t granule\_\-rate\_\-denominator)
-\begin{CompactList}\small\item\em Specify the granulerate of a logical bitstream. \item\end{CompactList}\item 
-int {\bf oggz\_\-set\_\-metric} ({\bf OGGZ} $\ast$oggz, long serialno, {\bf OggzMetric} metric, void $\ast$user\_\-data)
-\begin{CompactList}\small\item\em Set the OggzMetric to use for an OGGZ handle. \item\end{CompactList}\item 
-int {\bf oggz\_\-set\_\-data\_\-start} ({\bf OGGZ} $\ast$oggz, oggz\_\-off\_\-t offset)
-\begin{CompactList}\small\item\em Tell Oggz to remember the given offset as the start of data. \item\end{CompactList}\end{CompactItemize}
 
+\begin{DoxyItemize}
+\item Given pre-\/cached decode headers, a player may seek into a stream at any point and begin decode.
+\end{DoxyItemize}
+
+Thus, the first action taken by applications dealing with such data is to read in and cache the decode headers; thereafter the application can safely seek to arbitrary points in the data.
+
+This impacts seeking because the portion of the bitstream containing decode headers should not be considered part of the metric space. To inform Oggz not to seek earlier than the end of the decode headers, use \doxyref{oggz\_\-set\_\-data\_\-start()}{p.}{group__metric_gaaec9a54e9b231797d245042ce23b619a}. 
 
 \subsection{Typedef Documentation}
 \index{metric@{metric}!OggzMetric@{OggzMetric}}
 \index{OggzMetric@{OggzMetric}!metric@{metric}}
-\subsubsection[OggzMetric]{\setlength{\rightskip}{0pt plus 5cm}typedef ogg\_\-int64\_\-t($\ast$ {\bf OggzMetric})({\bf OGGZ} $\ast$oggz, long serialno, ogg\_\-int64\_\-t granulepos, void $\ast$user\_\-data)}\label{group__metric_g8803bb406015a32f5172902e3e4e76e8}
+\subsubsection[{OggzMetric}]{\setlength{\rightskip}{0pt plus 5cm}typedef ogg\_\-int64\_\-t($\ast$ {\bf OggzMetric})({\bf OGGZ} $\ast$oggz, long serialno, ogg\_\-int64\_\-t granulepos, void $\ast$user\_\-data)}\label{group__metric_ga8803bb406015a32f5172902e3e4e76e8}
 
 
 This is the signature of a function to correlate Ogg streams. 
 
-If every position in an Ogg stream can be described by a metric (eg. time) then define this function that returns some arbitrary unit value. This is the normal use of Oggz for media streams. The meaning of units is arbitrary, but must be consistent across all logical bitstreams; for example a conversion of the time offset of a given packet into nanoseconds or a similar stream-specific subdivision may be appropriate.
+If every position in an Ogg stream can be described by a metric (eg. time) then define this function that returns some arbitrary unit value. This is the normal use of Oggz for media streams. The meaning of units is arbitrary, but must be consistent across all logical bitstreams; for example a conversion of the time offset of a given packet into nanoseconds or a similar stream-\/specific subdivision may be appropriate.
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]Identifies a logical bitstream within {\em oggz\/} \item[{\em granulepos}]A granulepos within the logical bitstream identified by {\em serialno\/} \item[{\em user\_\-data}]Arbitrary data you wish to pass to your callback \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]A conversion of the (serialno, granulepos) pair into a measure in units which is consistent across all logical bitstreams within {\em oggz\/} \end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]Identifies a logical bitstream within {\itshape oggz\/} \item[{\em granulepos}]A granulepos within the logical bitstream identified by {\itshape serialno\/} \item[{\em user\_\-data}]Arbitrary data you wish to pass to your callback \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+A conversion of the (serialno, granulepos) pair into a measure in units which is consistent across all logical bitstreams within {\itshape oggz\/} 
+\end{DoxyReturn}
 
 
 \subsection{Function Documentation}
 \index{metric@{metric}!oggz\_\-get\_\-granulerate@{oggz\_\-get\_\-granulerate}}
 \index{oggz\_\-get\_\-granulerate@{oggz\_\-get\_\-granulerate}!metric@{metric}}
-\subsubsection[oggz\_\-get\_\-granulerate]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-get\_\-granulerate ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  ogg\_\-int64\_\-t $\ast$ {\em granulerate\_\-n}, \/  ogg\_\-int64\_\-t $\ast$ {\em granulerate\_\-d})}\label{group__metric_g72a9a24e6f8483986859d7697fa611b6}
+\subsubsection[{oggz\_\-get\_\-granulerate}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-get\_\-granulerate ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  ogg\_\-int64\_\-t $\ast$ {\em granulerate\_\-n}, \/  ogg\_\-int64\_\-t $\ast$ {\em granulerate\_\-d})}\label{group__metric_ga72a9a24e6f8483986859d7697fa611b6}
 
 
 Retrieve the granulerate of a logical bitstream. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]Identify the logical bitstream in {\em oggz\/} \item[{\em granulerate\_\-n}]Return location for the granulerate numerator \item[{\em granulerate\_\-d}]Return location for the granulerate denominator \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]0 Success \end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\em serialno\/} does not identify an existing logical bitstream in {\em oggz\/}. \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]Identify the logical bitstream in {\itshape oggz\/} \item[{\em granulerate\_\-n}]Return location for the granulerate numerator \item[{\em granulerate\_\-d}]Return location for the granulerate denominator \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+0 Success 
+\end{DoxyReturn}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\itshape serialno\/} does not identify an existing logical bitstream in {\itshape oggz\/}. \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \end{DoxyRetVals}
 \index{metric@{metric}!oggz\_\-get\_\-granuleshift@{oggz\_\-get\_\-granuleshift}}
 \index{oggz\_\-get\_\-granuleshift@{oggz\_\-get\_\-granuleshift}!metric@{metric}}
-\subsubsection[oggz\_\-get\_\-granuleshift]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-get\_\-granuleshift ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno})}\label{group__metric_gd9b55e525a6e0b994a133314fd78e2c0}
+\subsubsection[{oggz\_\-get\_\-granuleshift}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-get\_\-granuleshift ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno})}\label{group__metric_gad9b55e525a6e0b994a133314fd78e2c0}
 
 
 Retrieve the granuleshift of a logical bitstream. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]Identify the logical bitstream in {\em oggz\/} \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]The granuleshift of the specified logical bitstream. \end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\em serialno\/} does not identify an existing logical bitstream in {\em oggz\/}. \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]Identify the logical bitstream in {\itshape oggz\/} \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+The granuleshift of the specified logical bitstream. 
+\end{DoxyReturn}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\itshape serialno\/} does not identify an existing logical bitstream in {\itshape oggz\/}. \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \end{DoxyRetVals}
 \index{metric@{metric}!oggz\_\-get\_\-preroll@{oggz\_\-get\_\-preroll}}
 \index{oggz\_\-get\_\-preroll@{oggz\_\-get\_\-preroll}!metric@{metric}}
-\subsubsection[oggz\_\-get\_\-preroll]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-get\_\-preroll ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno})}\label{group__metric_gb411ab113d5f0f67bf77506724c25633}
+\subsubsection[{oggz\_\-get\_\-preroll}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-get\_\-preroll ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno})}\label{group__metric_gab411ab113d5f0f67bf77506724c25633}
 
 
 Retrieve the preroll of a logical bitstream. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]Identify the logical bitstream in {\em oggz\/} \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]The preroll of the specified logical bitstream. \end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\em serialno\/} does not identify an existing logical bitstream in {\em oggz\/}. \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]Identify the logical bitstream in {\itshape oggz\/} \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+The preroll of the specified logical bitstream. 
+\end{DoxyReturn}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\itshape serialno\/} does not identify an existing logical bitstream in {\itshape oggz\/}. \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \end{DoxyRetVals}
 \index{metric@{metric}!oggz\_\-set\_\-data\_\-start@{oggz\_\-set\_\-data\_\-start}}
 \index{oggz\_\-set\_\-data\_\-start@{oggz\_\-set\_\-data\_\-start}!metric@{metric}}
-\subsubsection[oggz\_\-set\_\-data\_\-start]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-set\_\-data\_\-start ({\bf OGGZ} $\ast$ {\em oggz}, \/  oggz\_\-off\_\-t {\em offset})}\label{group__metric_gaec9a54e9b231797d245042ce23b619a}
+\subsubsection[{oggz\_\-set\_\-data\_\-start}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-set\_\-data\_\-start ({\bf OGGZ} $\ast$ {\em oggz}, \/  oggz\_\-off\_\-t {\em offset})}\label{group__metric_gaaec9a54e9b231797d245042ce23b619a}
 
 
 Tell Oggz to remember the given offset as the start of data. 
 
-This informs the seeking mechanism that when seeking back to unit 0, go to the given offset, not to the start of the file, which is usually codec headers. The usual usage is: \small\begin{alltt}
+This informs the seeking mechanism that when seeking back to unit 0, go to the given offset, not to the start of the file, which is usually codec headers. The usual usage is: 
+\begin{DoxyPre}
     oggz\_set\_data\_start (oggz, oggz\_tell (oggz));
-\end{alltt}
-\normalsize 
- \begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle previously opened for reading \item[{\em offset}]The offset of the start of data \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]0 on success, -1 on failure. \end{Desc}
+\end{DoxyPre}
+ 
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle previously opened for reading \item[{\em offset}]The offset of the start of data \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+0 on success, -\/1 on failure. 
+\end{DoxyReturn}
 \index{metric@{metric}!oggz\_\-set\_\-granulerate@{oggz\_\-set\_\-granulerate}}
 \index{oggz\_\-set\_\-granulerate@{oggz\_\-set\_\-granulerate}!metric@{metric}}
-\subsubsection[oggz\_\-set\_\-granulerate]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-set\_\-granulerate ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  ogg\_\-int64\_\-t {\em granule\_\-rate\_\-numerator}, \/  ogg\_\-int64\_\-t {\em granule\_\-rate\_\-denominator})}\label{group__metric_ga2a86ec590161bc2295a2c8e91cefa49}
+\subsubsection[{oggz\_\-set\_\-granulerate}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-set\_\-granulerate ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  ogg\_\-int64\_\-t {\em granule\_\-rate\_\-numerator}, \/  ogg\_\-int64\_\-t {\em granule\_\-rate\_\-denominator})}\label{group__metric_gaa2a86ec590161bc2295a2c8e91cefa49}
 
 
 Specify the granulerate of a logical bitstream. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]Identify the logical bitstream in {\em oggz\/} to attach this linear metric to. A value of -1 indicates that the metric should be attached to all unattached logical bitstreams in {\em oggz\/}. \item[{\em granule\_\-rate\_\-numerator}]The numerator of the granule rate \item[{\em granule\_\-rate\_\-denominator}]The denominator of the granule rate \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]0 Success \end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\em serialno\/} does not identify an existing logical bitstream in {\em oggz\/}. \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]Identify the logical bitstream in {\itshape oggz\/} to attach this linear metric to. A value of -\/1 indicates that the metric should be attached to all unattached logical bitstreams in {\itshape oggz\/}. \item[{\em granule\_\-rate\_\-numerator}]The numerator of the granule rate \item[{\em granule\_\-rate\_\-denominator}]The denominator of the granule rate \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+0 Success 
+\end{DoxyReturn}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\itshape serialno\/} does not identify an existing logical bitstream in {\itshape oggz\/}. \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \end{DoxyRetVals}
 \index{metric@{metric}!oggz\_\-set\_\-granuleshift@{oggz\_\-set\_\-granuleshift}}
 \index{oggz\_\-set\_\-granuleshift@{oggz\_\-set\_\-granuleshift}!metric@{metric}}
-\subsubsection[oggz\_\-set\_\-granuleshift]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-set\_\-granuleshift ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  int {\em granuleshift})}\label{group__metric_g7ca67e0344580bf1541b9fbde39d481b}
+\subsubsection[{oggz\_\-set\_\-granuleshift}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-set\_\-granuleshift ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  int {\em granuleshift})}\label{group__metric_ga7ca67e0344580bf1541b9fbde39d481b}
 
 
 Specify the granuleshift of a logical bitstream. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]Identify the logical bitstream in {\em oggz\/} to attach this granuleshift metric to. A value of -1 indicates that the metric should be attached to all unattached logical bitstreams in {\em oggz\/}. \item[{\em granuleshift}]The granuleshift \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]0 Success \end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\em serialno\/} does not identify an existing logical bitstream in {\em oggz\/}. \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]Identify the logical bitstream in {\itshape oggz\/} to attach this granuleshift metric to. A value of -\/1 indicates that the metric should be attached to all unattached logical bitstreams in {\itshape oggz\/}. \item[{\em granuleshift}]The granuleshift \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+0 Success 
+\end{DoxyReturn}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\itshape serialno\/} does not identify an existing logical bitstream in {\itshape oggz\/}. \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \end{DoxyRetVals}
 \index{metric@{metric}!oggz\_\-set\_\-metric@{oggz\_\-set\_\-metric}}
 \index{oggz\_\-set\_\-metric@{oggz\_\-set\_\-metric}!metric@{metric}}
-\subsubsection[oggz\_\-set\_\-metric]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-set\_\-metric ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  {\bf OggzMetric} {\em metric}, \/  void $\ast$ {\em user\_\-data})}\label{group__metric_g5a630e8dcd04e1dd6601d8f56f0af3f6}
+\subsubsection[{oggz\_\-set\_\-metric}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-set\_\-metric ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  {\bf OggzMetric} {\em metric}, \/  void $\ast$ {\em user\_\-data})}\label{group__metric_ga5a630e8dcd04e1dd6601d8f56f0af3f6}
 
 
 Set the OggzMetric to use for an OGGZ handle. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]Identify the logical bitstream in {\em oggz\/} to attach this metric to. A value of -1 indicates that this metric should be attached to all unattached logical bitstreams in {\em oggz\/}. \item[{\em metric}]An OggzMetric callback \item[{\em user\_\-data}]arbitrary data to pass to the metric callback\end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]0 Success \end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\em serialno\/} does not identify an existing logical bitstream in {\em oggz\/}, and is not -1 \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ\end{description}
-\end{Desc}
-\begin{Desc}
-\item[Note:]Specifying values of {\em serialno\/} other than -1 allows you to pass logical bitstream specific user\_\-data to the same metric. 
 
-Alternatively, you may use a different {\em metric\/} for each {\em serialno\/}, but all metrics used must return mutually consistent unit measurements. \end{Desc}
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]Identify the logical bitstream in {\itshape oggz\/} to attach this metric to. A value of -\/1 indicates that this metric should be attached to all unattached logical bitstreams in {\itshape oggz\/}. \item[{\em metric}]An OggzMetric callback \item[{\em user\_\-data}]arbitrary data to pass to the metric callback\end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+0 Success 
+\end{DoxyReturn}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\itshape serialno\/} does not identify an existing logical bitstream in {\itshape oggz\/}, and is not -\/1 \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ\end{DoxyRetVals}
+\begin{DoxyNote}{Note}
+Specifying values of {\itshape serialno\/} other than -\/1 allows you to pass logical bitstream specific user\_\-data to the same metric. 
+
+Alternatively, you may use a different {\itshape metric\/} for each {\itshape serialno\/}, but all metrics used must return mutually consistent unit measurements. 
+\end{DoxyNote}
 \index{metric@{metric}!oggz\_\-set\_\-preroll@{oggz\_\-set\_\-preroll}}
 \index{oggz\_\-set\_\-preroll@{oggz\_\-set\_\-preroll}!metric@{metric}}
-\subsubsection[oggz\_\-set\_\-preroll]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-set\_\-preroll ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  int {\em preroll})}\label{group__metric_ga2b4ab5be298a11b5b91147b76996c83}
+\subsubsection[{oggz\_\-set\_\-preroll}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-set\_\-preroll ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  int {\em preroll})}\label{group__metric_gaa2b4ab5be298a11b5b91147b76996c83}
 
 
 Specify the preroll of a logical bitstream. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]Identify the logical bitstream in {\em oggz\/} to attach this preroll to. \item[{\em preroll}]The preroll \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]0 Success \end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\em serialno\/} does not identify an existing logical bitstream in {\em oggz\/}. \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]Identify the logical bitstream in {\itshape oggz\/} to attach this preroll to. \item[{\em preroll}]The preroll \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+0 Success 
+\end{DoxyReturn}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\itshape serialno\/} does not identify an existing logical bitstream in {\itshape oggz\/}. \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \end{DoxyRetVals}
diff -Nru liboggz-1.1.0/doc/liboggz/latex/group__read__api.tex liboggz-1.1.1/doc/liboggz/latex/group__read__api.tex
--- liboggz-1.1.0/doc/liboggz/latex/group__read__api.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/group__read__api.tex	2010-04-24 00:13:55.000000000 +0000
@@ -2,142 +2,128 @@
 \label{group__read__api}\index{Oggz Read API@{Oggz Read API}}
 
 
-\subsection{Detailed Description}
-Oggz parses Ogg bitstreams, forming ogg\_\-packet structures, and calling your OggzReadPacket callback(s). 
-
-You provide Ogg data to Oggz with \doxyref{oggz\_\-read()}{p.}{group__read__api_g3ce7a31de5da56375057436c6b5108f2} or \doxyref{oggz\_\-read\_\-input()}{p.}{group__read__api_g77d4158dd119f496f73311ace7f630d6}, and independently process it in OggzReadPacket callbacks. It is possible to set a different callback per {\em serialno\/} (ie. for each logical bitstream in the Ogg bitstream - see the \doxyref{Ogg basics}{p.}{group__basics} section for more detail).
+Oggz parses Ogg bitstreams, forming ogg\_\-packet structures, and calling your OggzReadPacket callback(s).  
 
-When using an OGGZ$\ast$ opened with the OGGZ\_\-AUTO flag set, Oggz will internally calculate the granulepos for each packet, even though these are not all recorded in the file: only the last packet ending on a page will have its granulepos recorded in the page header. Within a OggzReadPacket callback, calling \doxyref{oggz\_\-tell\_\-granulepos()}{p.}{group__seek__api_g29181fb4e8f4e3629cb84810614acd30} will retrieve the calculated granulepos.
-
-See \doxyref{Oggz Seek API}{p.}{group__seek__api} for information on seeking on interleaved Ogg data, and for working with calculated granulepos values. 
 
 \subsection*{Typedefs}
-\begin{CompactItemize}
+\begin{DoxyCompactItemize}
 \item 
-typedef int($\ast$ {\bf OggzReadPacket} )({\bf OGGZ} $\ast$oggz, {\bf oggz\_\-packet} $\ast$packet, long serialno, void $\ast$user\_\-data)
-\begin{CompactList}\small\item\em This is the signature of a callback which you must provide for Oggz to call whenever it finds a new packet in the Ogg stream associated with {\em oggz\/}. \item\end{CompactList}\item 
+typedef int($\ast$ {\bf OggzReadPacket} )({\bf OGGZ} $\ast$oggz, ogg\_\-packet $\ast$op, long serialno, void $\ast$user\_\-data)
+\begin{DoxyCompactList}\small\item\em This is the signature of a callback which you must provide for Oggz to call whenever it finds a new packet in the Ogg stream associated with {\itshape oggz\/}. \item\end{DoxyCompactList}\item 
 typedef int($\ast$ {\bf OggzReadPage} )({\bf OGGZ} $\ast$oggz, const ogg\_\-page $\ast$og, long serialno, void $\ast$user\_\-data)
-\begin{CompactList}\small\item\em This is the signature of a callback which you must provide for Oggz to call whenever it finds a new page in the Ogg stream associated with {\em oggz\/}. \item\end{CompactList}\end{CompactItemize}
+\begin{DoxyCompactList}\small\item\em This is the signature of a callback which you must provide for Oggz to call whenever it finds a new page in the Ogg stream associated with {\itshape oggz\/}. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
 \subsection*{Functions}
-\begin{CompactItemize}
+\begin{DoxyCompactItemize}
 \item 
 int {\bf oggz\_\-set\_\-read\_\-callback} ({\bf OGGZ} $\ast$oggz, long serialno, {\bf OggzReadPacket} read\_\-packet, void $\ast$user\_\-data)
-\begin{CompactList}\small\item\em Set a callback for Oggz to call when a new Ogg packet is found in the stream. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Set a callback for Oggz to call when a new Ogg packet is found in the stream. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-set\_\-read\_\-page} ({\bf OGGZ} $\ast$oggz, long serialno, {\bf OggzReadPage} read\_\-page, void $\ast$user\_\-data)
-\begin{CompactList}\small\item\em Set a callback for Oggz to call when a new Ogg page is found in the stream. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Set a callback for Oggz to call when a new Ogg page is found in the stream. \item\end{DoxyCompactList}\item 
 long {\bf oggz\_\-read} ({\bf OGGZ} $\ast$oggz, long n)
-\begin{CompactList}\small\item\em Read n bytes into {\em oggz\/}, calling any read callbacks on the fly. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Read n bytes into {\itshape oggz\/}, calling any read callbacks on the fly. \item\end{DoxyCompactList}\item 
 long {\bf oggz\_\-read\_\-input} ({\bf OGGZ} $\ast$oggz, unsigned char $\ast$buf, long n)
-\begin{CompactList}\small\item\em Input data into {\em oggz\/}. \item\end{CompactList}\end{CompactItemize}
+\begin{DoxyCompactList}\small\item\em Input data into {\itshape oggz\/}. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
+
 
+\subsection{Detailed Description}
+Oggz parses Ogg bitstreams, forming ogg\_\-packet structures, and calling your OggzReadPacket callback(s). You provide Ogg data to Oggz with \doxyref{oggz\_\-read()}{p.}{group__read__api_ga3ce7a31de5da56375057436c6b5108f2} or \doxyref{oggz\_\-read\_\-input()}{p.}{group__read__api_ga77d4158dd119f496f73311ace7f630d6}, and independently process it in OggzReadPacket callbacks. It is possible to set a different callback per {\itshape serialno\/} (ie. for each logical bitstream in the Ogg bitstream -\/ see the \doxyref{Ogg basics}{p.}{group__basics} section for more detail).
+
+When using an OGGZ$\ast$ opened with the OGGZ\_\-AUTO flag set, Oggz will internally calculate the granulepos for each packet, even though these are not all recorded in the file: only the last packet ending on a page will have its granulepos recorded in the page header. Within a OggzReadPacket callback, calling \doxyref{oggz\_\-tell\_\-granulepos()}{p.}{group__seek__api_ga29181fb4e8f4e3629cb84810614acd30} will retrieve the calculated granulepos.
+
+See \doxyref{Oggz Seek API}{p.}{group__seek__api} for information on seeking on interleaved Ogg data, and for working with calculated granulepos values. 
 
 \subsection{Typedef Documentation}
 \index{read\_\-api@{read\_\-api}!OggzReadPacket@{OggzReadPacket}}
 \index{OggzReadPacket@{OggzReadPacket}!read_api@{read\_\-api}}
-\subsubsection[OggzReadPacket]{\setlength{\rightskip}{0pt plus 5cm}typedef int($\ast$ {\bf OggzReadPacket})({\bf OGGZ} $\ast$oggz, {\bf oggz\_\-packet} $\ast$packet, long serialno, void $\ast$user\_\-data)}\label{group__read__api_gd9d6114ffc7c956fd179863e51e0d542}
+\subsubsection[{OggzReadPacket}]{\setlength{\rightskip}{0pt plus 5cm}typedef int($\ast$ {\bf OggzReadPacket})({\bf OGGZ} $\ast$oggz, ogg\_\-packet $\ast$op, long serialno, void $\ast$user\_\-data)}\label{group__read__api_gaef015044907510cda7a3c06241e959e7}
+
 
+This is the signature of a callback which you must provide for Oggz to call whenever it finds a new packet in the Ogg stream associated with {\itshape oggz\/}. 
 
-This is the signature of a callback which you must provide for Oggz to call whenever it finds a new packet in the Ogg stream associated with {\em oggz\/}. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]The OGGZ handle \item[{\em packet}]The packet, including its position in the stream. \item[{\em serialno}]Identify the logical bistream in {\em oggz\/} that contains {\em packet\/} \item[{\em user\_\-data}]A generic pointer you have provided earlier \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]0 to continue, non-zero to instruct Oggz to stop.\end{Desc}
-\begin{Desc}
-\item[Note:]It is possible to provide different callbacks per logical bitstream -- see \doxyref{oggz\_\-set\_\-read\_\-callback()}{p.}{group__read__api_g6d5aae4f7f186fffe19d4fd3cd63148d} for more information. \end{Desc}
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]The OGGZ handle \item[{\em op}]The full ogg\_\-packet (see $<$ogg/ogg.h$>$) \item[{\em serialno}]Identify the logical bistream in {\itshape oggz\/} that contains {\itshape op\/} \item[{\em user\_\-data}]A generic pointer you have provided earlier \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+0 to continue, non-\/zero to instruct Oggz to stop.
+\end{DoxyReturn}
+\begin{DoxyNote}{Note}
+It is possible to provide different callbacks per logical bitstream -\/-\/ see \doxyref{oggz\_\-set\_\-read\_\-callback()}{p.}{group__read__api_ga6d5aae4f7f186fffe19d4fd3cd63148d} for more information. 
+\end{DoxyNote}
 \index{read\_\-api@{read\_\-api}!OggzReadPage@{OggzReadPage}}
 \index{OggzReadPage@{OggzReadPage}!read_api@{read\_\-api}}
-\subsubsection[OggzReadPage]{\setlength{\rightskip}{0pt plus 5cm}typedef int($\ast$ {\bf OggzReadPage})({\bf OGGZ} $\ast$oggz, const ogg\_\-page $\ast$og, long serialno, void $\ast$user\_\-data)}\label{group__read__api_g8a1df0166fad1a0a6fe55d24e1a4b2e6}
+\subsubsection[{OggzReadPage}]{\setlength{\rightskip}{0pt plus 5cm}typedef int($\ast$ {\bf OggzReadPage})({\bf OGGZ} $\ast$oggz, const ogg\_\-page $\ast$og, long serialno, void $\ast$user\_\-data)}\label{group__read__api_ga8a1df0166fad1a0a6fe55d24e1a4b2e6}
 
 
-This is the signature of a callback which you must provide for Oggz to call whenever it finds a new page in the Ogg stream associated with {\em oggz\/}. 
+This is the signature of a callback which you must provide for Oggz to call whenever it finds a new page in the Ogg stream associated with {\itshape oggz\/}. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]The OGGZ handle \item[{\em op}]The full ogg\_\-page (see $<$ogg/ogg.h$>$) \item[{\em user\_\-data}]A generic pointer you have provided earlier \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]0 to continue, non-zero to instruct Oggz to stop. \end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]The OGGZ handle \item[{\em op}]The full ogg\_\-page (see $<$ogg/ogg.h$>$) \item[{\em user\_\-data}]A generic pointer you have provided earlier \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+0 to continue, non-\/zero to instruct Oggz to stop. 
+\end{DoxyReturn}
 
 
 \subsection{Function Documentation}
 \index{read\_\-api@{read\_\-api}!oggz\_\-read@{oggz\_\-read}}
 \index{oggz\_\-read@{oggz\_\-read}!read_api@{read\_\-api}}
-\subsubsection[oggz\_\-read]{\setlength{\rightskip}{0pt plus 5cm}long oggz\_\-read ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em n})}\label{group__read__api_g3ce7a31de5da56375057436c6b5108f2}
+\subsubsection[{oggz\_\-read}]{\setlength{\rightskip}{0pt plus 5cm}long oggz\_\-read ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em n})}\label{group__read__api_ga3ce7a31de5da56375057436c6b5108f2}
+
+
+Read n bytes into {\itshape oggz\/}, calling any read callbacks on the fly. 
 
 
-Read n bytes into {\em oggz\/}, calling any read callbacks on the fly. 
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle previously opened for reading \item[{\em n}]A count of bytes to ingest \end{DoxyParams}
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle previously opened for reading \item[{\em n}]A count of bytes to ingest \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em $>$  0}]The number of bytes successfully ingested. \item[{\em 0}]End of file \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-SYSTEM}]System error; check errno for details \item[{\em OGGZ\_\-ERR\_\-STOP\_\-OK}]Reading was stopped by a user callback returning OGGZ\_\-STOP\_\-OK \item[{\em OGGZ\_\-ERR\_\-STOP\_\-ERR}]Reading was stopped by a user callback returning OGGZ\_\-STOP\_\-ERR \item[{\em OGGZ\_\-ERR\_\-HOLE\_\-IN\_\-DATA}]Hole (sequence number gap) detected in input data \item[{\em OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY}]Out of memory \end{description}
-\end{Desc}
+\begin{DoxyRetVals}{Return values}
+\item[{\em $>$  0}]The number of bytes successfully ingested. \item[{\em 0}]End of file \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-SYSTEM}]System error; check errno for details \item[{\em OGGZ\_\-ERR\_\-STOP\_\-OK}]Reading was stopped by a user callback returning OGGZ\_\-STOP\_\-OK \item[{\em OGGZ\_\-ERR\_\-STOP\_\-ERR}]Reading was stopped by a user callback returning OGGZ\_\-STOP\_\-ERR \item[{\em OGGZ\_\-ERR\_\-HOLE\_\-IN\_\-DATA}]Hole (sequence number gap) detected in input data \item[{\em OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY}]Out of memory \end{DoxyRetVals}
 \index{read\_\-api@{read\_\-api}!oggz\_\-read\_\-input@{oggz\_\-read\_\-input}}
 \index{oggz\_\-read\_\-input@{oggz\_\-read\_\-input}!read_api@{read\_\-api}}
-\subsubsection[oggz\_\-read\_\-input]{\setlength{\rightskip}{0pt plus 5cm}long oggz\_\-read\_\-input ({\bf OGGZ} $\ast$ {\em oggz}, \/  unsigned char $\ast$ {\em buf}, \/  long {\em n})}\label{group__read__api_g77d4158dd119f496f73311ace7f630d6}
+\subsubsection[{oggz\_\-read\_\-input}]{\setlength{\rightskip}{0pt plus 5cm}long oggz\_\-read\_\-input ({\bf OGGZ} $\ast$ {\em oggz}, \/  unsigned char $\ast$ {\em buf}, \/  long {\em n})}\label{group__read__api_ga77d4158dd119f496f73311ace7f630d6}
+
+
+Input data into {\itshape oggz\/}. 
 
 
-Input data into {\em oggz\/}. 
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle previously opened for reading \item[{\em buf}]A memory buffer \item[{\em n}]A count of bytes to input \end{DoxyParams}
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle previously opened for reading \item[{\em buf}]A memory buffer \item[{\em n}]A count of bytes to input \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em $>$  0}]The number of bytes successfully ingested. \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-STOP\_\-OK}]Reading was stopped by a user callback returning OGGZ\_\-STOP\_\-OK \item[{\em OGGZ\_\-ERR\_\-STOP\_\-ERR}]Reading was stopped by a user callback returning OGGZ\_\-STOP\_\-ERR \item[{\em OGGZ\_\-ERR\_\-HOLE\_\-IN\_\-DATA}]Hole (sequence number gap) detected in input data \item[{\em OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY}]Out of memory \end{description}
-\end{Desc}
+\begin{DoxyRetVals}{Return values}
+\item[{\em $>$  0}]The number of bytes successfully ingested. \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-STOP\_\-OK}]Reading was stopped by a user callback returning OGGZ\_\-STOP\_\-OK \item[{\em OGGZ\_\-ERR\_\-STOP\_\-ERR}]Reading was stopped by a user callback returning OGGZ\_\-STOP\_\-ERR \item[{\em OGGZ\_\-ERR\_\-HOLE\_\-IN\_\-DATA}]Hole (sequence number gap) detected in input data \item[{\em OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY}]Out of memory \end{DoxyRetVals}
 \index{read\_\-api@{read\_\-api}!oggz\_\-set\_\-read\_\-callback@{oggz\_\-set\_\-read\_\-callback}}
 \index{oggz\_\-set\_\-read\_\-callback@{oggz\_\-set\_\-read\_\-callback}!read_api@{read\_\-api}}
-\subsubsection[oggz\_\-set\_\-read\_\-callback]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-set\_\-read\_\-callback ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  {\bf OggzReadPacket} {\em read\_\-packet}, \/  void $\ast$ {\em user\_\-data})}\label{group__read__api_g6d5aae4f7f186fffe19d4fd3cd63148d}
+\subsubsection[{oggz\_\-set\_\-read\_\-callback}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-set\_\-read\_\-callback ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  {\bf OggzReadPacket} {\em read\_\-packet}, \/  void $\ast$ {\em user\_\-data})}\label{group__read__api_ga6d5aae4f7f186fffe19d4fd3cd63148d}
 
 
 Set a callback for Oggz to call when a new Ogg packet is found in the stream. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle previously opened for reading \item[{\em serialno}]Identify the logical bitstream in {\em oggz\/} to attach this callback to, or -1 to attach this callback to all unattached logical bitstreams in {\em oggz\/}. \item[{\em read\_\-packet}]Your callback function \item[{\em user\_\-data}]Arbitrary data you wish to pass to your callback \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\em serialno\/} does not identify an existing logical bitstream in {\em oggz\/}. \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY}]Out of memory\end{description}
-\end{Desc}
-\begin{Desc}
-\item[Note:]Values of {\em serialno\/} other than -1 allows you to specify different callback functions for each logical bitstream.
 
-It is safe to call this callback from within an OggzReadPacket function, in order to specify that subsequent packets should be handled by a different OggzReadPacket function. \end{Desc}
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle previously opened for reading \item[{\em serialno}]Identify the logical bitstream in {\itshape oggz\/} to attach this callback to, or -\/1 to attach this callback to all unattached logical bitstreams in {\itshape oggz\/}. \item[{\em read\_\-packet}]Your callback function \item[{\em user\_\-data}]Arbitrary data you wish to pass to your callback \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\itshape serialno\/} does not identify an existing logical bitstream in {\itshape oggz\/}. \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY}]Out of memory\end{DoxyRetVals}
+\begin{DoxyNote}{Note}
+Values of {\itshape serialno\/} other than -\/1 allows you to specify different callback functions for each logical bitstream.
+
+It is safe to call this callback from within an OggzReadPacket function, in order to specify that subsequent packets should be handled by a different OggzReadPacket function. 
+\end{DoxyNote}
 \index{read\_\-api@{read\_\-api}!oggz\_\-set\_\-read\_\-page@{oggz\_\-set\_\-read\_\-page}}
 \index{oggz\_\-set\_\-read\_\-page@{oggz\_\-set\_\-read\_\-page}!read_api@{read\_\-api}}
-\subsubsection[oggz\_\-set\_\-read\_\-page]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-set\_\-read\_\-page ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  {\bf OggzReadPage} {\em read\_\-page}, \/  void $\ast$ {\em user\_\-data})}\label{group__read__api_gfe738d4fdd4b00b1280f5978be19b2d5}
+\subsubsection[{oggz\_\-set\_\-read\_\-page}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-set\_\-read\_\-page ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  {\bf OggzReadPage} {\em read\_\-page}, \/  void $\ast$ {\em user\_\-data})}\label{group__read__api_gafe738d4fdd4b00b1280f5978be19b2d5}
 
 
 Set a callback for Oggz to call when a new Ogg page is found in the stream. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle previously opened for reading \item[{\em serialno}]Identify the logical bitstream in {\em oggz\/} to attach this callback to, or -1 to attach this callback to all unattached logical bitstreams in {\em oggz\/}. \item[{\em read\_\-page}]Your OggzReadPage callback function \item[{\em user\_\-data}]Arbitrary data you wish to pass to your callback \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY}]Out of memory\end{description}
-\end{Desc}
-\begin{Desc}
-\item[Note:]Values of {\em serialno\/} other than -1 allows you to specify different callback functions for each logical bitstream.
 
-It is safe to call this callback from within an OggzReadPage function, in order to specify that subsequent pages should be handled by a different OggzReadPage function. \end{Desc}
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle previously opened for reading \item[{\em serialno}]Identify the logical bitstream in {\itshape oggz\/} to attach this callback to, or -\/1 to attach this callback to all unattached logical bitstreams in {\itshape oggz\/}. \item[{\em read\_\-page}]Your OggzReadPage callback function \item[{\em user\_\-data}]Arbitrary data you wish to pass to your callback \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY}]Out of memory\end{DoxyRetVals}
+\begin{DoxyNote}{Note}
+Values of {\itshape serialno\/} other than -\/1 allows you to specify different callback functions for each logical bitstream.
+
+It is safe to call this callback from within an OggzReadPage function, in order to specify that subsequent pages should be handled by a different OggzReadPage function. 
+\end{DoxyNote}
diff -Nru liboggz-1.1.0/doc/liboggz/latex/group__seek__api.tex liboggz-1.1.1/doc/liboggz/latex/group__seek__api.tex
--- liboggz-1.1.0/doc/liboggz/latex/group__seek__api.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/group__seek__api.tex	2010-04-24 00:13:55.000000000 +0000
@@ -2,116 +2,114 @@
 \label{group__seek__api}\index{Oggz Seek API@{Oggz Seek API}}
 
 
-\subsection{Detailed Description}
-Oggz can seek on multitrack, multicodec bitstreams. 
-
-\subsection{Time seeking}\label{group__seek__api_seek_time}
-Support is built-in for seeking to time positions in {\tt CELT}, {\tt CMML}. {\tt FLAC}, {\tt OggPCM}, {\tt Speex}, {\tt Theora} and {\tt Vorbis}. Oggz is also compatible with {\tt Annodex} streams, and supports seeking on all tracks described in an {\tt Ogg Skeleton} track.
-
-You need to open the file with the OGGZ\_\-AUTO flag set:
-
-\begin{itemize}
-\item Create an OGGZ handle for reading with {\em flags\/} = OGGZ\_\-READ $|$ OGGZ\_\-AUTO\item Read data, ensuring that you have received all b\_\-o\_\-s pages before attempting to seek.\end{itemize}
-
+Oggz can seek on multitrack, multicodec bitstreams.  
 
-Oggz will silently parse known codec headers and associate metrics appropriately; if you attempt to seek before you have received all b\_\-o\_\-s pages, Oggz will not have had a chance to parse the codec headers and associate metrics. It is safe to seek once you have received a packet with {\em b\_\-o\_\-s\/} == 0; see the \doxyref{Ogg basics }{p.}{group__basics} section for more details.
-
-\begin{Desc}
-\item[Note:]Oggz parses these codec headers internally, and so liboggz is {\bf not} linked to libspeex, libvorbis, libflac, libtheora, libcmml or libannodex.\end{Desc}
-For other data streams, you will need to provide a metric function; see the section on \doxyref{Using OggzMetrics }{p.}{group__metric} for details of setting up and seeking with metrics.\subsection{Byte seeking}\label{group__seek__api_seek_bytes}
-\doxyref{oggz\_\-seek()}{p.}{group__seek__api_geef4b261d443701207954e5a636d6817} provides low-level seeking to byte positions.\subsection{More detail}\label{group__seek__api_seek_info}
-For a full description of the seeking methods possible in Ogg, see \doxyref{Semantics of seeking in Ogg bitstreams }{p.}{group__seek__semantics}. 
 
 \subsection*{Functions}
-\begin{CompactItemize}
+\begin{DoxyCompactItemize}
 \item 
 ogg\_\-int64\_\-t {\bf oggz\_\-tell\_\-units} ({\bf OGGZ} $\ast$oggz)
-\begin{CompactList}\small\item\em Query the current offset in milliseconds, or custom units as specified by a Metric function you have provided. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Query the current offset in milliseconds, or custom units as specified by a Metric function you have provided. \item\end{DoxyCompactList}\item 
 ogg\_\-int64\_\-t {\bf oggz\_\-seek\_\-units} ({\bf OGGZ} $\ast$oggz, ogg\_\-int64\_\-t units, int whence)
-\begin{CompactList}\small\item\em Seek to an offset in milliseconds, or custom units as specified by a Metric function you have provided. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Seek to an offset in milliseconds, or custom units as specified by a Metric function you have provided. \item\end{DoxyCompactList}\item 
 ogg\_\-int64\_\-t {\bf oggz\_\-tell\_\-granulepos} ({\bf OGGZ} $\ast$oggz)
-\begin{CompactList}\small\item\em Provide the exact stored granulepos (from the page header) if relevant to the current packet, or a constructed granulepos if the stored granulepos does not belong to this packet, or -1 if this codec does not have support for granulepos interpolation. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Provide the exact stored granulepos (from the page header) if relevant to the current packet, or a constructed granulepos if the stored granulepos does not belong to this packet, or -\/1 if this codec does not have support for granulepos interpolation. \item\end{DoxyCompactList}\item 
 oggz\_\-off\_\-t {\bf oggz\_\-tell} ({\bf OGGZ} $\ast$oggz)
-\begin{CompactList}\small\item\em Query the file offset in bytes corresponding to the data read. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Query the file offset in bytes corresponding to the data read. \item\end{DoxyCompactList}\item 
 oggz\_\-off\_\-t {\bf oggz\_\-seek} ({\bf OGGZ} $\ast$oggz, oggz\_\-off\_\-t offset, int whence)
-\begin{CompactList}\small\item\em Seek to a specific byte offset. \item\end{CompactList}\end{CompactItemize}
+\begin{DoxyCompactList}\small\item\em Seek to a specific byte offset. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
 
 
+\subsection{Detailed Description}
+Oggz can seek on multitrack, multicodec bitstreams. \subsection{Time seeking}\label{group__seek__api_seek_time}
+Support is built-\/in for seeking to time positions in {\tt CELT}, {\tt CMML}. {\tt FLAC}, {\tt OggPCM}, {\tt Speex}, {\tt Theora} and {\tt Vorbis}. Oggz is also compatible with {\tt Annodex} streams, and supports seeking on all tracks described in an {\tt Ogg Skeleton} track.
+
+You need to open the file with the OGGZ\_\-AUTO flag set:
+
+
+\begin{DoxyItemize}
+\item Create an OGGZ handle for reading with {\itshape flags\/} = OGGZ\_\-READ $|$ OGGZ\_\-AUTO
+\item Read data, ensuring that you have received all b\_\-o\_\-s pages before attempting to seek.
+\end{DoxyItemize}
+
+Oggz will silently parse known codec headers and associate metrics appropriately; if you attempt to seek before you have received all b\_\-o\_\-s pages, Oggz will not have had a chance to parse the codec headers and associate metrics. It is safe to seek once you have received a packet with {\itshape b\_\-o\_\-s\/} == 0; see the \doxyref{Ogg basics }{p.}{group__basics} section for more details.
+
+\begin{DoxyNote}{Note}
+Oggz parses these codec headers internally, and so liboggz is {\bfseries not} linked to libspeex, libvorbis, libflac, libtheora, libcmml or libannodex.
+\end{DoxyNote}
+For other data streams, you will need to provide a metric function; see the section on \doxyref{Using OggzMetrics }{p.}{group__metric} for details of setting up and seeking with metrics.\subsection{Byte seeking}\label{group__seek__api_seek_bytes}
+\doxyref{oggz\_\-seek()}{p.}{group__seek__api_gaeef4b261d443701207954e5a636d6817} provides low-\/level seeking to byte positions.\subsection{More detail}\label{group__seek__api_seek_info}
+For a full description of the seeking methods possible in Ogg, see \doxyref{Semantics of seeking in Ogg bitstreams }{p.}{group__seek__semantics}. 
+
 \subsection{Function Documentation}
 \index{seek\_\-api@{seek\_\-api}!oggz\_\-seek@{oggz\_\-seek}}
 \index{oggz\_\-seek@{oggz\_\-seek}!seek_api@{seek\_\-api}}
-\subsubsection[oggz\_\-seek]{\setlength{\rightskip}{0pt plus 5cm}oggz\_\-off\_\-t oggz\_\-seek ({\bf OGGZ} $\ast$ {\em oggz}, \/  oggz\_\-off\_\-t {\em offset}, \/  int {\em whence})}\label{group__seek__api_geef4b261d443701207954e5a636d6817}
+\subsubsection[{oggz\_\-seek}]{\setlength{\rightskip}{0pt plus 5cm}oggz\_\-off\_\-t oggz\_\-seek ({\bf OGGZ} $\ast$ {\em oggz}, \/  oggz\_\-off\_\-t {\em offset}, \/  int {\em whence})}\label{group__seek__api_gaeef4b261d443701207954e5a636d6817}
 
 
 Seek to a specific byte offset. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \item[{\em offset}]a byte offset \item[{\em whence}]As defined in $<$stdio.h$>$: SEEK\_\-SET, SEEK\_\-CUR or SEEK\_\-END \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]the new file offset, or -1 on failure. \end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \item[{\em offset}]a byte offset \item[{\em whence}]As defined in $<$stdio.h$>$: SEEK\_\-SET, SEEK\_\-CUR or SEEK\_\-END \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+the new file offset, or -\/1 on failure. 
+\end{DoxyReturn}
 \index{seek\_\-api@{seek\_\-api}!oggz\_\-seek\_\-units@{oggz\_\-seek\_\-units}}
 \index{oggz\_\-seek\_\-units@{oggz\_\-seek\_\-units}!seek_api@{seek\_\-api}}
-\subsubsection[oggz\_\-seek\_\-units]{\setlength{\rightskip}{0pt plus 5cm}ogg\_\-int64\_\-t oggz\_\-seek\_\-units ({\bf OGGZ} $\ast$ {\em oggz}, \/  ogg\_\-int64\_\-t {\em units}, \/  int {\em whence})}\label{group__seek__api_g60bac88ef3695629efacec43a21927e5}
+\subsubsection[{oggz\_\-seek\_\-units}]{\setlength{\rightskip}{0pt plus 5cm}ogg\_\-int64\_\-t oggz\_\-seek\_\-units ({\bf OGGZ} $\ast$ {\em oggz}, \/  ogg\_\-int64\_\-t {\em units}, \/  int {\em whence})}\label{group__seek__api_ga60bac88ef3695629efacec43a21927e5}
 
 
 Seek to an offset in milliseconds, or custom units as specified by a Metric function you have provided. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \item[{\em units}]A number of milliseconds, or custom units \item[{\em whence}]As defined in $<$stdio.h$>$: SEEK\_\-SET, SEEK\_\-CUR or SEEK\_\-END \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]the new file offset, or -1 on failure. \end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \item[{\em units}]A number of milliseconds, or custom units \item[{\em whence}]As defined in $<$stdio.h$>$: SEEK\_\-SET, SEEK\_\-CUR or SEEK\_\-END \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+the new file offset, or -\/1 on failure. 
+\end{DoxyReturn}
 \index{seek\_\-api@{seek\_\-api}!oggz\_\-tell@{oggz\_\-tell}}
 \index{oggz\_\-tell@{oggz\_\-tell}!seek_api@{seek\_\-api}}
-\subsubsection[oggz\_\-tell]{\setlength{\rightskip}{0pt plus 5cm}oggz\_\-off\_\-t oggz\_\-tell ({\bf OGGZ} $\ast$ {\em oggz})}\label{group__seek__api_g553fabfa03553669f79e37b28eb07ec6}
+\subsubsection[{oggz\_\-tell}]{\setlength{\rightskip}{0pt plus 5cm}oggz\_\-off\_\-t oggz\_\-tell ({\bf OGGZ} $\ast$ {\em oggz})}\label{group__seek__api_ga553fabfa03553669f79e37b28eb07ec6}
 
 
 Query the file offset in bytes corresponding to the data read. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]The current offset of oggz.\end{Desc}
-\begin{Desc}
-\item[Note:]When reading, the value returned by \doxyref{oggz\_\-tell()}{p.}{group__seek__api_g553fabfa03553669f79e37b28eb07ec6} reflects the data offset of the start of the most recent packet processed, so that when called from an OggzReadPacket callback it reflects the byte offset of the start of the packet. As Oggz may have internally read ahead, this may differ from the current offset of the associated file descriptor. \end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+The current offset of oggz.
+\end{DoxyReturn}
+\begin{DoxyNote}{Note}
+When reading, the value returned by \doxyref{oggz\_\-tell()}{p.}{group__seek__api_ga553fabfa03553669f79e37b28eb07ec6} reflects the data offset of the start of the most recent packet processed, so that when called from an OggzReadPacket callback it reflects the byte offset of the start of the packet. As Oggz may have internally read ahead, this may differ from the current offset of the associated file descriptor. 
+\end{DoxyNote}
 \index{seek\_\-api@{seek\_\-api}!oggz\_\-tell\_\-granulepos@{oggz\_\-tell\_\-granulepos}}
 \index{oggz\_\-tell\_\-granulepos@{oggz\_\-tell\_\-granulepos}!seek_api@{seek\_\-api}}
-\subsubsection[oggz\_\-tell\_\-granulepos]{\setlength{\rightskip}{0pt plus 5cm}ogg\_\-int64\_\-t oggz\_\-tell\_\-granulepos ({\bf OGGZ} $\ast$ {\em oggz})}\label{group__seek__api_g29181fb4e8f4e3629cb84810614acd30}
+\subsubsection[{oggz\_\-tell\_\-granulepos}]{\setlength{\rightskip}{0pt plus 5cm}ogg\_\-int64\_\-t oggz\_\-tell\_\-granulepos ({\bf OGGZ} $\ast$ {\em oggz})}\label{group__seek__api_ga29181fb4e8f4e3629cb84810614acd30}
+
 
+Provide the exact stored granulepos (from the page header) if relevant to the current packet, or a constructed granulepos if the stored granulepos does not belong to this packet, or -\/1 if this codec does not have support for granulepos interpolation. 
 
-Provide the exact stored granulepos (from the page header) if relevant to the current packet, or a constructed granulepos if the stored granulepos does not belong to this packet, or -1 if this codec does not have support for granulepos interpolation. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]the granulepos of the {\em current\/} packet (if available) \end{Desc}
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+the granulepos of the {\itshape current\/} packet (if available) 
+\end{DoxyReturn}
 \index{seek\_\-api@{seek\_\-api}!oggz\_\-tell\_\-units@{oggz\_\-tell\_\-units}}
 \index{oggz\_\-tell\_\-units@{oggz\_\-tell\_\-units}!seek_api@{seek\_\-api}}
-\subsubsection[oggz\_\-tell\_\-units]{\setlength{\rightskip}{0pt plus 5cm}ogg\_\-int64\_\-t oggz\_\-tell\_\-units ({\bf OGGZ} $\ast$ {\em oggz})}\label{group__seek__api_g2ec088fc5541ce9749ce63ccc162761f}
+\subsubsection[{oggz\_\-tell\_\-units}]{\setlength{\rightskip}{0pt plus 5cm}ogg\_\-int64\_\-t oggz\_\-tell\_\-units ({\bf OGGZ} $\ast$ {\em oggz})}\label{group__seek__api_ga2ec088fc5541ce9749ce63ccc162761f}
 
 
 Query the current offset in milliseconds, or custom units as specified by a Metric function you have provided. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]the offset in milliseconds, or custom units \end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+the offset in milliseconds, or custom units 
+\end{DoxyReturn}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \end{DoxyRetVals}
diff -Nru liboggz-1.1.0/doc/liboggz/latex/group__seek__semantics.tex liboggz-1.1.1/doc/liboggz/latex/group__seek__semantics.tex
--- liboggz-1.1.0/doc/liboggz/latex/group__seek__semantics.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/group__seek__semantics.tex	2010-04-24 00:13:55.000000000 +0000
@@ -5,15 +5,16 @@
 
 [$\ast$$\ast$$\ast$ This line works around a bug in doxygen $\ast$$\ast$$\ast$]
 
-The seeking semantics of the Ogg file format were outlined by Monty in {\tt a post to theora-dev} in September 2002. Quoting from that post, we have the following assumptions:
+The seeking semantics of the Ogg file format were outlined by Monty in {\tt a post to theora-\/dev} in September 2002. Quoting from that post, we have the following assumptions:
 
-\begin{itemize}
-\item Ogg is not a non-linear format. ... It is a media transport format designed to do nothing more than deliver content, in a stream, and have all the pieces arrive on time and in sync.\item The Ogg layer does not know the specifics of the codec data it's multiplexing into a stream. It knows nothing beyond 'Oooo, packets!', that the packets belong to different buckets, that the packets go in order, and that packets have position markers. Ogg does not even have a concept of 'time'; it only knows about the sequentially increasing, unitless position markers. It is up to higher layers which have access to the codec APIs to assign and convert units of framing or time.\end{itemize}
 
+\begin{DoxyItemize}
+\item Ogg is not a non-\/linear format. ... It is a media transport format designed to do nothing more than deliver content, in a stream, and have all the pieces arrive on time and in sync.
+\item The Ogg layer does not know the specifics of the codec data it's multiplexing into a stream. It knows nothing beyond 'Oooo, packets!', that the packets belong to different buckets, that the packets go in order, and that packets have position markers. Ogg does not even have a concept of 'time'; it only knows about the sequentially increasing, unitless position markers. It is up to higher layers which have access to the codec APIs to assign and convert units of framing or time.
+\end{DoxyItemize}
 
 (For more details on the structure of Ogg streams, see the \doxyref{Ogg Basics }{p.}{group__basics} section).
 
 For data such as media, for which it is possible to provide a mapping such as 'time', Oggz can efficiently navigate through an Ogg stream by use of an OggzMetric callback, thus allowing automatic seeking to points in 'time'.
 
-For common codecs you can ask Oggz to set this for you automatically by instantiating the OGGZ handle with the OGGZ\_\-AUTO flag set. For others you can specify a multiplier with \doxyref{oggz\_\-set\_\-metric\_\-linear()}{p.}{oggz__deprecated_8h_12f232bca448853e66a1226ddccff7e0}, or a generic non-linear metric with \doxyref{oggz\_\-set\_\-metric()}{p.}{group__metric_g5a630e8dcd04e1dd6601d8f56f0af3f6}. 
-
+For common codecs you can ask Oggz to set this for you automatically by instantiating the OGGZ handle with the OGGZ\_\-AUTO flag set. For others you can specify a multiplier with \doxyref{oggz\_\-set\_\-metric\_\-linear()}{p.}{oggz__deprecated_8h_a12f232bca448853e66a1226ddccff7e0}, or a generic non-\/linear metric with \doxyref{oggz\_\-set\_\-metric()}{p.}{group__metric_ga5a630e8dcd04e1dd6601d8f56f0af3f6}. 
\ No newline at end of file
diff -Nru liboggz-1.1.0/doc/liboggz/latex/group__write__api.tex liboggz-1.1.1/doc/liboggz/latex/group__write__api.tex
--- liboggz-1.1.0/doc/liboggz/latex/group__write__api.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/group__write__api.tex	2010-04-24 00:13:55.000000000 +0000
@@ -2,154 +2,138 @@
 \label{group__write__api}\index{Oggz Write API@{Oggz Write API}}
 
 
-\subsection{Detailed Description}
-Oggz maintains a packet queue, such that you can independently add packets to the queue and write an Ogg bitstream. 
-
-There are two complementary methods for adding packets to the packet queue.
-
-\begin{itemize}
-\item by \doxyref{force feeding Oggz }{p.}{group__force__feed}\item by using \doxyref{OggzHungry }{p.}{group__hungry} callbacks\end{itemize}
-
-
-As each packet is enqueued, its validity is checked against the framing constraints outlined in the \doxyref{Ogg basics }{p.}{group__basics} section. If it does not pass these constraints, \doxyref{oggz\_\-write\_\-feed()}{p.}{group__write__api_g6ccaceb107db1fd2eae047dbdbaa5889} will fail with an appropriate error code.
-
-\begin{Desc}
-\item[Note:]\begin{itemize}
-\item When writing, you can ensure that a packet starts on a new page by setting the {\em flush\/} parameter of \doxyref{oggz\_\-write\_\-feed()}{p.}{group__write__api_g6ccaceb107db1fd2eae047dbdbaa5889} to {\em OGGZ\_\-FLUSH\_\-BEFORE\/} when enqueuing it. Similarly you can ensure that the last page a packet is written into won't contain any following packets by setting the {\em flush\/} parameter of \doxyref{oggz\_\-write\_\-feed()}{p.}{group__write__api_g6ccaceb107db1fd2eae047dbdbaa5889} to {\em OGGZ\_\-FLUSH\_\-AFTER\/}.\item The {\em OGGZ\_\-FLUSH\_\-BEFORE\/} and {\em OGGZ\_\-FLUSH\_\-AFTER\/} flags can be bitwise OR'd together to ensure that the packet will not share any pages with any other packets, either before or after. \end{itemize}
-\end{Desc}
+Oggz maintains a packet queue, such that you can independently add packets to the queue and write an Ogg bitstream.  
 
 
 \subsection*{Typedefs}
-\begin{CompactItemize}
+\begin{DoxyCompactItemize}
 \item 
 typedef int($\ast$ {\bf OggzWriteHungry} )({\bf OGGZ} $\ast$oggz, int empty, void $\ast$user\_\-data)
-\begin{CompactList}\small\item\em This is the signature of a callback which Oggz will call when {\em oggz\/} is \doxyref{hungry }{p.}{group__hungry}. \item\end{CompactList}\end{CompactItemize}
+\begin{DoxyCompactList}\small\item\em This is the signature of a callback which Oggz will call when {\itshape oggz\/} is \doxyref{hungry }{p.}{group__hungry}. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
 \subsection*{Functions}
-\begin{CompactItemize}
+\begin{DoxyCompactItemize}
 \item 
 int {\bf oggz\_\-write\_\-set\_\-hungry\_\-callback} ({\bf OGGZ} $\ast$oggz, {\bf OggzWriteHungry} hungry, int only\_\-when\_\-empty, void $\ast$user\_\-data)
-\begin{CompactList}\small\item\em Set a callback for Oggz to call when {\em oggz\/} is \doxyref{hungry }{p.}{group__hungry}. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Set a callback for Oggz to call when {\itshape oggz\/} is \doxyref{hungry }{p.}{group__hungry}. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-write\_\-feed} ({\bf OGGZ} $\ast$oggz, ogg\_\-packet $\ast$op, long serialno, int flush, int $\ast$guard)
-\begin{CompactList}\small\item\em Add a packet to {\em oggz's\/} packet queue. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Add a packet to {\itshape oggz's\/} packet queue. \item\end{DoxyCompactList}\item 
 long {\bf oggz\_\-write\_\-output} ({\bf OGGZ} $\ast$oggz, unsigned char $\ast$buf, long n)
-\begin{CompactList}\small\item\em Output data from an OGGZ handle. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Output data from an OGGZ handle. \item\end{DoxyCompactList}\item 
 long {\bf oggz\_\-write} ({\bf OGGZ} $\ast$oggz, long n)
-\begin{CompactList}\small\item\em Write n bytes from an OGGZ handle. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Write n bytes from an OGGZ handle. \item\end{DoxyCompactList}\item 
 long {\bf oggz\_\-write\_\-get\_\-next\_\-page\_\-size} ({\bf OGGZ} $\ast$oggz)
-\begin{CompactList}\small\item\em Query the number of bytes in the next page to be written. \item\end{CompactList}\end{CompactItemize}
+\begin{DoxyCompactList}\small\item\em Query the number of bytes in the next page to be written. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
+
+
+\subsection{Detailed Description}
+Oggz maintains a packet queue, such that you can independently add packets to the queue and write an Ogg bitstream. There are two complementary methods for adding packets to the packet queue.
+
+
+\begin{DoxyItemize}
+\item by \doxyref{force feeding Oggz }{p.}{group__force__feed}
+\item by using \doxyref{OggzHungry }{p.}{group__hungry} callbacks
+\end{DoxyItemize}
+
+As each packet is enqueued, its validity is checked against the framing constraints outlined in the \doxyref{Ogg basics }{p.}{group__basics} section. If it does not pass these constraints, \doxyref{oggz\_\-write\_\-feed()}{p.}{group__write__api_ga6ccaceb107db1fd2eae047dbdbaa5889} will fail with an appropriate error code.
+
+\begin{DoxyNote}{Note}
+
+\begin{DoxyItemize}
+\item When writing, you can ensure that a packet starts on a new page by setting the {\itshape flush\/} parameter of \doxyref{oggz\_\-write\_\-feed()}{p.}{group__write__api_ga6ccaceb107db1fd2eae047dbdbaa5889} to {\itshape OGGZ\_\-FLUSH\_\-BEFORE\/} when enqueuing it. Similarly you can ensure that the last page a packet is written into won't contain any following packets by setting the {\itshape flush\/} parameter of \doxyref{oggz\_\-write\_\-feed()}{p.}{group__write__api_ga6ccaceb107db1fd2eae047dbdbaa5889} to {\itshape OGGZ\_\-FLUSH\_\-AFTER\/}.
+\item The {\itshape OGGZ\_\-FLUSH\_\-BEFORE\/} and {\itshape OGGZ\_\-FLUSH\_\-AFTER\/} flags can be bitwise OR'd together to ensure that the packet will not share any pages with any other packets, either before or after. 
+\end{DoxyItemize}
+\end{DoxyNote}
 
 
 \subsection{Typedef Documentation}
 \index{write\_\-api@{write\_\-api}!OggzWriteHungry@{OggzWriteHungry}}
 \index{OggzWriteHungry@{OggzWriteHungry}!write_api@{write\_\-api}}
-\subsubsection[OggzWriteHungry]{\setlength{\rightskip}{0pt plus 5cm}typedef int($\ast$ {\bf OggzWriteHungry})({\bf OGGZ} $\ast$oggz, int empty, void $\ast$user\_\-data)}\label{group__write__api_g27ef9f56078d3c015431b1a67b2c1812}
+\subsubsection[{OggzWriteHungry}]{\setlength{\rightskip}{0pt plus 5cm}typedef int($\ast$ {\bf OggzWriteHungry})({\bf OGGZ} $\ast$oggz, int empty, void $\ast$user\_\-data)}\label{group__write__api_ga27ef9f56078d3c015431b1a67b2c1812}
+
 
+This is the signature of a callback which Oggz will call when {\itshape oggz\/} is \doxyref{hungry }{p.}{group__hungry}. 
 
-This is the signature of a callback which Oggz will call when {\em oggz\/} is \doxyref{hungry }{p.}{group__hungry}. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]The OGGZ handle \item[{\em empty}]A value of 1 indicates that the packet queue is currently empty. A value of 0 indicates that the packet queue is not empty. \item[{\em user\_\-data}]A generic pointer you have provided earlier \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em 0}]Continue \item[{\em non-zero}]Instruct Oggz to stop. \end{description}
-\end{Desc}
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]The OGGZ handle \item[{\em empty}]A value of 1 indicates that the packet queue is currently empty. A value of 0 indicates that the packet queue is not empty. \item[{\em user\_\-data}]A generic pointer you have provided earlier \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em 0}]Continue \item[{\em non-\/zero}]Instruct Oggz to stop. \end{DoxyRetVals}
 
 
 \subsection{Function Documentation}
 \index{write\_\-api@{write\_\-api}!oggz\_\-write@{oggz\_\-write}}
 \index{oggz\_\-write@{oggz\_\-write}!write_api@{write\_\-api}}
-\subsubsection[oggz\_\-write]{\setlength{\rightskip}{0pt plus 5cm}long oggz\_\-write ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em n})}\label{group__write__api_g3c97d94ea425d64546adf9c368b71904}
+\subsubsection[{oggz\_\-write}]{\setlength{\rightskip}{0pt plus 5cm}long oggz\_\-write ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em n})}\label{group__write__api_ga3c97d94ea425d64546adf9c368b71904}
 
 
 Write n bytes from an OGGZ handle. 
 
 Oggz will call your write callback as needed.
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle previously opened for writing \item[{\em n}]A count of bytes to be written \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em $>$ 0}]The number of bytes successfully output \item[{\em 0}]End of stream \item[{\em OGGZ\_\-ERR\_\-RECURSIVE\_\-WRITE}]Attempt to initiate writing from within an OggzHungry callback \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-STOP\_\-OK}]Writing was stopped by an OggzHungry callback returning OGGZ\_\-STOP\_\-OK \item[{\em OGGZ\_\-ERR\_\-STOP\_\-ERR}]Reading was stopped by an OggzHungry callback returning OGGZ\_\-STOP\_\-ERR \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle previously opened for writing \item[{\em n}]A count of bytes to be written \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em $>$ 0}]The number of bytes successfully output \item[{\em 0}]End of stream \item[{\em OGGZ\_\-ERR\_\-RECURSIVE\_\-WRITE}]Attempt to initiate writing from within an OggzHungry callback \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-STOP\_\-OK}]Writing was stopped by an OggzHungry callback returning OGGZ\_\-STOP\_\-OK \item[{\em OGGZ\_\-ERR\_\-STOP\_\-ERR}]Reading was stopped by an OggzHungry callback returning OGGZ\_\-STOP\_\-ERR \end{DoxyRetVals}
 \index{write\_\-api@{write\_\-api}!oggz\_\-write\_\-feed@{oggz\_\-write\_\-feed}}
 \index{oggz\_\-write\_\-feed@{oggz\_\-write\_\-feed}!write_api@{write\_\-api}}
-\subsubsection[oggz\_\-write\_\-feed]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-write\_\-feed ({\bf OGGZ} $\ast$ {\em oggz}, \/  ogg\_\-packet $\ast$ {\em op}, \/  long {\em serialno}, \/  int {\em flush}, \/  int $\ast$ {\em guard})}\label{group__write__api_g6ccaceb107db1fd2eae047dbdbaa5889}
+\subsubsection[{oggz\_\-write\_\-feed}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-write\_\-feed ({\bf OGGZ} $\ast$ {\em oggz}, \/  ogg\_\-packet $\ast$ {\em op}, \/  long {\em serialno}, \/  int {\em flush}, \/  int $\ast$ {\em guard})}\label{group__write__api_ga6ccaceb107db1fd2eae047dbdbaa5889}
+
+
+Add a packet to {\itshape oggz's\/} packet queue. 
 
 
-Add a packet to {\em oggz's\/} packet queue. 
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle previously opened for writing \item[{\em op}]An ogg\_\-packet with all fields filled in \item[{\em serialno}]Identify the logical bitstream in {\itshape oggz\/} to add the packet to \item[{\em flush}]Bitmask of OGGZ\_\-FLUSH\_\-BEFORE, OGGZ\_\-FLUSH\_\-AFTER \item[{\em guard}]A guard for nocopy, NULL otherwise \end{DoxyParams}
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle previously opened for writing \item[{\em op}]An ogg\_\-packet with all fields filled in \item[{\em serialno}]Identify the logical bitstream in {\em oggz\/} to add the packet to \item[{\em flush}]Bitmask of OGGZ\_\-FLUSH\_\-BEFORE, OGGZ\_\-FLUSH\_\-AFTER \item[{\em guard}]A guard for nocopy, NULL otherwise \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD\_\-GUARD}]{\em guard\/} specified has non-zero initialization \item[{\em OGGZ\_\-ERR\_\-BOS}]Packet would be bos packet of a new logical bitstream, but oggz has already written one or more non-bos packets in other logical bitstreams, and {\em oggz\/} is not flagged OGGZ\_\-NONSTRICT \item[{\em OGGZ\_\-ERR\_\-EOS}]The logical bitstream identified by {\em serialno\/} is already at eos, and {\em oggz\/} is not flagged OGGZ\_\-NONSTRICT \item[{\em OGGZ\_\-ERR\_\-BAD\_\-BYTES}]{\em op-$>$bytes\/} is invalid, and {\em oggz\/} is not flagged OGGZ\_\-NONSTRICT \item[{\em OGGZ\_\-ERR\_\-BAD\_\-B\_\-O\_\-S}]{\em op-$>$b\_\-o\_\-s\/} is invalid, and {\em oggz\/} is not flagged OGGZ\_\-NONSTRICT \item[{\em OGGZ\_\-ERR\_\-BAD\_\-GRANULEPOS}]{\em op-$>$granulepos\/} is less than that of an earlier packet within this logical bitstream, and {\em oggz\/} is not flagged OGGZ\_\-NONSTRICT \item[{\em OGGZ\_\-ERR\_\-BAD\_\-PACKETNO}]{\em op-$>$packetno\/} is less than that of an earlier packet within this logical bitstream, and {\em oggz\/} is not flagged OGGZ\_\-NONSTRICT \item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\em serialno\/} does not identify an existing logical bitstream in {\em oggz\/}, and {\em oggz\/} is not flagged OGGZ\_\-NONSTRICT or {\em serialno\/} is equal to -1, or {\em serialno\/} does not fit in 32 bits, ie. within the range (-(2$^\wedge$31), (2$^\wedge$31)-1) \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY}]Unable to allocate memory to queue packet\end{description}
-\end{Desc}
-\begin{Desc}
-\item[Note:]If {\em op-$>$b\_\-o\_\-s\/} is initialized to {\em -1\/} before calling \doxyref{oggz\_\-write\_\-feed()}{p.}{group__write__api_g6ccaceb107db1fd2eae047dbdbaa5889}, Oggz will fill it in with the appropriate value; ie. 1 for the first packet of a new stream, and 0 otherwise. \end{Desc}
+\begin{DoxyRetVals}{Return values}
+\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD\_\-GUARD}]{\itshape guard\/} specified has non-\/zero initialization \item[{\em OGGZ\_\-ERR\_\-BOS}]Packet would be bos packet of a new logical bitstream, but oggz has already written one or more non-\/bos packets in other logical bitstreams, and {\itshape oggz\/} is not flagged OGGZ\_\-NONSTRICT \item[{\em OGGZ\_\-ERR\_\-EOS}]The logical bitstream identified by {\itshape serialno\/} is already at eos, and {\itshape oggz\/} is not flagged OGGZ\_\-NONSTRICT \item[{\em OGGZ\_\-ERR\_\-BAD\_\-BYTES}]{\itshape op-\/$>$bytes\/} is invalid, and {\itshape oggz\/} is not flagged OGGZ\_\-NONSTRICT \item[{\em OGGZ\_\-ERR\_\-BAD\_\-B\_\-O\_\-S}]{\itshape op-\/$>$b\_\-o\_\-s\/} is invalid, and {\itshape oggz\/} is not flagged OGGZ\_\-NONSTRICT \item[{\em OGGZ\_\-ERR\_\-BAD\_\-GRANULEPOS}]{\itshape op-\/$>$granulepos\/} is less than that of an earlier packet within this logical bitstream, and {\itshape oggz\/} is not flagged OGGZ\_\-NONSTRICT \item[{\em OGGZ\_\-ERR\_\-BAD\_\-PACKETNO}]{\itshape op-\/$>$packetno\/} is less than that of an earlier packet within this logical bitstream, and {\itshape oggz\/} is not flagged OGGZ\_\-NONSTRICT \item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\itshape serialno\/} does not identify an existing logical bitstream in {\itshape oggz\/}, and {\itshape oggz\/} is not flagged OGGZ\_\-NONSTRICT or {\itshape serialno\/} is equal to -\/1, or {\itshape serialno\/} does not fit in 32 bits, ie. within the range (-\/(2$^\wedge$31), (2$^\wedge$31)-\/1) \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY}]Unable to allocate memory to queue packet\end{DoxyRetVals}
+\begin{DoxyNote}{Note}
+If {\itshape op-\/$>$b\_\-o\_\-s\/} is initialized to {\itshape -\/1\/} before calling \doxyref{oggz\_\-write\_\-feed()}{p.}{group__write__api_ga6ccaceb107db1fd2eae047dbdbaa5889}, Oggz will fill it in with the appropriate value; ie. 1 for the first packet of a new stream, and 0 otherwise. 
+\end{DoxyNote}
 \index{write\_\-api@{write\_\-api}!oggz\_\-write\_\-get\_\-next\_\-page\_\-size@{oggz\_\-write\_\-get\_\-next\_\-page\_\-size}}
 \index{oggz\_\-write\_\-get\_\-next\_\-page\_\-size@{oggz\_\-write\_\-get\_\-next\_\-page\_\-size}!write_api@{write\_\-api}}
-\subsubsection[oggz\_\-write\_\-get\_\-next\_\-page\_\-size]{\setlength{\rightskip}{0pt plus 5cm}long oggz\_\-write\_\-get\_\-next\_\-page\_\-size ({\bf OGGZ} $\ast$ {\em oggz})}\label{group__write__api_gb25da7d2cbf39585357f2a426d3dba2f}
+\subsubsection[{oggz\_\-write\_\-get\_\-next\_\-page\_\-size}]{\setlength{\rightskip}{0pt plus 5cm}long oggz\_\-write\_\-get\_\-next\_\-page\_\-size ({\bf OGGZ} $\ast$ {\em oggz})}\label{group__write__api_gab25da7d2cbf39585357f2a426d3dba2f}
 
 
 Query the number of bytes in the next page to be written. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle previously opened for writing \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em $>$= 0}]The number of bytes in the next page \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle previously opened for writing \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em $>$= 0}]The number of bytes in the next page \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \end{DoxyRetVals}
 \index{write\_\-api@{write\_\-api}!oggz\_\-write\_\-output@{oggz\_\-write\_\-output}}
 \index{oggz\_\-write\_\-output@{oggz\_\-write\_\-output}!write_api@{write\_\-api}}
-\subsubsection[oggz\_\-write\_\-output]{\setlength{\rightskip}{0pt plus 5cm}long oggz\_\-write\_\-output ({\bf OGGZ} $\ast$ {\em oggz}, \/  unsigned char $\ast$ {\em buf}, \/  long {\em n})}\label{group__write__api_g5606dff01964caec4582eb172fde0c1c}
+\subsubsection[{oggz\_\-write\_\-output}]{\setlength{\rightskip}{0pt plus 5cm}long oggz\_\-write\_\-output ({\bf OGGZ} $\ast$ {\em oggz}, \/  unsigned char $\ast$ {\em buf}, \/  long {\em n})}\label{group__write__api_ga5606dff01964caec4582eb172fde0c1c}
 
 
 Output data from an OGGZ handle. 
 
 Oggz will call your write callback as needed.
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle previously opened for writing \item[{\em buf}]A memory buffer \item[{\em n}]A count of bytes to output \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em $>$ 0}]The number of bytes successfully output \item[{\em 0}]End of stream \item[{\em OGGZ\_\-ERR\_\-RECURSIVE\_\-WRITE}]Attempt to initiate writing from within an OggzHungry callback \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-STOP\_\-OK}]Writing was stopped by an OggzHungry callback returning OGGZ\_\-STOP\_\-OK \item[{\em OGGZ\_\-ERR\_\-STOP\_\-ERR}]Reading was stopped by an OggzHungry callback returning OGGZ\_\-STOP\_\-ERR \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle previously opened for writing \item[{\em buf}]A memory buffer \item[{\em n}]A count of bytes to output \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em $>$ 0}]The number of bytes successfully output \item[{\em 0}]End of stream \item[{\em OGGZ\_\-ERR\_\-RECURSIVE\_\-WRITE}]Attempt to initiate writing from within an OggzHungry callback \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-STOP\_\-OK}]Writing was stopped by an OggzHungry callback returning OGGZ\_\-STOP\_\-OK \item[{\em OGGZ\_\-ERR\_\-STOP\_\-ERR}]Reading was stopped by an OggzHungry callback returning OGGZ\_\-STOP\_\-ERR \end{DoxyRetVals}
 \index{write\_\-api@{write\_\-api}!oggz\_\-write\_\-set\_\-hungry\_\-callback@{oggz\_\-write\_\-set\_\-hungry\_\-callback}}
 \index{oggz\_\-write\_\-set\_\-hungry\_\-callback@{oggz\_\-write\_\-set\_\-hungry\_\-callback}!write_api@{write\_\-api}}
-\subsubsection[oggz\_\-write\_\-set\_\-hungry\_\-callback]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-write\_\-set\_\-hungry\_\-callback ({\bf OGGZ} $\ast$ {\em oggz}, \/  {\bf OggzWriteHungry} {\em hungry}, \/  int {\em only\_\-when\_\-empty}, \/  void $\ast$ {\em user\_\-data})}\label{group__write__api_gf362c030bc7a7f57cb23f2b863a59389}
+\subsubsection[{oggz\_\-write\_\-set\_\-hungry\_\-callback}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-write\_\-set\_\-hungry\_\-callback ({\bf OGGZ} $\ast$ {\em oggz}, \/  {\bf OggzWriteHungry} {\em hungry}, \/  int {\em only\_\-when\_\-empty}, \/  void $\ast$ {\em user\_\-data})}\label{group__write__api_gaf362c030bc7a7f57cb23f2b863a59389}
+
+
+Set a callback for Oggz to call when {\itshape oggz\/} is \doxyref{hungry }{p.}{group__hungry}. 
 
 
-Set a callback for Oggz to call when {\em oggz\/} is \doxyref{hungry }{p.}{group__hungry}. 
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle previously opened for writing \item[{\em hungry}]Your callback function \item[{\em only\_\-when\_\-empty}]When to call: a value of 0 indicates that Oggz should call {\itshape hungry()\/} after each and every packet is written; a value of 1 indicates that Oggz should call {\itshape hungry()\/} only when its packet queue is empty \item[{\em user\_\-data}]Arbitrary data you wish to pass to your callback \end{DoxyParams}
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle previously opened for writing \item[{\em hungry}]Your callback function \item[{\em only\_\-when\_\-empty}]When to call: a value of 0 indicates that Oggz should call {\em hungry()\/} after each and every packet is written; a value of 1 indicates that Oggz should call {\em hungry()\/} only when its packet queue is empty \item[{\em user\_\-data}]Arbitrary data you wish to pass to your callback \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Note:]Passing a value of 0 for {\em only\_\-when\_\-empty\/} allows you to feed new packets into {\em oggz's\/} packet queue on the fly. \end{Desc}
+\begin{DoxyRetVals}{Return values}
+\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \end{DoxyRetVals}
+\begin{DoxyNote}{Note}
+Passing a value of 0 for {\itshape only\_\-when\_\-empty\/} allows you to feed new packets into {\itshape oggz's\/} packet queue on the fly. 
+\end{DoxyNote}
diff -Nru liboggz-1.1.0/doc/liboggz/latex/index.tex liboggz-1.1.1/doc/liboggz/latex/index.tex
--- liboggz-1.1.0/doc/liboggz/latex/index.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/index.tex	2010-04-24 00:13:55.000000000 +0000
@@ -3,28 +3,37 @@
 
 liboggz supports the flexibility afforded by the Ogg file format while presenting the following API niceties:
 
-\begin{itemize}
-\item Strict adherence to the formatting requirements of Ogg \doxyref{bitstreams }{p.}{group__basics}, to ensure that only valid bitstreams are generated\item A simple, callback based open/read/close or open/write/close \doxyref{interface }{p.}{oggz_8h} to raw Ogg files\item A customisable \doxyref{seeking }{p.}{group__seek__api} abstraction for seeking on multitrack Ogg data\item A packet queue for feeding incoming packets for writing, with callback based notification when this queue is empty\item A means of overriding the \doxyref{IO functions }{p.}{oggz__io_8h} used by Oggz, for easier integration with media frameworks and similar systems.\item A handy \doxyref{table }{p.}{oggz__table_8h} structure for storing information on each logical bitstream\end{itemize}
-\subsection{Contents}\label{index_contents}
-\begin{itemize}
-\item \doxyref{Basics }{p.}{group__basics}: Information about Ogg required to understand liboggz\end{itemize}
 
+\begin{DoxyItemize}
+\item Strict adherence to the formatting requirements of Ogg \doxyref{bitstreams }{p.}{group__basics}, to ensure that only valid bitstreams are generated
+\item A simple, callback based open/read/close or open/write/close \doxyref{interface }{p.}{oggz_8h} to raw Ogg files
+\item A customisable \doxyref{seeking }{p.}{group__seek__api} abstraction for seeking on multitrack Ogg data
+\item A packet queue for feeding incoming packets for writing, with callback based notification when this queue is empty
+\item A means of overriding the \doxyref{IO functions }{p.}{oggz__io_8h} used by Oggz, for easier integration with media frameworks and similar systems.
+\item A handy \doxyref{table }{p.}{oggz__table_8h} structure for storing information on each logical bitstream
+\end{DoxyItemize}\subsection{Contents}\label{index_contents}
 
-\begin{itemize}
-\item \doxyref{oggz.h }{p.}{oggz_8h}: Documentation of the Oggz C API\end{itemize}
+\begin{DoxyItemize}
+\item \doxyref{Basics }{p.}{group__basics}: Information about Ogg required to understand liboggz
+\end{DoxyItemize}
 
 
-\begin{itemize}
-\item \doxyref{Configuration }{p.}{group__configuration}: Customizing liboggz to only read or write.\end{itemize}
+\begin{DoxyItemize}
+\item \doxyref{oggz.h }{p.}{oggz_8h}: Documentation of the Oggz C API
+\end{DoxyItemize}
 
 
-\begin{itemize}
-\item \doxyref{Building }{p.}{group__building}: Information related to building software that uses liboggz.\end{itemize}
-\section{Licensing}\label{index_Licensing}
-liboggz is provided under the following BSD-style open source license:
+\begin{DoxyItemize}
+\item \doxyref{Configuration }{p.}{group__configuration}: Customizing liboggz to only read or write.
+\end{DoxyItemize}
 
 
+\begin{DoxyItemize}
+\item \doxyref{Building }{p.}{group__building}: Information related to building software that uses liboggz.
+\end{DoxyItemize}\section{Licensing}\label{index_Licensing}
+liboggz is provided under the following BSD-\/style open source license:
 
-\begin{DocInclude}\begin{verbatim}\end{verbatim}
-\end{DocInclude}
+
+\begin{DoxyCodeInclude}
+\end{DoxyCodeInclude}
  
\ No newline at end of file
diff -Nru liboggz-1.1.0/doc/liboggz/latex/modules.tex liboggz-1.1.1/doc/liboggz/latex/modules.tex
--- liboggz-1.1.0/doc/liboggz/latex/modules.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/modules.tex	2010-04-24 00:13:55.000000000 +0000
@@ -1,5 +1,5 @@
 \section{Modules}
-Here is a list of all modules:\begin{CompactList}
+Here is a list of all modules:\begin{DoxyCompactList}
 \item \contentsline{section}{Ogg basics}{\pageref{group__basics}}{}
 \item \contentsline{section}{Configuration}{\pageref{group__configuration}}{}
 \item \contentsline{section}{Installation}{\pageref{group__install}}{}
@@ -11,4 +11,4 @@
 \item \contentsline{section}{Writing by force feeding Oggz}{\pageref{group__force__feed}}{}
 \item \contentsline{section}{Writing with OggzHungry callbacks}{\pageref{group__hungry}}{}
 \item \contentsline{section}{Oggz Write API}{\pageref{group__write__api}}{}
-\end{CompactList}
+\end{DoxyCompactList}
diff -Nru liboggz-1.1.0/doc/liboggz/latex/oggz_8h.tex liboggz-1.1.1/doc/liboggz/latex/oggz_8h.tex
--- liboggz-1.1.0/doc/liboggz/latex/oggz_8h.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/oggz_8h.tex	2010-04-24 00:13:55.000000000 +0000
@@ -2,284 +2,249 @@
 \label{oggz_8h}\index{oggz.h@{oggz.h}}
 
 
-\subsection{Detailed Description}
-The liboggz C API. 
-
-\subsection{Generic semantics}\label{oggz_8h_general}
-All access is managed via an OGGZ handle. This can be instantiated in one of three ways:
+The liboggz C API.  
 
-\begin{itemize}
-\item \doxyref{oggz\_\-open()}{p.}{oggz_8h_65197cdd03f755f7ebfabf2fdff4c7db} - Open a full pathname\item \doxyref{oggz\_\-open\_\-stdio()}{p.}{oggz_8h_c49e9de0bc4ef1d91b43b13605f98b19} - Use an already opened FILE $\ast$\item \doxyref{oggz\_\-new()}{p.}{oggz_8h_6eb34d123389ae38d993601f9e7bb9d6} - Create an anonymous OGGZ object, which you can later handle via memory buffers\end{itemize}
 
-
-To finish using an OGGZ handle, it should be closed with \doxyref{oggz\_\-close()}{p.}{oggz_8h_adcfc04b2930660710bbcbc93140b783}.\subsection{Reading Ogg data}\label{oggz_8h_reading}
-To read from Ogg files or streams you must instantiate an OGGZ handle with flags set to OGGZ\_\-READ, and provide an OggzReadPacket callback with \doxyref{oggz\_\-set\_\-read\_\-callback()}{p.}{group__read__api_g6d5aae4f7f186fffe19d4fd3cd63148d}. See the \doxyref{Oggz Read API}{p.}{group__read__api} section for details.\subsection{Writing Ogg data}\label{oggz_8h_writing}
-To write to Ogg files or streams you must instantiate an OGGZ handle with flags set to OGGZ\_\-WRITE, and provide an OggzWritePacket callback with oggz\_\-set\_\-write\_\-callback(). See the \doxyref{Oggz Write API}{p.}{group__write__api} section for details.\subsection{Seeking on Ogg data}\label{oggz_8h_seeking}
-To seek while reading Ogg files or streams you must instantiate an OGGZ handle for reading, and ensure that an \doxyref{OggzMetric }{p.}{group__metric} function is defined to translate packet positions into units such as time. See the \doxyref{Oggz Seek API}{p.}{group__seek__api} section for details.\subsection{Overriding the IO methods}\label{oggz_8h_io}
-When an OGGZ handle is instantiated by \doxyref{oggz\_\-open()}{p.}{oggz_8h_65197cdd03f755f7ebfabf2fdff4c7db} or \doxyref{oggz\_\-open\_\-stdio()}{p.}{oggz_8h_c49e9de0bc4ef1d91b43b13605f98b19}, Oggz uses stdio functions internally to access the raw data. However for some applications, the raw data cannot be accessed via stdio -- this commonly occurs when integrating with media frameworks. For such applications, you can provide Oggz with custom IO methods that it should use to access the raw data. Oggz will then use these custom methods, rather than using stdio methods, to access the raw data internally.
-
-For details, see \doxyref{$<$oggz/oggz\_\-io.h$>$ }{p.}{oggz__io_8h}.\subsection{Headers}\label{oggz_8h_headers}
-\doxyref{oggz.h}{p.}{oggz_8h} provides direct access to libogg types such as ogg\_\-packet, defined in $<$ogg/ogg.h$>$. 
-
-{\tt \#include $<$stdio.h$>$}\par
-{\tt \#include $<$sys/types.h$>$}\par
-{\tt \#include $<$ogg/ogg.h$>$}\par
-{\tt \#include $<$oggz/oggz\_\-constants.h$>$}\par
-{\tt \#include $<$oggz/oggz\_\-table.h$>$}\par
-{\tt \#include $<$oggz/oggz\_\-off\_\-t.h$>$}\par
-{\tt \#include $<$oggz/oggz\_\-read.h$>$}\par
-{\tt \#include $<$oggz/oggz\_\-stream.h$>$}\par
-{\tt \#include $<$oggz/oggz\_\-seek.h$>$}\par
-{\tt \#include $<$oggz/oggz\_\-write.h$>$}\par
-{\tt \#include $<$oggz/oggz\_\-io.h$>$}\par
-{\tt \#include $<$oggz/oggz\_\-comments.h$>$}\par
-{\tt \#include $<$oggz/oggz\_\-deprecated.h$>$}\par
+{\ttfamily \#include $<$stdio.h$>$}\par
+{\ttfamily \#include $<$sys/types.h$>$}\par
+{\ttfamily \#include $<$ogg/ogg.h$>$}\par
+{\ttfamily \#include $<$oggz/oggz\_\-constants.h$>$}\par
+{\ttfamily \#include $<$oggz/oggz\_\-table.h$>$}\par
+{\ttfamily \#include $<$oggz/oggz\_\-off\_\-t.h$>$}\par
+{\ttfamily \#include $<$oggz/oggz\_\-read.h$>$}\par
+{\ttfamily \#include $<$oggz/oggz\_\-stream.h$>$}\par
+{\ttfamily \#include $<$oggz/oggz\_\-seek.h$>$}\par
+{\ttfamily \#include $<$oggz/oggz\_\-write.h$>$}\par
+{\ttfamily \#include $<$oggz/oggz\_\-io.h$>$}\par
+{\ttfamily \#include $<$oggz/oggz\_\-comments.h$>$}\par
+{\ttfamily \#include $<$oggz/oggz\_\-deprecated.h$>$}\par
 \subsection*{Typedefs}
-\begin{CompactItemize}
+\begin{DoxyCompactItemize}
 \item 
 typedef void {\bf OGGZ}
-\begin{CompactList}\small\item\em An opaque handle to an Ogg file. \item\end{CompactList}\end{CompactItemize}
+\begin{DoxyCompactList}\small\item\em An opaque handle to an Ogg file. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
 \subsection*{Functions}
-\begin{CompactItemize}
+\begin{DoxyCompactItemize}
 \item 
 {\bf OGGZ} $\ast$ {\bf oggz\_\-new} (int flags)
-\begin{CompactList}\small\item\em Create a new OGGZ object. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Create a new OGGZ object. \item\end{DoxyCompactList}\item 
 {\bf OGGZ} $\ast$ {\bf oggz\_\-open} (const char $\ast$filename, int flags)
-\begin{CompactList}\small\item\em Open an Ogg file, creating an OGGZ handle for it. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Open an Ogg file, creating an OGGZ handle for it. \item\end{DoxyCompactList}\item 
 {\bf OGGZ} $\ast$ {\bf oggz\_\-open\_\-stdio} (FILE $\ast$file, int flags)
-\begin{CompactList}\small\item\em Create an OGGZ handle associated with a stdio stream. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Create an OGGZ handle associated with a stdio stream. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-flush} ({\bf OGGZ} $\ast$oggz)
-\begin{CompactList}\small\item\em Ensure any associated io streams are flushed. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Ensure any associated io streams are flushed. \item\end{DoxyCompactList}\item 
 long {\bf oggz\_\-run} ({\bf OGGZ} $\ast$oggz)
-\begin{CompactList}\small\item\em Run an OGGZ until completion, or error. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Run an OGGZ until completion, or error. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-run\_\-set\_\-blocksize} ({\bf OGGZ} $\ast$oggz, long blocksize)
-\begin{CompactList}\small\item\em Set the blocksize to use internally for \doxyref{oggz\_\-run()}{p.}{oggz_8h_0561df532fc37f98725007a79f898356}. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Set the blocksize to use internally for \doxyref{oggz\_\-run()}{p.}{oggz_8h_a0561df532fc37f98725007a79f898356}. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-close} ({\bf OGGZ} $\ast$oggz)
-\begin{CompactList}\small\item\em Close an OGGZ handle. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Close an OGGZ handle. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-get\_\-bos} ({\bf OGGZ} $\ast$oggz, long serialno)
-\begin{CompactList}\small\item\em Determine if a given logical bitstream is at bos (beginning of stream). \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Determine if a given logical bitstream is at bos (beginning of stream). \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-get\_\-eos} ({\bf OGGZ} $\ast$oggz, long serialno)
-\begin{CompactList}\small\item\em Determine if a given logical bitstream is at eos (end of stream). \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Determine if a given logical bitstream is at eos (end of stream). \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-get\_\-numtracks} ({\bf OGGZ} $\ast$oggz)
-\begin{CompactList}\small\item\em Query the number of tracks (logical bitstreams). \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Query the number of tracks (logical bitstreams). \item\end{DoxyCompactList}\item 
 long {\bf oggz\_\-serialno\_\-new} ({\bf OGGZ} $\ast$oggz)
-\begin{CompactList}\small\item\em Request a new serialno, as required for a new stream, ensuring the serialno is not yet used for any other streams managed by this OGGZ. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Request a new serialno, as required for a new stream, ensuring the serialno is not yet used for any other streams managed by this OGGZ. \item\end{DoxyCompactList}\item 
 const char $\ast$ {\bf oggz\_\-content\_\-type} ({\bf OggzStreamContent} content)
-\begin{CompactList}\small\item\em Return human-readable string representation of a content type. \item\end{CompactList}\end{CompactItemize}
+\begin{DoxyCompactList}\small\item\em Return human-\/readable string representation of a content type. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
+
 
+\subsection{Detailed Description}
+The liboggz C API. \subsection{Generic semantics}\label{oggz_8h_general}
+All access is managed via an OGGZ handle. This can be instantiated in one of three ways:
+
+
+\begin{DoxyItemize}
+\item \doxyref{oggz\_\-open()}{p.}{oggz_8h_a65197cdd03f755f7ebfabf2fdff4c7db} -\/ Open a full pathname
+\item \doxyref{oggz\_\-open\_\-stdio()}{p.}{oggz_8h_ac49e9de0bc4ef1d91b43b13605f98b19} -\/ Use an already opened FILE $\ast$
+\item \doxyref{oggz\_\-new()}{p.}{oggz_8h_a6eb34d123389ae38d993601f9e7bb9d6} -\/ Create an anonymous OGGZ object, which you can later handle via memory buffers
+\end{DoxyItemize}
+
+To finish using an OGGZ handle, it should be closed with \doxyref{oggz\_\-close()}{p.}{oggz_8h_aadcfc04b2930660710bbcbc93140b783}.\subsection{Reading Ogg data}\label{oggz_8h_reading}
+To read from Ogg files or streams you must instantiate an OGGZ handle with flags set to OGGZ\_\-READ, and provide an OggzReadPacket callback with \doxyref{oggz\_\-set\_\-read\_\-callback()}{p.}{group__read__api_ga6d5aae4f7f186fffe19d4fd3cd63148d}. See the \doxyref{Oggz Read API}{p.}{group__read__api} section for details.\subsection{Writing Ogg data}\label{oggz_8h_writing}
+To write to Ogg files or streams you must instantiate an OGGZ handle with flags set to OGGZ\_\-WRITE, and provide an OggzWritePacket callback with oggz\_\-set\_\-write\_\-callback(). See the \doxyref{Oggz Write API}{p.}{group__write__api} section for details.\subsection{Seeking on Ogg data}\label{oggz_8h_seeking}
+To seek while reading Ogg files or streams you must instantiate an OGGZ handle for reading, and ensure that an \doxyref{OggzMetric }{p.}{group__metric} function is defined to translate packet positions into units such as time. See the \doxyref{Oggz Seek API}{p.}{group__seek__api} section for details.\subsection{Overriding the IO methods}\label{oggz_8h_io}
+When an OGGZ handle is instantiated by \doxyref{oggz\_\-open()}{p.}{oggz_8h_a65197cdd03f755f7ebfabf2fdff4c7db} or \doxyref{oggz\_\-open\_\-stdio()}{p.}{oggz_8h_ac49e9de0bc4ef1d91b43b13605f98b19}, Oggz uses stdio functions internally to access the raw data. However for some applications, the raw data cannot be accessed via stdio -\/-\/ this commonly occurs when integrating with media frameworks. For such applications, you can provide Oggz with custom IO methods that it should use to access the raw data. Oggz will then use these custom methods, rather than using stdio methods, to access the raw data internally.
+
+For details, see \doxyref{$<$oggz/oggz\_\-io.h$>$ }{p.}{oggz__io_8h}.\subsection{Headers}\label{oggz_8h_headers}
+\doxyref{oggz.h}{p.}{oggz_8h} provides direct access to libogg types such as ogg\_\-packet, defined in $<$ogg/ogg.h$>$. 
 
 \subsection{Typedef Documentation}
 \index{oggz.h@{oggz.h}!OGGZ@{OGGZ}}
 \index{OGGZ@{OGGZ}!oggz.h@{oggz.h}}
-\subsubsection[OGGZ]{\setlength{\rightskip}{0pt plus 5cm}typedef void {\bf OGGZ}}\label{oggz_8h_672d218df13da45a4b41d5366211bfee}
+\subsubsection[{OGGZ}]{\setlength{\rightskip}{0pt plus 5cm}typedef void {\bf OGGZ}}\label{oggz_8h_a672d218df13da45a4b41d5366211bfee}
 
 
 An opaque handle to an Ogg file. 
 
-This is returned by \doxyref{oggz\_\-open()}{p.}{oggz_8h_65197cdd03f755f7ebfabf2fdff4c7db} or \doxyref{oggz\_\-new()}{p.}{oggz_8h_6eb34d123389ae38d993601f9e7bb9d6}, and is passed to all other oggz\_\-$\ast$ functions. 
+This is returned by \doxyref{oggz\_\-open()}{p.}{oggz_8h_a65197cdd03f755f7ebfabf2fdff4c7db} or \doxyref{oggz\_\-new()}{p.}{oggz_8h_a6eb34d123389ae38d993601f9e7bb9d6}, and is passed to all other oggz\_\-$\ast$ functions. 
 
 \subsection{Function Documentation}
 \index{oggz.h@{oggz.h}!oggz\_\-close@{oggz\_\-close}}
 \index{oggz\_\-close@{oggz\_\-close}!oggz.h@{oggz.h}}
-\subsubsection[oggz\_\-close]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-close ({\bf OGGZ} $\ast$ {\em oggz})}\label{oggz_8h_adcfc04b2930660710bbcbc93140b783}
+\subsubsection[{oggz\_\-close}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-close ({\bf OGGZ} $\ast$ {\em oggz})}\label{oggz_8h_aadcfc04b2930660710bbcbc93140b783}
 
 
 Close an OGGZ handle. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-SYSTEM}]System error; check errno for details \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-SYSTEM}]System error; check errno for details \end{DoxyRetVals}
 \index{oggz.h@{oggz.h}!oggz\_\-content\_\-type@{oggz\_\-content\_\-type}}
 \index{oggz\_\-content\_\-type@{oggz\_\-content\_\-type}!oggz.h@{oggz.h}}
-\subsubsection[oggz\_\-content\_\-type]{\setlength{\rightskip}{0pt plus 5cm}const char$\ast$ oggz\_\-content\_\-type ({\bf OggzStreamContent} {\em content})}\label{oggz_8h_b1b16dec307b6544b5f82a60a14c8518}
+\subsubsection[{oggz\_\-content\_\-type}]{\setlength{\rightskip}{0pt plus 5cm}const char$\ast$ oggz\_\-content\_\-type ({\bf OggzStreamContent} {\em content})}\label{oggz_8h_ab1b16dec307b6544b5f82a60a14c8518}
+
 
+Return human-\/readable string representation of a content type. 
 
-Return human-readable string representation of a content type. 
 
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em string}]the name of the content type \item[{\em NULL}]{\em content\/} invalid \end{description}
-\end{Desc}
+\begin{DoxyRetVals}{Return values}
+\item[{\em string}]the name of the content type \item[{\em NULL}]{\itshape content\/} invalid \end{DoxyRetVals}
 \index{oggz.h@{oggz.h}!oggz\_\-flush@{oggz\_\-flush}}
 \index{oggz\_\-flush@{oggz\_\-flush}!oggz.h@{oggz.h}}
-\subsubsection[oggz\_\-flush]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-flush ({\bf OGGZ} $\ast$ {\em oggz})}\label{oggz_8h_8090c7e886af90dbea4dd5df8035dbf3}
+\subsubsection[{oggz\_\-flush}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-flush ({\bf OGGZ} $\ast$ {\em oggz})}\label{oggz_8h_a8090c7e886af90dbea4dd5df8035dbf3}
 
 
 Ensure any associated io streams are flushed. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-SYSTEM}]System error; check errno for details \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-SYSTEM}]System error; check errno for details \end{DoxyRetVals}
 \index{oggz.h@{oggz.h}!oggz\_\-get\_\-bos@{oggz\_\-get\_\-bos}}
 \index{oggz\_\-get\_\-bos@{oggz\_\-get\_\-bos}!oggz.h@{oggz.h}}
-\subsubsection[oggz\_\-get\_\-bos]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-get\_\-bos ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno})}\label{oggz_8h_357244f9e73d219015d9ce8260ee08d3}
+\subsubsection[{oggz\_\-get\_\-bos}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-get\_\-bos ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno})}\label{oggz_8h_a357244f9e73d219015d9ce8260ee08d3}
 
 
 Determine if a given logical bitstream is at bos (beginning of stream). 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]Identify a logical bitstream within {\em oggz\/}, or -1 to query if all logical bitstreams in {\em oggz\/} are at bos \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em 1}]The given stream is at bos \item[{\em 0}]The given stream is not at bos \item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\em serialno\/} does not identify an existing logical bitstream in {\em oggz\/}. \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]Identify a logical bitstream within {\itshape oggz\/}, or -\/1 to query if all logical bitstreams in {\itshape oggz\/} are at bos \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em 1}]The given stream is at bos \item[{\em 0}]The given stream is not at bos \item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\itshape serialno\/} does not identify an existing logical bitstream in {\itshape oggz\/}. \end{DoxyRetVals}
 \index{oggz.h@{oggz.h}!oggz\_\-get\_\-eos@{oggz\_\-get\_\-eos}}
 \index{oggz\_\-get\_\-eos@{oggz\_\-get\_\-eos}!oggz.h@{oggz.h}}
-\subsubsection[oggz\_\-get\_\-eos]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-get\_\-eos ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno})}\label{oggz_8h_ee6a754e123ec0fd347d1ed0d4d4b3b7}
+\subsubsection[{oggz\_\-get\_\-eos}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-get\_\-eos ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno})}\label{oggz_8h_aee6a754e123ec0fd347d1ed0d4d4b3b7}
 
 
 Determine if a given logical bitstream is at eos (end of stream). 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]Identify a logical bitstream within {\em oggz\/}, or -1 to query if all logical bitstreams in {\em oggz\/} are at eos \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em 1}]The given stream is at eos \item[{\em 0}]The given stream is not at eos \item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\em serialno\/} does not identify an existing logical bitstream in {\em oggz\/}. \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]Identify a logical bitstream within {\itshape oggz\/}, or -\/1 to query if all logical bitstreams in {\itshape oggz\/} are at eos \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em 1}]The given stream is at eos \item[{\em 0}]The given stream is not at eos \item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\itshape serialno\/} does not identify an existing logical bitstream in {\itshape oggz\/}. \end{DoxyRetVals}
 \index{oggz.h@{oggz.h}!oggz\_\-get\_\-numtracks@{oggz\_\-get\_\-numtracks}}
 \index{oggz\_\-get\_\-numtracks@{oggz\_\-get\_\-numtracks}!oggz.h@{oggz.h}}
-\subsubsection[oggz\_\-get\_\-numtracks]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-get\_\-numtracks ({\bf OGGZ} $\ast$ {\em oggz})}\label{oggz_8h_0dd3be49fc94531e35546318c14b64e7}
+\subsubsection[{oggz\_\-get\_\-numtracks}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-get\_\-numtracks ({\bf OGGZ} $\ast$ {\em oggz})}\label{oggz_8h_a0dd3be49fc94531e35546318c14b64e7}
 
 
 Query the number of tracks (logical bitstreams). 
 
-When reading, this number is incremented every time a new track is found, so the returned value is only correct once the OGGZ is no longer at bos (beginning of stream): see \doxyref{oggz\_\-get\_\-bos()}{p.}{oggz_8h_357244f9e73d219015d9ce8260ee08d3} for determining this. \begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]The number of tracks in OGGZ \end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\em serialno\/} does not identify an existing logical bitstream in {\em oggz\/}. \end{description}
-\end{Desc}
+When reading, this number is incremented every time a new track is found, so the returned value is only correct once the OGGZ is no longer at bos (beginning of stream): see \doxyref{oggz\_\-get\_\-bos()}{p.}{oggz_8h_a357244f9e73d219015d9ce8260ee08d3} for determining this. 
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+The number of tracks in OGGZ 
+\end{DoxyReturn}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\itshape serialno\/} does not identify an existing logical bitstream in {\itshape oggz\/}. \end{DoxyRetVals}
 \index{oggz.h@{oggz.h}!oggz\_\-new@{oggz\_\-new}}
 \index{oggz\_\-new@{oggz\_\-new}!oggz.h@{oggz.h}}
-\subsubsection[oggz\_\-new]{\setlength{\rightskip}{0pt plus 5cm}{\bf OGGZ}$\ast$ oggz\_\-new (int {\em flags})}\label{oggz_8h_6eb34d123389ae38d993601f9e7bb9d6}
+\subsubsection[{oggz\_\-new}]{\setlength{\rightskip}{0pt plus 5cm}{\bf OGGZ}$\ast$ oggz\_\-new (int {\em flags})}\label{oggz_8h_a6eb34d123389ae38d993601f9e7bb9d6}
 
 
 Create a new OGGZ object. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em flags}]OGGZ\_\-READ or OGGZ\_\-WRITE \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]A new OGGZ object \end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em NULL}]on system error; check errno for details \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em flags}]OGGZ\_\-READ or OGGZ\_\-WRITE \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+A new OGGZ object 
+\end{DoxyReturn}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em NULL}]on system error; check errno for details \end{DoxyRetVals}
 \index{oggz.h@{oggz.h}!oggz\_\-open@{oggz\_\-open}}
 \index{oggz\_\-open@{oggz\_\-open}!oggz.h@{oggz.h}}
-\subsubsection[oggz\_\-open]{\setlength{\rightskip}{0pt plus 5cm}{\bf OGGZ}$\ast$ oggz\_\-open (const char $\ast$ {\em filename}, \/  int {\em flags})}\label{oggz_8h_65197cdd03f755f7ebfabf2fdff4c7db}
+\subsubsection[{oggz\_\-open}]{\setlength{\rightskip}{0pt plus 5cm}{\bf OGGZ}$\ast$ oggz\_\-open (const char $\ast$ {\em filename}, \/  int {\em flags})}\label{oggz_8h_a65197cdd03f755f7ebfabf2fdff4c7db}
 
 
 Open an Ogg file, creating an OGGZ handle for it. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em filename}]The file to open \item[{\em flags}]OGGZ\_\-READ or OGGZ\_\-WRITE \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]A new OGGZ handle \end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em NULL}]System error; check errno for details \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em filename}]The file to open \item[{\em flags}]OGGZ\_\-READ or OGGZ\_\-WRITE \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+A new OGGZ handle 
+\end{DoxyReturn}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em NULL}]System error; check errno for details \end{DoxyRetVals}
 \index{oggz.h@{oggz.h}!oggz\_\-open\_\-stdio@{oggz\_\-open\_\-stdio}}
 \index{oggz\_\-open\_\-stdio@{oggz\_\-open\_\-stdio}!oggz.h@{oggz.h}}
-\subsubsection[oggz\_\-open\_\-stdio]{\setlength{\rightskip}{0pt plus 5cm}{\bf OGGZ}$\ast$ oggz\_\-open\_\-stdio (FILE $\ast$ {\em file}, \/  int {\em flags})}\label{oggz_8h_c49e9de0bc4ef1d91b43b13605f98b19}
+\subsubsection[{oggz\_\-open\_\-stdio}]{\setlength{\rightskip}{0pt plus 5cm}{\bf OGGZ}$\ast$ oggz\_\-open\_\-stdio (FILE $\ast$ {\em file}, \/  int {\em flags})}\label{oggz_8h_ac49e9de0bc4ef1d91b43b13605f98b19}
 
 
 Create an OGGZ handle associated with a stdio stream. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em file}]An open FILE handle \item[{\em flags}]OGGZ\_\-READ or OGGZ\_\-WRITE \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]A new OGGZ handle \end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em NULL}]System error; check errno for details \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em file}]An open FILE handle \item[{\em flags}]OGGZ\_\-READ or OGGZ\_\-WRITE \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+A new OGGZ handle 
+\end{DoxyReturn}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em NULL}]System error; check errno for details \end{DoxyRetVals}
 \index{oggz.h@{oggz.h}!oggz\_\-run@{oggz\_\-run}}
 \index{oggz\_\-run@{oggz\_\-run}!oggz.h@{oggz.h}}
-\subsubsection[oggz\_\-run]{\setlength{\rightskip}{0pt plus 5cm}long oggz\_\-run ({\bf OGGZ} $\ast$ {\em oggz})}\label{oggz_8h_0561df532fc37f98725007a79f898356}
+\subsubsection[{oggz\_\-run}]{\setlength{\rightskip}{0pt plus 5cm}long oggz\_\-run ({\bf OGGZ} $\ast$ {\em oggz})}\label{oggz_8h_a0561df532fc37f98725007a79f898356}
 
 
 Run an OGGZ until completion, or error. 
 
-This is a convenience function which repeatedly calls \doxyref{oggz\_\-read()}{p.}{group__read__api_g3ce7a31de5da56375057436c6b5108f2} or \doxyref{oggz\_\-write()}{p.}{group__write__api_g3c97d94ea425d64546adf9c368b71904} as appropriate. For an OGGZ opened for reading, an OggzReadPacket or OggzReadPage callback should have been set before calling this function. For an OGGZ opened for writing, either an OggzHungry callback should have been set before calling this function, or you can use this function to write out all unwritten Ogg pages which are pending. \begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle previously opened for either reading or writing \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-SYSTEM}]System error; check errno for details \item[{\em OGGZ\_\-ERR\_\-STOP\_\-OK}]Operation was stopped by a user callback returning OGGZ\_\-STOP\_\-OK \item[{\em OGGZ\_\-ERR\_\-STOP\_\-ERR}]Operation was stopped by a user callback returning OGGZ\_\-STOP\_\-ERR \item[{\em OGGZ\_\-ERR\_\-RECURSIVE\_\-WRITE}]Attempt to initiate writing from within an OggzHungry callback \end{description}
-\end{Desc}
+This is a convenience function which repeatedly calls \doxyref{oggz\_\-read()}{p.}{group__read__api_ga3ce7a31de5da56375057436c6b5108f2} or \doxyref{oggz\_\-write()}{p.}{group__write__api_ga3c97d94ea425d64546adf9c368b71904} as appropriate. For an OGGZ opened for reading, an OggzReadPacket or OggzReadPage callback should have been set before calling this function. For an OGGZ opened for writing, either an OggzHungry callback should have been set before calling this function, or you can use this function to write out all unwritten Ogg pages which are pending. 
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle previously opened for either reading or writing \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-SYSTEM}]System error; check errno for details \item[{\em OGGZ\_\-ERR\_\-STOP\_\-OK}]Operation was stopped by a user callback returning OGGZ\_\-STOP\_\-OK \item[{\em OGGZ\_\-ERR\_\-STOP\_\-ERR}]Operation was stopped by a user callback returning OGGZ\_\-STOP\_\-ERR \item[{\em OGGZ\_\-ERR\_\-RECURSIVE\_\-WRITE}]Attempt to initiate writing from within an OggzHungry callback \end{DoxyRetVals}
 \index{oggz.h@{oggz.h}!oggz\_\-run\_\-set\_\-blocksize@{oggz\_\-run\_\-set\_\-blocksize}}
 \index{oggz\_\-run\_\-set\_\-blocksize@{oggz\_\-run\_\-set\_\-blocksize}!oggz.h@{oggz.h}}
-\subsubsection[oggz\_\-run\_\-set\_\-blocksize]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-run\_\-set\_\-blocksize ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em blocksize})}\label{oggz_8h_d500c8ed7147f7fb1ddc6c915a6c10d7}
+\subsubsection[{oggz\_\-run\_\-set\_\-blocksize}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-run\_\-set\_\-blocksize ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em blocksize})}\label{oggz_8h_ad500c8ed7147f7fb1ddc6c915a6c10d7}
+
 
+Set the blocksize to use internally for \doxyref{oggz\_\-run()}{p.}{oggz_8h_a0561df532fc37f98725007a79f898356}. 
 
-Set the blocksize to use internally for \doxyref{oggz\_\-run()}{p.}{oggz_8h_0561df532fc37f98725007a79f898356}. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle previously opened for either reading or writing \item[{\em blocksize}]The blocksize to use within \doxyref{oggz\_\-run()}{p.}{oggz_8h_0561df532fc37f98725007a79f898356} \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Invalid blocksize ({\em run\_\-blocksize\/} $<$= 0) \end{description}
-\end{Desc}
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle previously opened for either reading or writing \item[{\em blocksize}]The blocksize to use within \doxyref{oggz\_\-run()}{p.}{oggz_8h_a0561df532fc37f98725007a79f898356} \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Invalid blocksize ({\itshape run\_\-blocksize\/} $<$= 0) \end{DoxyRetVals}
 \index{oggz.h@{oggz.h}!oggz\_\-serialno\_\-new@{oggz\_\-serialno\_\-new}}
 \index{oggz\_\-serialno\_\-new@{oggz\_\-serialno\_\-new}!oggz.h@{oggz.h}}
-\subsubsection[oggz\_\-serialno\_\-new]{\setlength{\rightskip}{0pt plus 5cm}long oggz\_\-serialno\_\-new ({\bf OGGZ} $\ast$ {\em oggz})}\label{oggz_8h_af89877e3e89408387d422f487bcf094}
+\subsubsection[{oggz\_\-serialno\_\-new}]{\setlength{\rightskip}{0pt plus 5cm}long oggz\_\-serialno\_\-new ({\bf OGGZ} $\ast$ {\em oggz})}\label{oggz_8h_aaf89877e3e89408387d422f487bcf094}
 
 
 Request a new serialno, as required for a new stream, ensuring the serialno is not yet used for any other streams managed by this OGGZ. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]A new serialno, not already occuring in any logical bitstreams in {\em oggz\/}. \end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+A new serialno, not already occuring in any logical bitstreams in {\itshape oggz\/}. 
+\end{DoxyReturn}
diff -Nru liboggz-1.1.0/doc/liboggz/latex/oggz__comments_8h.tex liboggz-1.1.1/doc/liboggz/latex/oggz__comments_8h.tex
--- liboggz-1.1.0/doc/liboggz/latex/oggz__comments_8h.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/oggz__comments_8h.tex	2010-04-24 00:13:55.000000000 +0000
@@ -2,278 +2,249 @@
 \label{oggz__comments_8h}\index{oggz\_\-comments.h@{oggz\_\-comments.h}}
 
 
-\subsection{Detailed Description}
-Reading of comments. 
-
-Vorbis, Speex and Theora bitstreams use a comment format called \char`\"{}Vorbiscomment\char`\"{}, defined {\tt here}. Many standard comment names (such as TITLE, COPYRIGHT and GENRE) are defined in that document.
-
-The following general features of Vorbiscomment are relevant to this API:\begin{itemize}
-\item Each stream has one comment packet, which occurs before any encoded audio data in the stream.\item When reading, Oggz will decode the comment block before calling the second read() callback for each stream. Hence, retrieving comment data is possible once the read() callback has been called a second time.\item When writing, Oggz allows you to set up the comments in memory, and provides a single function to generate a corresponding ogg\_\-packet. It is your responsibility to then actually write that packet in sequence.\end{itemize}
-
+Reading of comments.  
 
-Each comment block contains one Vendor string, which can be retrieved with \doxyref{oggz\_\-comment\_\-get\_\-vendor()}{p.}{oggz__comments_8h_e5d522df5fce262953d8bb5cb8c00b00}.
 
-The rest of a comment block consists of {\em name\/} = {\em value\/} pairs, with the following restrictions:\begin{itemize}
-\item Both the {\em name\/} and {\em value\/} must be non-empty\item The {\em name\/} is case-insensitive and must consist of ASCII within the range 0x20 to 0x7D inclusive, 0x3D ('=') excluded.\item The {\em name\/} is not unique; multiple entries may exist with equivalent {\em name\/} within a Vorbiscomment block.\item The {\em value\/} may be any UTF-8 string.\end{itemize}
-\subsection{Reading comments}\label{oggz__comments_8h_comments_get}
-Oggz contains API methods to iterate through all comments associated with the logical bitstreams of an OGGZ$\ast$ handle (\doxyref{oggz\_\-comment\_\-first()}{p.}{oggz__comments_8h_306a979d84b61932930d44ea5d4f95d9} and \doxyref{oggz\_\-comment\_\-next()}{p.}{oggz__comments_8h_9501d8c166187c8d503e1335827b2d5e}, and to iterate through comments matching a particular name (\doxyref{oggz\_\-comment\_\-first\_\-byname()}{p.}{oggz__comments_8h_9a3a72be012b6474a1e1d95f7ce7afe8} and \doxyref{oggz\_\-comment\_\-next\_\-byname()}{p.}{oggz__comments_8h_1dd05e02a121ba639b8012acaa21a37c}). Given that multiple comments may exist with the same {\em name\/}, you should not use \doxyref{oggz\_\-comment\_\-first\_\-byname()}{p.}{oggz__comments_8h_9a3a72be012b6474a1e1d95f7ce7afe8} as a simple \char`\"{}get\char`\"{} function.\subsection{Writing comments}\label{oggz__comments_8h_comments_set}
-For writing, Oggz contains API methods for adding comments (\doxyref{oggz\_\-comment\_\-add()}{p.}{oggz__comments_8h_de23081a738d67bec473bdaf317a68d8} and \doxyref{oggz\_\-comment\_\-add\_\-byname()}{p.}{oggz__comments_8h_d869a8a7246567ba4162183436127a6f}), for removing comments (\doxyref{oggz\_\-comment\_\-remove()}{p.}{oggz__comments_8h_75ca47a020dcddce846a320481120a8e} and \doxyref{oggz\_\-comment\_\-remove\_\-byname()}{p.}{oggz__comments_8h_a0f3f3a3ea3ca28d8678b94495634876}) and for setting the vendor string (\doxyref{oggz\_\-comment\_\-set\_\-vendor()}{p.}{oggz__comments_8h_281a0956a9a160337f7d00f102d18131}). 
-
-{\tt \#include $<$oggz/oggz.h$>$}\par
+{\ttfamily \#include $<$oggz/oggz.h$>$}\par
 \subsection*{Data Structures}
-\begin{CompactItemize}
+\begin{DoxyCompactItemize}
 \item 
 struct {\bf OggzComment}
-\begin{CompactList}\small\item\em A comment. \item\end{CompactList}\end{CompactItemize}
+\begin{DoxyCompactList}\small\item\em A comment. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
 \subsection*{Functions}
-\begin{CompactItemize}
+\begin{DoxyCompactItemize}
 \item 
 const char $\ast$ {\bf oggz\_\-comment\_\-get\_\-vendor} ({\bf OGGZ} $\ast$oggz, long serialno)
-\begin{CompactList}\small\item\em Retrieve the vendor string. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Retrieve the vendor string. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-comment\_\-set\_\-vendor} ({\bf OGGZ} $\ast$oggz, long serialno, const char $\ast$vendor\_\-string)
-\begin{CompactList}\small\item\em Set the vendor string. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Set the vendor string. \item\end{DoxyCompactList}\item 
 const {\bf OggzComment} $\ast$ {\bf oggz\_\-comment\_\-first} ({\bf OGGZ} $\ast$oggz, long serialno)
-\begin{CompactList}\small\item\em Retrieve the first comment. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Retrieve the first comment. \item\end{DoxyCompactList}\item 
 const {\bf OggzComment} $\ast$ {\bf oggz\_\-comment\_\-next} ({\bf OGGZ} $\ast$oggz, long serialno, const {\bf OggzComment} $\ast$comment)
-\begin{CompactList}\small\item\em Retrieve the next comment. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Retrieve the next comment. \item\end{DoxyCompactList}\item 
 const {\bf OggzComment} $\ast$ {\bf oggz\_\-comment\_\-first\_\-byname} ({\bf OGGZ} $\ast$oggz, long serialno, char $\ast$name)
-\begin{CompactList}\small\item\em Retrieve the first comment with a given name. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Retrieve the first comment with a given name. \item\end{DoxyCompactList}\item 
 const {\bf OggzComment} $\ast$ {\bf oggz\_\-comment\_\-next\_\-byname} ({\bf OGGZ} $\ast$oggz, long serialno, const {\bf OggzComment} $\ast$comment)
-\begin{CompactList}\small\item\em Retrieve the next comment following and with the same name as a given comment. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Retrieve the next comment following and with the same name as a given comment. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-comment\_\-add} ({\bf OGGZ} $\ast$oggz, long serialno, {\bf OggzComment} $\ast$comment)
-\begin{CompactList}\small\item\em Add a comment. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Add a comment. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-comment\_\-add\_\-byname} ({\bf OGGZ} $\ast$oggz, long serialno, const char $\ast$name, const char $\ast$value)
-\begin{CompactList}\small\item\em Add a comment by name and value. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Add a comment by name and value. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-comment\_\-remove} ({\bf OGGZ} $\ast$oggz, long serialno, {\bf OggzComment} $\ast$comment)
-\begin{CompactList}\small\item\em Remove a comment. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Remove a comment. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-comment\_\-remove\_\-byname} ({\bf OGGZ} $\ast$oggz, long serialno, char $\ast$name)
-\begin{CompactList}\small\item\em Remove all comments with a given name. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Remove all comments with a given name. \item\end{DoxyCompactList}\item 
 ogg\_\-packet $\ast$ {\bf oggz\_\-comments\_\-generate} ({\bf OGGZ} $\ast$oggz, long serialno, int FLAC\_\-final\_\-metadata\_\-block)
-\begin{CompactList}\small\item\em Output a comment packet for the specified stream. \item\end{CompactList}\item 
-int \textbf{oggz\_\-comments\_\-copy} ({\bf OGGZ} $\ast$src, long src\_\-serialno, {\bf OGGZ} $\ast$dest, long dest\_\-serialno)\label{oggz__comments_8h_486cd52284cb03032360265d2027f8db}
+\begin{DoxyCompactList}\small\item\em Output a comment packet for the specified stream. \item\end{DoxyCompactList}\item 
+int {\bfseries oggz\_\-comments\_\-copy} ({\bf OGGZ} $\ast$src, long src\_\-serialno, {\bf OGGZ} $\ast$dest, long dest\_\-serialno)\label{oggz__comments_8h_a486cd52284cb03032360265d2027f8db}
 
 \item 
 void {\bf oggz\_\-packet\_\-destroy} (ogg\_\-packet $\ast$packet)
-\begin{CompactList}\small\item\em Free a packet and its payload. \item\end{CompactList}\end{CompactItemize}
+\begin{DoxyCompactList}\small\item\em Free a packet and its payload. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
+
+
+\subsection{Detailed Description}
+Reading of comments. Vorbis, Speex and Theora bitstreams use a comment format called \char`\"{}Vorbiscomment\char`\"{}, defined {\tt here}. Many standard comment names (such as TITLE, COPYRIGHT and GENRE) are defined in that document.
 
+The following general features of Vorbiscomment are relevant to this API:
+\begin{DoxyItemize}
+\item Each stream has one comment packet, which occurs before any encoded audio data in the stream.
+\item When reading, Oggz will decode the comment block before calling the second read() callback for each stream. Hence, retrieving comment data is possible once the read() callback has been called a second time.
+\item When writing, Oggz allows you to set up the comments in memory, and provides a single function to generate a corresponding ogg\_\-packet. It is your responsibility to then actually write that packet in sequence.
+\end{DoxyItemize}
+
+Each comment block contains one Vendor string, which can be retrieved with \doxyref{oggz\_\-comment\_\-get\_\-vendor()}{p.}{oggz__comments_8h_ae5d522df5fce262953d8bb5cb8c00b00}.
+
+The rest of a comment block consists of {\itshape name\/} = {\itshape value\/} pairs, with the following restrictions:
+\begin{DoxyItemize}
+\item Both the {\itshape name\/} and {\itshape value\/} must be non-\/empty
+\item The {\itshape name\/} is case-\/insensitive and must consist of ASCII within the range 0x20 to 0x7D inclusive, 0x3D ('=') excluded.
+\item The {\itshape name\/} is not unique; multiple entries may exist with equivalent {\itshape name\/} within a Vorbiscomment block.
+\item The {\itshape value\/} may be any UTF-\/8 string.
+\end{DoxyItemize}\subsection{Reading comments}\label{oggz__comments_8h_comments_get}
+Oggz contains API methods to iterate through all comments associated with the logical bitstreams of an OGGZ$\ast$ handle (\doxyref{oggz\_\-comment\_\-first()}{p.}{oggz__comments_8h_a306a979d84b61932930d44ea5d4f95d9} and \doxyref{oggz\_\-comment\_\-next()}{p.}{oggz__comments_8h_a9501d8c166187c8d503e1335827b2d5e}, and to iterate through comments matching a particular name (\doxyref{oggz\_\-comment\_\-first\_\-byname()}{p.}{oggz__comments_8h_a9a3a72be012b6474a1e1d95f7ce7afe8} and \doxyref{oggz\_\-comment\_\-next\_\-byname()}{p.}{oggz__comments_8h_a1dd05e02a121ba639b8012acaa21a37c}). Given that multiple comments may exist with the same {\itshape name\/}, you should not use \doxyref{oggz\_\-comment\_\-first\_\-byname()}{p.}{oggz__comments_8h_a9a3a72be012b6474a1e1d95f7ce7afe8} as a simple \char`\"{}get\char`\"{} function.\subsection{Writing comments}\label{oggz__comments_8h_comments_set}
+For writing, Oggz contains API methods for adding comments (\doxyref{oggz\_\-comment\_\-add()}{p.}{oggz__comments_8h_ade23081a738d67bec473bdaf317a68d8} and \doxyref{oggz\_\-comment\_\-add\_\-byname()}{p.}{oggz__comments_8h_ad869a8a7246567ba4162183436127a6f}), for removing comments (\doxyref{oggz\_\-comment\_\-remove()}{p.}{oggz__comments_8h_a75ca47a020dcddce846a320481120a8e} and \doxyref{oggz\_\-comment\_\-remove\_\-byname()}{p.}{oggz__comments_8h_aa0f3f3a3ea3ca28d8678b94495634876}) and for setting the vendor string (\doxyref{oggz\_\-comment\_\-set\_\-vendor()}{p.}{oggz__comments_8h_a281a0956a9a160337f7d00f102d18131}). 
 
 \subsection{Function Documentation}
 \index{oggz\_\-comments.h@{oggz\_\-comments.h}!oggz\_\-comment\_\-add@{oggz\_\-comment\_\-add}}
 \index{oggz\_\-comment\_\-add@{oggz\_\-comment\_\-add}!oggz_comments.h@{oggz\_\-comments.h}}
-\subsubsection[oggz\_\-comment\_\-add]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-comment\_\-add ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  {\bf OggzComment} $\ast$ {\em comment})}\label{oggz__comments_8h_de23081a738d67bec473bdaf317a68d8}
+\subsubsection[{oggz\_\-comment\_\-add}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-comment\_\-add ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  {\bf OggzComment} $\ast$ {\em comment})}\label{oggz__comments_8h_ade23081a738d67bec473bdaf317a68d8}
 
 
 Add a comment. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]A OGGZ$\ast$ handle (created with mode OGGZ\_\-WRITE) \item[{\em serialno}]Identify a logical bitstream within {\em oggz\/} \item[{\em comment}]The comment to add \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD}]{\em oggz\/} is not a valid OGGZ$\ast$ handle \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY}]Out of memory \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]A OGGZ$\ast$ handle (created with mode OGGZ\_\-WRITE) \item[{\em serialno}]Identify a logical bitstream within {\itshape oggz\/} \item[{\em comment}]The comment to add \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD}]{\itshape oggz\/} is not a valid OGGZ$\ast$ handle \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY}]Out of memory \end{DoxyRetVals}
 \index{oggz\_\-comments.h@{oggz\_\-comments.h}!oggz\_\-comment\_\-add\_\-byname@{oggz\_\-comment\_\-add\_\-byname}}
 \index{oggz\_\-comment\_\-add\_\-byname@{oggz\_\-comment\_\-add\_\-byname}!oggz_comments.h@{oggz\_\-comments.h}}
-\subsubsection[oggz\_\-comment\_\-add\_\-byname]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-comment\_\-add\_\-byname ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  const char $\ast$ {\em name}, \/  const char $\ast$ {\em value})}\label{oggz__comments_8h_d869a8a7246567ba4162183436127a6f}
+\subsubsection[{oggz\_\-comment\_\-add\_\-byname}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-comment\_\-add\_\-byname ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  const char $\ast$ {\em name}, \/  const char $\ast$ {\em value})}\label{oggz__comments_8h_ad869a8a7246567ba4162183436127a6f}
 
 
 Add a comment by name and value. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]A OGGZ$\ast$ handle (created with mode OGGZ\_\-WRITE) \item[{\em serialno}]Identify a logical bitstream within {\em oggz\/} \item[{\em name}]The name of the comment to add \item[{\em value}]The contents of the comment to add \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD}]{\em oggz\/} is not a valid OGGZ$\ast$ handle \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY}]Out of memory \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]A OGGZ$\ast$ handle (created with mode OGGZ\_\-WRITE) \item[{\em serialno}]Identify a logical bitstream within {\itshape oggz\/} \item[{\em name}]The name of the comment to add \item[{\em value}]The contents of the comment to add \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD}]{\itshape oggz\/} is not a valid OGGZ$\ast$ handle \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY}]Out of memory \end{DoxyRetVals}
 \index{oggz\_\-comments.h@{oggz\_\-comments.h}!oggz\_\-comment\_\-first@{oggz\_\-comment\_\-first}}
 \index{oggz\_\-comment\_\-first@{oggz\_\-comment\_\-first}!oggz_comments.h@{oggz\_\-comments.h}}
-\subsubsection[oggz\_\-comment\_\-first]{\setlength{\rightskip}{0pt plus 5cm}const {\bf OggzComment}$\ast$ oggz\_\-comment\_\-first ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno})}\label{oggz__comments_8h_306a979d84b61932930d44ea5d4f95d9}
+\subsubsection[{oggz\_\-comment\_\-first}]{\setlength{\rightskip}{0pt plus 5cm}const {\bf OggzComment}$\ast$ oggz\_\-comment\_\-first ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno})}\label{oggz__comments_8h_a306a979d84b61932930d44ea5d4f95d9}
 
 
 Retrieve the first comment. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]A OGGZ$\ast$ handle \item[{\em serialno}]Identify a logical bitstream within {\em oggz\/} \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]A read-only copy of the first comment. \end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em NULL}]No comments exist for this OGGZ$\ast$ object, or {\em serialno\/} does not identify an existing logical bitstream in {\em oggz\/}. \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]A OGGZ$\ast$ handle \item[{\em serialno}]Identify a logical bitstream within {\itshape oggz\/} \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+A read-\/only copy of the first comment. 
+\end{DoxyReturn}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em NULL}]No comments exist for this OGGZ$\ast$ object, or {\itshape serialno\/} does not identify an existing logical bitstream in {\itshape oggz\/}. \end{DoxyRetVals}
 \index{oggz\_\-comments.h@{oggz\_\-comments.h}!oggz\_\-comment\_\-first\_\-byname@{oggz\_\-comment\_\-first\_\-byname}}
 \index{oggz\_\-comment\_\-first\_\-byname@{oggz\_\-comment\_\-first\_\-byname}!oggz_comments.h@{oggz\_\-comments.h}}
-\subsubsection[oggz\_\-comment\_\-first\_\-byname]{\setlength{\rightskip}{0pt plus 5cm}const {\bf OggzComment}$\ast$ oggz\_\-comment\_\-first\_\-byname ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  char $\ast$ {\em name})}\label{oggz__comments_8h_9a3a72be012b6474a1e1d95f7ce7afe8}
+\subsubsection[{oggz\_\-comment\_\-first\_\-byname}]{\setlength{\rightskip}{0pt plus 5cm}const {\bf OggzComment}$\ast$ oggz\_\-comment\_\-first\_\-byname ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  char $\ast$ {\em name})}\label{oggz__comments_8h_a9a3a72be012b6474a1e1d95f7ce7afe8}
 
 
 Retrieve the first comment with a given name. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]A OGGZ$\ast$ handle \item[{\em serialno}]Identify a logical bitstream within {\em oggz\/} \item[{\em name}]the name of the comment to retrieve. \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]A read-only copy of the first comment matching the given {\em name\/}. \end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em NULL}]No match was found, or {\em serialno\/} does not identify an existing logical bitstream in {\em oggz\/}. \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Note:]If {\em name\/} is NULL, the behaviour is the same as for \doxyref{oggz\_\-comment\_\-first()}{p.}{oggz__comments_8h_306a979d84b61932930d44ea5d4f95d9} \end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]A OGGZ$\ast$ handle \item[{\em serialno}]Identify a logical bitstream within {\itshape oggz\/} \item[{\em name}]the name of the comment to retrieve. \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+A read-\/only copy of the first comment matching the given {\itshape name\/}. 
+\end{DoxyReturn}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em NULL}]No match was found, or {\itshape serialno\/} does not identify an existing logical bitstream in {\itshape oggz\/}. \end{DoxyRetVals}
+\begin{DoxyNote}{Note}
+If {\itshape name\/} is NULL, the behaviour is the same as for \doxyref{oggz\_\-comment\_\-first()}{p.}{oggz__comments_8h_a306a979d84b61932930d44ea5d4f95d9} 
+\end{DoxyNote}
 \index{oggz\_\-comments.h@{oggz\_\-comments.h}!oggz\_\-comment\_\-get\_\-vendor@{oggz\_\-comment\_\-get\_\-vendor}}
 \index{oggz\_\-comment\_\-get\_\-vendor@{oggz\_\-comment\_\-get\_\-vendor}!oggz_comments.h@{oggz\_\-comments.h}}
-\subsubsection[oggz\_\-comment\_\-get\_\-vendor]{\setlength{\rightskip}{0pt plus 5cm}const char$\ast$ oggz\_\-comment\_\-get\_\-vendor ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno})}\label{oggz__comments_8h_e5d522df5fce262953d8bb5cb8c00b00}
+\subsubsection[{oggz\_\-comment\_\-get\_\-vendor}]{\setlength{\rightskip}{0pt plus 5cm}const char$\ast$ oggz\_\-comment\_\-get\_\-vendor ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno})}\label{oggz__comments_8h_ae5d522df5fce262953d8bb5cb8c00b00}
 
 
 Retrieve the vendor string. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]A OGGZ$\ast$ handle \item[{\em serialno}]Identify a logical bitstream within {\em oggz\/} \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]A read-only copy of the vendor string. \end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em NULL}]No vendor string is associated with {\em oggz\/}, or {\em oggz\/} is NULL, or {\em serialno\/} does not identify an existing logical bitstream in {\em oggz\/}. \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]A OGGZ$\ast$ handle \item[{\em serialno}]Identify a logical bitstream within {\itshape oggz\/} \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+A read-\/only copy of the vendor string. 
+\end{DoxyReturn}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em NULL}]No vendor string is associated with {\itshape oggz\/}, or {\itshape oggz\/} is NULL, or {\itshape serialno\/} does not identify an existing logical bitstream in {\itshape oggz\/}. \end{DoxyRetVals}
 \index{oggz\_\-comments.h@{oggz\_\-comments.h}!oggz\_\-comment\_\-next@{oggz\_\-comment\_\-next}}
 \index{oggz\_\-comment\_\-next@{oggz\_\-comment\_\-next}!oggz_comments.h@{oggz\_\-comments.h}}
-\subsubsection[oggz\_\-comment\_\-next]{\setlength{\rightskip}{0pt plus 5cm}const {\bf OggzComment}$\ast$ oggz\_\-comment\_\-next ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  const {\bf OggzComment} $\ast$ {\em comment})}\label{oggz__comments_8h_9501d8c166187c8d503e1335827b2d5e}
+\subsubsection[{oggz\_\-comment\_\-next}]{\setlength{\rightskip}{0pt plus 5cm}const {\bf OggzComment}$\ast$ oggz\_\-comment\_\-next ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  const {\bf OggzComment} $\ast$ {\em comment})}\label{oggz__comments_8h_a9501d8c166187c8d503e1335827b2d5e}
 
 
 Retrieve the next comment. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]A OGGZ$\ast$ handle \item[{\em serialno}]Identify a logical bitstream within {\em oggz\/} \item[{\em comment}]The previous comment. \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]A read-only copy of the comment immediately following the given comment. \end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em NULL}]{\em serialno\/} does not identify an existing logical bitstream in {\em oggz\/}. \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]A OGGZ$\ast$ handle \item[{\em serialno}]Identify a logical bitstream within {\itshape oggz\/} \item[{\em comment}]The previous comment. \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+A read-\/only copy of the comment immediately following the given comment. 
+\end{DoxyReturn}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em NULL}]{\itshape serialno\/} does not identify an existing logical bitstream in {\itshape oggz\/}. \end{DoxyRetVals}
 \index{oggz\_\-comments.h@{oggz\_\-comments.h}!oggz\_\-comment\_\-next\_\-byname@{oggz\_\-comment\_\-next\_\-byname}}
 \index{oggz\_\-comment\_\-next\_\-byname@{oggz\_\-comment\_\-next\_\-byname}!oggz_comments.h@{oggz\_\-comments.h}}
-\subsubsection[oggz\_\-comment\_\-next\_\-byname]{\setlength{\rightskip}{0pt plus 5cm}const {\bf OggzComment}$\ast$ oggz\_\-comment\_\-next\_\-byname ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  const {\bf OggzComment} $\ast$ {\em comment})}\label{oggz__comments_8h_1dd05e02a121ba639b8012acaa21a37c}
+\subsubsection[{oggz\_\-comment\_\-next\_\-byname}]{\setlength{\rightskip}{0pt plus 5cm}const {\bf OggzComment}$\ast$ oggz\_\-comment\_\-next\_\-byname ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  const {\bf OggzComment} $\ast$ {\em comment})}\label{oggz__comments_8h_a1dd05e02a121ba639b8012acaa21a37c}
 
 
 Retrieve the next comment following and with the same name as a given comment. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]A OGGZ$\ast$ handle \item[{\em serialno}]Identify a logical bitstream within {\em oggz\/} \item[{\em comment}]A comment \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]A read-only copy of the next comment with the same name as {\em comment\/}. \end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em NULL}]No further comments with the same name exist for this OGGZ$\ast$ object, or {\em serialno\/} does not identify an existing logical bitstream in {\em oggz\/}. \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]A OGGZ$\ast$ handle \item[{\em serialno}]Identify a logical bitstream within {\itshape oggz\/} \item[{\em comment}]A comment \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+A read-\/only copy of the next comment with the same name as {\itshape comment\/}. 
+\end{DoxyReturn}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em NULL}]No further comments with the same name exist for this OGGZ$\ast$ object, or {\itshape serialno\/} does not identify an existing logical bitstream in {\itshape oggz\/}. \end{DoxyRetVals}
 \index{oggz\_\-comments.h@{oggz\_\-comments.h}!oggz\_\-comment\_\-remove@{oggz\_\-comment\_\-remove}}
 \index{oggz\_\-comment\_\-remove@{oggz\_\-comment\_\-remove}!oggz_comments.h@{oggz\_\-comments.h}}
-\subsubsection[oggz\_\-comment\_\-remove]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-comment\_\-remove ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  {\bf OggzComment} $\ast$ {\em comment})}\label{oggz__comments_8h_75ca47a020dcddce846a320481120a8e}
+\subsubsection[{oggz\_\-comment\_\-remove}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-comment\_\-remove ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  {\bf OggzComment} $\ast$ {\em comment})}\label{oggz__comments_8h_a75ca47a020dcddce846a320481120a8e}
 
 
 Remove a comment. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]A OGGZ$\ast$ handle (created with OGGZ\_\-WRITE) \item[{\em serialno}]Identify a logical bitstream within {\em oggz\/} \item[{\em comment}]The comment to remove. \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em 1}]Success: comment removed \item[{\em 0}]No-op: comment not found, nothing to remove \item[{\em OGGZ\_\-ERR\_\-BAD}]{\em oggz\/} is not a valid OGGZ$\ast$ handle \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\em serialno\/} does not identify an existing logical bitstream in {\em oggz\/}. \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]A OGGZ$\ast$ handle (created with OGGZ\_\-WRITE) \item[{\em serialno}]Identify a logical bitstream within {\itshape oggz\/} \item[{\em comment}]The comment to remove. \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em 1}]Success: comment removed \item[{\em 0}]No-\/op: comment not found, nothing to remove \item[{\em OGGZ\_\-ERR\_\-BAD}]{\itshape oggz\/} is not a valid OGGZ$\ast$ handle \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\itshape serialno\/} does not identify an existing logical bitstream in {\itshape oggz\/}. \end{DoxyRetVals}
 \index{oggz\_\-comments.h@{oggz\_\-comments.h}!oggz\_\-comment\_\-remove\_\-byname@{oggz\_\-comment\_\-remove\_\-byname}}
 \index{oggz\_\-comment\_\-remove\_\-byname@{oggz\_\-comment\_\-remove\_\-byname}!oggz_comments.h@{oggz\_\-comments.h}}
-\subsubsection[oggz\_\-comment\_\-remove\_\-byname]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-comment\_\-remove\_\-byname ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  char $\ast$ {\em name})}\label{oggz__comments_8h_a0f3f3a3ea3ca28d8678b94495634876}
+\subsubsection[{oggz\_\-comment\_\-remove\_\-byname}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-comment\_\-remove\_\-byname ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  char $\ast$ {\em name})}\label{oggz__comments_8h_aa0f3f3a3ea3ca28d8678b94495634876}
 
 
 Remove all comments with a given name. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]A OGGZ$\ast$ handle (created with OGGZ\_\-WRITE) \item[{\em serialno}]Identify a logical bitstream within {\em oggz\/} \item[{\em name}]The name of the comments to remove \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em $>$= 0}]The number of comments removed \item[{\em OGGZ\_\-ERR\_\-BAD}]{\em oggz\/} is not a valid OGGZ$\ast$ handle \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\em serialno\/} does not identify an existing logical bitstream in {\em oggz\/}. \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]A OGGZ$\ast$ handle (created with OGGZ\_\-WRITE) \item[{\em serialno}]Identify a logical bitstream within {\itshape oggz\/} \item[{\em name}]The name of the comments to remove \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em $>$= 0}]The number of comments removed \item[{\em OGGZ\_\-ERR\_\-BAD}]{\itshape oggz\/} is not a valid OGGZ$\ast$ handle \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\itshape serialno\/} does not identify an existing logical bitstream in {\itshape oggz\/}. \end{DoxyRetVals}
 \index{oggz\_\-comments.h@{oggz\_\-comments.h}!oggz\_\-comment\_\-set\_\-vendor@{oggz\_\-comment\_\-set\_\-vendor}}
 \index{oggz\_\-comment\_\-set\_\-vendor@{oggz\_\-comment\_\-set\_\-vendor}!oggz_comments.h@{oggz\_\-comments.h}}
-\subsubsection[oggz\_\-comment\_\-set\_\-vendor]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-comment\_\-set\_\-vendor ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  const char $\ast$ {\em vendor\_\-string})}\label{oggz__comments_8h_281a0956a9a160337f7d00f102d18131}
+\subsubsection[{oggz\_\-comment\_\-set\_\-vendor}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-comment\_\-set\_\-vendor ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  const char $\ast$ {\em vendor\_\-string})}\label{oggz__comments_8h_a281a0956a9a160337f7d00f102d18131}
 
 
 Set the vendor string. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]A OGGZ$\ast$ handle \item[{\em serialno}]Identify a logical bitstream within {\em oggz\/} \item[{\em vendor\_\-string}]The contents of the vendor string to add \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD}]{\em oggz\/} is not a valid OGGZ$\ast$ handle \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY}]Out of memory \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Note:]The vendor string should identify the library used to produce the stream, e.g. libvorbis 1.0 used \char`\"{}Xiph.Org libVorbis I 20020717\char`\"{}. If copying a bitstream it should be the same as the source. \end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]A OGGZ$\ast$ handle \item[{\em serialno}]Identify a logical bitstream within {\itshape oggz\/} \item[{\em vendor\_\-string}]The contents of the vendor string to add \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD}]{\itshape oggz\/} is not a valid OGGZ$\ast$ handle \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY}]Out of memory \end{DoxyRetVals}
+\begin{DoxyNote}{Note}
+The vendor string should identify the library used to produce the stream, e.g. libvorbis 1.0 used \char`\"{}Xiph.Org libVorbis I 20020717\char`\"{}. If copying a bitstream it should be the same as the source. 
+\end{DoxyNote}
 \index{oggz\_\-comments.h@{oggz\_\-comments.h}!oggz\_\-comments\_\-generate@{oggz\_\-comments\_\-generate}}
 \index{oggz\_\-comments\_\-generate@{oggz\_\-comments\_\-generate}!oggz_comments.h@{oggz\_\-comments.h}}
-\subsubsection[oggz\_\-comments\_\-generate]{\setlength{\rightskip}{0pt plus 5cm}ogg\_\-packet$\ast$ oggz\_\-comments\_\-generate ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  int {\em FLAC\_\-final\_\-metadata\_\-block})}\label{oggz__comments_8h_1ee69481fa517d80e63db962a23d53ae}
+\subsubsection[{oggz\_\-comments\_\-generate}]{\setlength{\rightskip}{0pt plus 5cm}ogg\_\-packet$\ast$ oggz\_\-comments\_\-generate ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  int {\em FLAC\_\-final\_\-metadata\_\-block})}\label{oggz__comments_8h_a1ee69481fa517d80e63db962a23d53ae}
 
 
 Output a comment packet for the specified stream. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]A OGGZ$\ast$ handle (created with OGGZ\_\-WRITE) \item[{\em serialno}]Identify a logical bitstream within {\em oggz\/} \item[{\em FLAC\_\-final\_\-metadata\_\-block}]Set this to zero unless the packet\_\-type is FLAC, and there are no further metadata blocks to follow. See note below for details. \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]A comment packet for the stream. When no longer needed it should be freed with \doxyref{oggz\_\-packet\_\-destroy()}{p.}{oggz__comments_8h_9301332e99b0397cff54c3593595b809}. \end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em NULL}]content type does not support comments, not enough memory or comment was too long for FLAC \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Note:]FLAC streams may contain multiple metadata blocks of different types. When encapsulated in Ogg the first of these must be a Vorbis comment packet but PADDING, APPLICATION, SEEKTABLE, CUESHEET and PICTURE may follow. The last metadata block must have its first bit set to 1. Since liboggz does not know whether you will supply more metadata blocks you must tell it if this is the last (or only) metadata block by setting FLAC\_\-final\_\-metadata\_\-block to 1. \par
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]A OGGZ$\ast$ handle (created with OGGZ\_\-WRITE) \item[{\em serialno}]Identify a logical bitstream within {\itshape oggz\/} \item[{\em FLAC\_\-final\_\-metadata\_\-block}]Set this to zero unless the packet\_\-type is FLAC, and there are no further metadata blocks to follow. See note below for details. \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+A comment packet for the stream. When no longer needed it should be freed with \doxyref{oggz\_\-packet\_\-destroy()}{p.}{oggz__comments_8h_a9301332e99b0397cff54c3593595b809}. 
+\end{DoxyReturn}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em NULL}]content type does not support comments, not enough memory or comment was too long for FLAC \end{DoxyRetVals}
+\begin{DoxyNote}{Note}
+FLAC streams may contain multiple metadata blocks of different types. When encapsulated in Ogg the first of these must be a Vorbis comment packet but PADDING, APPLICATION, SEEKTABLE, CUESHEET and PICTURE may follow. The last metadata block must have its first bit set to 1. Since liboggz does not know whether you will supply more metadata blocks you must tell it if this is the last (or only) metadata block by setting FLAC\_\-final\_\-metadata\_\-block to 1. \par
  As FLAC metadata blocks are limited in size to 16MB minus 1 byte, this function will refuse to produce longer comment packets for FLAC. \par
- See {\tt http://flac.sourceforge.net/format.html} for more details. \end{Desc}
+ See {\tt http://flac.sourceforge.net/format.html} for more details. 
+\end{DoxyNote}
 \index{oggz\_\-comments.h@{oggz\_\-comments.h}!oggz\_\-packet\_\-destroy@{oggz\_\-packet\_\-destroy}}
 \index{oggz\_\-packet\_\-destroy@{oggz\_\-packet\_\-destroy}!oggz_comments.h@{oggz\_\-comments.h}}
-\subsubsection[oggz\_\-packet\_\-destroy]{\setlength{\rightskip}{0pt plus 5cm}void oggz\_\-packet\_\-destroy (ogg\_\-packet $\ast$ {\em packet})}\label{oggz__comments_8h_9301332e99b0397cff54c3593595b809}
+\subsubsection[{oggz\_\-packet\_\-destroy}]{\setlength{\rightskip}{0pt plus 5cm}void oggz\_\-packet\_\-destroy (ogg\_\-packet $\ast$ {\em packet})}\label{oggz__comments_8h_a9301332e99b0397cff54c3593595b809}
 
 
 Free a packet and its payload. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em packet}]A packet previously returned from a function such as \doxyref{oggz\_\-comment\_\-generate()}{p.}{oggz__deprecated_8h_ab908fe161372aceb99f98a3be54ead5}. User generated packets should not be passed. \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em packet}]A packet previously returned from a function such as \doxyref{oggz\_\-comment\_\-generate()}{p.}{oggz__deprecated_8h_aab908fe161372aceb99f98a3be54ead5}. User generated packets should not be passed. \end{DoxyParams}
diff -Nru liboggz-1.1.0/doc/liboggz/latex/oggz__constants_8h.tex liboggz-1.1.1/doc/liboggz/latex/oggz__constants_8h.tex
--- liboggz-1.1.0/doc/liboggz/latex/oggz__constants_8h.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/oggz__constants_8h.tex	2010-04-24 00:13:55.000000000 +0000
@@ -2,13 +2,17 @@
 \label{oggz__constants_8h}\index{oggz\_\-constants.h@{oggz\_\-constants.h}}
 
 
-\subsection{Detailed Description}
-General constants used by liboggz. 
+General constants used by liboggz.  
 
 
+\subsection*{Typedefs}
+\begin{DoxyCompactItemize}
+\item 
+typedef enum {\bf OggzStreamContent} {\bf OggzStreamContent}\label{oggz__constants_8h_a69a05fe277d156358f300e3968ddc70f}
 
+\begin{DoxyCompactList}\small\item\em Definition of stream content types. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
 \subsection*{Enumerations}
-\begin{CompactItemize}
+\begin{DoxyCompactItemize}
 \item 
 enum {\bf OggzFlags} \{ \par
 {\bf OGGZ\_\-READ} =  0x00, 
@@ -19,76 +23,79 @@
 {\bf OGGZ\_\-PREFIX} =  0x40, 
 {\bf OGGZ\_\-SUFFIX} =  0x80
  \}
-\begin{CompactList}\small\item\em Flags to \doxyref{oggz\_\-new()}{p.}{oggz_8h_6eb34d123389ae38d993601f9e7bb9d6}, \doxyref{oggz\_\-open()}{p.}{oggz_8h_65197cdd03f755f7ebfabf2fdff4c7db}, and oggz\_\-openfd(). \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Flags to \doxyref{oggz\_\-new()}{p.}{oggz_8h_a6eb34d123389ae38d993601f9e7bb9d6}, \doxyref{oggz\_\-open()}{p.}{oggz_8h_a65197cdd03f755f7ebfabf2fdff4c7db}, and oggz\_\-openfd(). \item\end{DoxyCompactList}\item 
 enum {\bf OggzStopCtl} \{ {\bf OGGZ\_\-CONTINUE} =  0, 
 {\bf OGGZ\_\-STOP\_\-OK} =  1, 
-{\bf OGGZ\_\-STOP\_\-ERR} =  -1
+{\bf OGGZ\_\-STOP\_\-ERR} =  -\/1
  \}
 \item 
 enum {\bf OggzFlushOpts} \{ {\bf OGGZ\_\-FLUSH\_\-BEFORE} =  0x01, 
 {\bf OGGZ\_\-FLUSH\_\-AFTER} =  0x02
  \}
-\begin{CompactList}\small\item\em Flush options for oggz\_\-write\_\-feed; can be or'ed together. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Flush options for oggz\_\-write\_\-feed; can be or'ed together. \item\end{DoxyCompactList}\item 
 enum {\bf OggzStreamContent} \{ \par
-\textbf{OGGZ\_\-CONTENT\_\-THEORA} =  0, 
-\textbf{OGGZ\_\-CONTENT\_\-VORBIS}, 
-\textbf{OGGZ\_\-CONTENT\_\-SPEEX}, 
-\textbf{OGGZ\_\-CONTENT\_\-PCM}, 
-\par
-\textbf{OGGZ\_\-CONTENT\_\-CMML}, 
-\textbf{OGGZ\_\-CONTENT\_\-ANX2}, 
-\textbf{OGGZ\_\-CONTENT\_\-SKELETON}, 
-\textbf{OGGZ\_\-CONTENT\_\-FLAC0}, 
-\par
-\textbf{OGGZ\_\-CONTENT\_\-FLAC}, 
-\textbf{OGGZ\_\-CONTENT\_\-ANXDATA}, 
-\textbf{OGGZ\_\-CONTENT\_\-CELT}, 
-\textbf{OGGZ\_\-CONTENT\_\-KATE}, 
+{\bfseries OGGZ\_\-CONTENT\_\-THEORA} =  0, 
+{\bfseries OGGZ\_\-CONTENT\_\-VORBIS}, 
+{\bfseries OGGZ\_\-CONTENT\_\-SPEEX}, 
+{\bfseries OGGZ\_\-CONTENT\_\-PCM}, 
+\par
+{\bfseries OGGZ\_\-CONTENT\_\-CMML}, 
+{\bfseries OGGZ\_\-CONTENT\_\-ANX2}, 
+{\bfseries OGGZ\_\-CONTENT\_\-SKELETON}, 
+{\bfseries OGGZ\_\-CONTENT\_\-FLAC0}, 
+\par
+{\bfseries OGGZ\_\-CONTENT\_\-FLAC}, 
+{\bfseries OGGZ\_\-CONTENT\_\-ANXDATA}, 
+{\bfseries OGGZ\_\-CONTENT\_\-CELT}, 
+{\bfseries OGGZ\_\-CONTENT\_\-KATE}, 
 \par
-\textbf{OGGZ\_\-CONTENT\_\-DIRAC}, 
-\textbf{OGGZ\_\-CONTENT\_\-UNKNOWN}
+{\bfseries OGGZ\_\-CONTENT\_\-DIRAC}, 
+{\bfseries OGGZ\_\-CONTENT\_\-UNKNOWN}
  \}
-\begin{CompactList}\small\item\em Definition of stream content types. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Definition of stream content types. \item\end{DoxyCompactList}\item 
 enum {\bf OggzError} \{ \par
 {\bf OGGZ\_\-ERR\_\-OK} =  0, 
-{\bf OGGZ\_\-ERR\_\-GENERIC} =  -1, 
-{\bf OGGZ\_\-ERR\_\-BAD\_\-OGGZ} =  -2, 
-{\bf OGGZ\_\-ERR\_\-INVALID} =  -3, 
-\par
-{\bf OGGZ\_\-ERR\_\-NO\_\-STREAMS} =  -4, 
-{\bf OGGZ\_\-ERR\_\-BOS} =  -5, 
-{\bf OGGZ\_\-ERR\_\-EOS} =  -6, 
-{\bf OGGZ\_\-ERR\_\-BAD\_\-METRIC} =  -7, 
-\par
-{\bf OGGZ\_\-ERR\_\-SYSTEM} =  -10, 
-{\bf OGGZ\_\-ERR\_\-DISABLED} =  -11, 
-{\bf OGGZ\_\-ERR\_\-NOSEEK} =  -13, 
-{\bf OGGZ\_\-ERR\_\-STOP\_\-OK} =  -14, 
-\par
-{\bf OGGZ\_\-ERR\_\-STOP\_\-ERR} =  -15, 
-{\bf OGGZ\_\-ERR\_\-IO\_\-AGAIN} =  -16, 
-{\bf OGGZ\_\-ERR\_\-HOLE\_\-IN\_\-DATA} =  -17, 
-{\bf OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY} =  -18, 
-\par
-{\bf OGGZ\_\-ERR\_\-BAD\_\-SERIALNO} =  -20, 
-{\bf OGGZ\_\-ERR\_\-BAD\_\-BYTES} =  -21, 
-{\bf OGGZ\_\-ERR\_\-BAD\_\-B\_\-O\_\-S} =  -22, 
-{\bf OGGZ\_\-ERR\_\-BAD\_\-E\_\-O\_\-S} =  -23, 
-\par
-{\bf OGGZ\_\-ERR\_\-BAD\_\-GRANULEPOS} =  -24, 
-{\bf OGGZ\_\-ERR\_\-BAD\_\-PACKETNO} =  -25, 
-{\bf OGGZ\_\-ERR\_\-COMMENT\_\-INVALID} =  -129, 
-{\bf OGGZ\_\-ERR\_\-BAD\_\-GUARD} =  -210, 
+{\bf OGGZ\_\-ERR\_\-GENERIC} =  -\/1, 
+{\bf OGGZ\_\-ERR\_\-BAD\_\-OGGZ} =  -\/2, 
+{\bf OGGZ\_\-ERR\_\-INVALID} =  -\/3, 
+\par
+{\bf OGGZ\_\-ERR\_\-NO\_\-STREAMS} =  -\/4, 
+{\bf OGGZ\_\-ERR\_\-BOS} =  -\/5, 
+{\bf OGGZ\_\-ERR\_\-EOS} =  -\/6, 
+{\bf OGGZ\_\-ERR\_\-BAD\_\-METRIC} =  -\/7, 
+\par
+{\bf OGGZ\_\-ERR\_\-SYSTEM} =  -\/10, 
+{\bf OGGZ\_\-ERR\_\-DISABLED} =  -\/11, 
+{\bf OGGZ\_\-ERR\_\-NOSEEK} =  -\/13, 
+{\bf OGGZ\_\-ERR\_\-STOP\_\-OK} =  -\/14, 
+\par
+{\bf OGGZ\_\-ERR\_\-STOP\_\-ERR} =  -\/15, 
+{\bf OGGZ\_\-ERR\_\-IO\_\-AGAIN} =  -\/16, 
+{\bf OGGZ\_\-ERR\_\-HOLE\_\-IN\_\-DATA} =  -\/17, 
+{\bf OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY} =  -\/18, 
+\par
+{\bf OGGZ\_\-ERR\_\-BAD\_\-SERIALNO} =  -\/20, 
+{\bf OGGZ\_\-ERR\_\-BAD\_\-BYTES} =  -\/21, 
+{\bf OGGZ\_\-ERR\_\-BAD\_\-B\_\-O\_\-S} =  -\/22, 
+{\bf OGGZ\_\-ERR\_\-BAD\_\-E\_\-O\_\-S} =  -\/23, 
+\par
+{\bf OGGZ\_\-ERR\_\-BAD\_\-GRANULEPOS} =  -\/24, 
+{\bf OGGZ\_\-ERR\_\-BAD\_\-PACKETNO} =  -\/25, 
+{\bf OGGZ\_\-ERR\_\-COMMENT\_\-INVALID} =  -\/129, 
+{\bf OGGZ\_\-ERR\_\-BAD\_\-GUARD} =  -\/210, 
 \par
-{\bf OGGZ\_\-ERR\_\-RECURSIVE\_\-WRITE} =  -266
+{\bf OGGZ\_\-ERR\_\-RECURSIVE\_\-WRITE} =  -\/266
  \}
-\begin{CompactList}\small\item\em Definitions of error return values. \item\end{CompactList}\end{CompactItemize}
+\begin{DoxyCompactList}\small\item\em Definitions of error return values. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
 
 
+\subsection{Detailed Description}
+General constants used by liboggz. 
+
 \subsection{Enumeration Type Documentation}
 \index{oggz\_\-constants.h@{oggz\_\-constants.h}!OggzError@{OggzError}}
 \index{OggzError@{OggzError}!oggz_constants.h@{oggz\_\-constants.h}}
-\subsubsection[OggzError]{\setlength{\rightskip}{0pt plus 5cm}enum {\bf OggzError}}\label{oggz__constants_8h_68ad49468cba9eb61380abd603b0f83e}
+\subsubsection[{OggzError}]{\setlength{\rightskip}{0pt plus 5cm}enum {\bf OggzError}}\label{oggz__constants_8h_a68ad49468cba9eb61380abd603b0f83e}
 
 
 Definitions of error return values. 
@@ -97,94 +104,90 @@
 \item[Enumerator: ]\par
 \begin{description}
 \index{OGGZ\_\-ERR\_\-OK@{OGGZ\_\-ERR\_\-OK}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-ERR\_\-OK@{OGGZ\_\-ERR\_\-OK}}\item[{\em 
-OGGZ\_\-ERR\_\-OK\label{oggz__constants_8h_68ad49468cba9eb61380abd603b0f83e9c2ac780c03b38ba06e9ffe9c7f95a08}
+OGGZ\_\-ERR\_\-OK\label{oggz__constants_8h_a68ad49468cba9eb61380abd603b0f83ea9c2ac780c03b38ba06e9ffe9c7f95a08}
 }]No error. \index{OGGZ\_\-ERR\_\-GENERIC@{OGGZ\_\-ERR\_\-GENERIC}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-ERR\_\-GENERIC@{OGGZ\_\-ERR\_\-GENERIC}}\item[{\em 
-OGGZ\_\-ERR\_\-GENERIC\label{oggz__constants_8h_68ad49468cba9eb61380abd603b0f83e9cb5d186a7de1c24f0b72894ebc9886b}
+OGGZ\_\-ERR\_\-GENERIC\label{oggz__constants_8h_a68ad49468cba9eb61380abd603b0f83ea9cb5d186a7de1c24f0b72894ebc9886b}
 }]generic error \index{OGGZ\_\-ERR\_\-BAD\_\-OGGZ@{OGGZ\_\-ERR\_\-BAD\_\-OGGZ}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-ERR\_\-BAD\_\-OGGZ@{OGGZ\_\-ERR\_\-BAD\_\-OGGZ}}\item[{\em 
-OGGZ\_\-ERR\_\-BAD\_\-OGGZ\label{oggz__constants_8h_68ad49468cba9eb61380abd603b0f83e195b205e2a10b746a9426da0d8fd22f6}
+OGGZ\_\-ERR\_\-BAD\_\-OGGZ\label{oggz__constants_8h_a68ad49468cba9eb61380abd603b0f83ea195b205e2a10b746a9426da0d8fd22f6}
 }]oggz is not a valid OGGZ \index{OGGZ\_\-ERR\_\-INVALID@{OGGZ\_\-ERR\_\-INVALID}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-ERR\_\-INVALID@{OGGZ\_\-ERR\_\-INVALID}}\item[{\em 
-OGGZ\_\-ERR\_\-INVALID\label{oggz__constants_8h_68ad49468cba9eb61380abd603b0f83edcd2c8d2d0624da6b5faa5c26fc87628}
+OGGZ\_\-ERR\_\-INVALID\label{oggz__constants_8h_a68ad49468cba9eb61380abd603b0f83eadcd2c8d2d0624da6b5faa5c26fc87628}
 }]The requested operation is not suitable for this OGGZ. \index{OGGZ\_\-ERR\_\-NO\_\-STREAMS@{OGGZ\_\-ERR\_\-NO\_\-STREAMS}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-ERR\_\-NO\_\-STREAMS@{OGGZ\_\-ERR\_\-NO\_\-STREAMS}}\item[{\em 
-OGGZ\_\-ERR\_\-NO\_\-STREAMS\label{oggz__constants_8h_68ad49468cba9eb61380abd603b0f83efd7a0ff230f3892aae44a8003203afd7}
+OGGZ\_\-ERR\_\-NO\_\-STREAMS\label{oggz__constants_8h_a68ad49468cba9eb61380abd603b0f83eafd7a0ff230f3892aae44a8003203afd7}
 }]oggz contains no logical bitstreams \index{OGGZ\_\-ERR\_\-BOS@{OGGZ\_\-ERR\_\-BOS}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-ERR\_\-BOS@{OGGZ\_\-ERR\_\-BOS}}\item[{\em 
-OGGZ\_\-ERR\_\-BOS\label{oggz__constants_8h_68ad49468cba9eb61380abd603b0f83ec447250ac1367c84c875df0d01b70661}
+OGGZ\_\-ERR\_\-BOS\label{oggz__constants_8h_a68ad49468cba9eb61380abd603b0f83eac447250ac1367c84c875df0d01b70661}
 }]Operation is inappropriate for oggz in current bos state. \index{OGGZ\_\-ERR\_\-EOS@{OGGZ\_\-ERR\_\-EOS}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-ERR\_\-EOS@{OGGZ\_\-ERR\_\-EOS}}\item[{\em 
-OGGZ\_\-ERR\_\-EOS\label{oggz__constants_8h_68ad49468cba9eb61380abd603b0f83efb09184b514aee32f1b512937fa618e0}
+OGGZ\_\-ERR\_\-EOS\label{oggz__constants_8h_a68ad49468cba9eb61380abd603b0f83eafb09184b514aee32f1b512937fa618e0}
 }]Operation is inappropriate for oggz in current eos state. \index{OGGZ\_\-ERR\_\-BAD\_\-METRIC@{OGGZ\_\-ERR\_\-BAD\_\-METRIC}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-ERR\_\-BAD\_\-METRIC@{OGGZ\_\-ERR\_\-BAD\_\-METRIC}}\item[{\em 
-OGGZ\_\-ERR\_\-BAD\_\-METRIC\label{oggz__constants_8h_68ad49468cba9eb61380abd603b0f83e82714dc1b1505af8e373c2b877ce0a04}
+OGGZ\_\-ERR\_\-BAD\_\-METRIC\label{oggz__constants_8h_a68ad49468cba9eb61380abd603b0f83ea82714dc1b1505af8e373c2b877ce0a04}
 }]Operation requires a valid metric, but none has been set. \index{OGGZ\_\-ERR\_\-SYSTEM@{OGGZ\_\-ERR\_\-SYSTEM}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-ERR\_\-SYSTEM@{OGGZ\_\-ERR\_\-SYSTEM}}\item[{\em 
-OGGZ\_\-ERR\_\-SYSTEM\label{oggz__constants_8h_68ad49468cba9eb61380abd603b0f83e607f17c9c37f2d5c40d1ed55cb1d7e17}
+OGGZ\_\-ERR\_\-SYSTEM\label{oggz__constants_8h_a68ad49468cba9eb61380abd603b0f83ea607f17c9c37f2d5c40d1ed55cb1d7e17}
 }]System specific error; check errno for details. \index{OGGZ\_\-ERR\_\-DISABLED@{OGGZ\_\-ERR\_\-DISABLED}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-ERR\_\-DISABLED@{OGGZ\_\-ERR\_\-DISABLED}}\item[{\em 
-OGGZ\_\-ERR\_\-DISABLED\label{oggz__constants_8h_68ad49468cba9eb61380abd603b0f83e77029ff6686a406f966209f78f62c3ff}
+OGGZ\_\-ERR\_\-DISABLED\label{oggz__constants_8h_a68ad49468cba9eb61380abd603b0f83ea77029ff6686a406f966209f78f62c3ff}
 }]Functionality disabled at build time. \index{OGGZ\_\-ERR\_\-NOSEEK@{OGGZ\_\-ERR\_\-NOSEEK}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-ERR\_\-NOSEEK@{OGGZ\_\-ERR\_\-NOSEEK}}\item[{\em 
-OGGZ\_\-ERR\_\-NOSEEK\label{oggz__constants_8h_68ad49468cba9eb61380abd603b0f83e761cede14a1d709ea722b607c59723ed}
+OGGZ\_\-ERR\_\-NOSEEK\label{oggz__constants_8h_a68ad49468cba9eb61380abd603b0f83ea761cede14a1d709ea722b607c59723ed}
 }]Seeking operation is not possible for this OGGZ. \index{OGGZ\_\-ERR\_\-STOP\_\-OK@{OGGZ\_\-ERR\_\-STOP\_\-OK}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-ERR\_\-STOP\_\-OK@{OGGZ\_\-ERR\_\-STOP\_\-OK}}\item[{\em 
-OGGZ\_\-ERR\_\-STOP\_\-OK\label{oggz__constants_8h_68ad49468cba9eb61380abd603b0f83e5f9bde92dc6e7cc407e52e5dd61fdbf4}
+OGGZ\_\-ERR\_\-STOP\_\-OK\label{oggz__constants_8h_a68ad49468cba9eb61380abd603b0f83ea5f9bde92dc6e7cc407e52e5dd61fdbf4}
 }]Reading was stopped by an OggzReadCallback returning OGGZ\_\-STOP\_\-OK or writing was stopped by an OggzWriteHungry callback returning OGGZ\_\-STOP\_\-OK. \index{OGGZ\_\-ERR\_\-STOP\_\-ERR@{OGGZ\_\-ERR\_\-STOP\_\-ERR}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-ERR\_\-STOP\_\-ERR@{OGGZ\_\-ERR\_\-STOP\_\-ERR}}\item[{\em 
-OGGZ\_\-ERR\_\-STOP\_\-ERR\label{oggz__constants_8h_68ad49468cba9eb61380abd603b0f83e59dffeb8be96b2ac026735f7e5bb8a2a}
+OGGZ\_\-ERR\_\-STOP\_\-ERR\label{oggz__constants_8h_a68ad49468cba9eb61380abd603b0f83ea59dffeb8be96b2ac026735f7e5bb8a2a}
 }]Reading was stopped by an OggzReadCallback returning OGGZ\_\-STOP\_\-ERR or writing was stopped by an OggzWriteHungry callback returning OGGZ\_\-STOP\_\-ERR. \index{OGGZ\_\-ERR\_\-IO\_\-AGAIN@{OGGZ\_\-ERR\_\-IO\_\-AGAIN}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-ERR\_\-IO\_\-AGAIN@{OGGZ\_\-ERR\_\-IO\_\-AGAIN}}\item[{\em 
-OGGZ\_\-ERR\_\-IO\_\-AGAIN\label{oggz__constants_8h_68ad49468cba9eb61380abd603b0f83eb837c50e1cd4b858c02e1f89842bd134}
+OGGZ\_\-ERR\_\-IO\_\-AGAIN\label{oggz__constants_8h_a68ad49468cba9eb61380abd603b0f83eab837c50e1cd4b858c02e1f89842bd134}
 }]no data available from IO, try again \index{OGGZ\_\-ERR\_\-HOLE\_\-IN\_\-DATA@{OGGZ\_\-ERR\_\-HOLE\_\-IN\_\-DATA}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-ERR\_\-HOLE\_\-IN\_\-DATA@{OGGZ\_\-ERR\_\-HOLE\_\-IN\_\-DATA}}\item[{\em 
-OGGZ\_\-ERR\_\-HOLE\_\-IN\_\-DATA\label{oggz__constants_8h_68ad49468cba9eb61380abd603b0f83eed1eccb86408055f065009e64b88a7d4}
+OGGZ\_\-ERR\_\-HOLE\_\-IN\_\-DATA\label{oggz__constants_8h_a68ad49468cba9eb61380abd603b0f83eaed1eccb86408055f065009e64b88a7d4}
 }]Hole (sequence number gap) detected in input data. \index{OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY@{OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY@{OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY}}\item[{\em 
-OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY\label{oggz__constants_8h_68ad49468cba9eb61380abd603b0f83e3edc55802c7a9052f14608b9c101b92c}
+OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY\label{oggz__constants_8h_a68ad49468cba9eb61380abd603b0f83ea3edc55802c7a9052f14608b9c101b92c}
 }]Out of memory. \index{OGGZ\_\-ERR\_\-BAD\_\-SERIALNO@{OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-ERR\_\-BAD\_\-SERIALNO@{OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}}\item[{\em 
-OGGZ\_\-ERR\_\-BAD\_\-SERIALNO\label{oggz__constants_8h_68ad49468cba9eb61380abd603b0f83ed19554f4b1f544a1b575664b4a38694d}
+OGGZ\_\-ERR\_\-BAD\_\-SERIALNO\label{oggz__constants_8h_a68ad49468cba9eb61380abd603b0f83ead19554f4b1f544a1b575664b4a38694d}
 }]The requested serialno does not exist in this OGGZ. \index{OGGZ\_\-ERR\_\-BAD\_\-BYTES@{OGGZ\_\-ERR\_\-BAD\_\-BYTES}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-ERR\_\-BAD\_\-BYTES@{OGGZ\_\-ERR\_\-BAD\_\-BYTES}}\item[{\em 
-OGGZ\_\-ERR\_\-BAD\_\-BYTES\label{oggz__constants_8h_68ad49468cba9eb61380abd603b0f83ecf1a748ac6d70d304c193ac4d8a0142a}
+OGGZ\_\-ERR\_\-BAD\_\-BYTES\label{oggz__constants_8h_a68ad49468cba9eb61380abd603b0f83eacf1a748ac6d70d304c193ac4d8a0142a}
 }]Packet disallowed due to invalid byte length. \index{OGGZ\_\-ERR\_\-BAD\_\-B\_\-O\_\-S@{OGGZ\_\-ERR\_\-BAD\_\-B\_\-O\_\-S}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-ERR\_\-BAD\_\-B\_\-O\_\-S@{OGGZ\_\-ERR\_\-BAD\_\-B\_\-O\_\-S}}\item[{\em 
-OGGZ\_\-ERR\_\-BAD\_\-B\_\-O\_\-S\label{oggz__constants_8h_68ad49468cba9eb61380abd603b0f83e82a9669e837d20e2fb392c9f1f5eb960}
+OGGZ\_\-ERR\_\-BAD\_\-B\_\-O\_\-S\label{oggz__constants_8h_a68ad49468cba9eb61380abd603b0f83ea82a9669e837d20e2fb392c9f1f5eb960}
 }]Packet disallowed due to invalid b\_\-o\_\-s (beginning of stream) flag. \index{OGGZ\_\-ERR\_\-BAD\_\-E\_\-O\_\-S@{OGGZ\_\-ERR\_\-BAD\_\-E\_\-O\_\-S}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-ERR\_\-BAD\_\-E\_\-O\_\-S@{OGGZ\_\-ERR\_\-BAD\_\-E\_\-O\_\-S}}\item[{\em 
-OGGZ\_\-ERR\_\-BAD\_\-E\_\-O\_\-S\label{oggz__constants_8h_68ad49468cba9eb61380abd603b0f83ee2352f40f9376e4b9dc234db18a93798}
+OGGZ\_\-ERR\_\-BAD\_\-E\_\-O\_\-S\label{oggz__constants_8h_a68ad49468cba9eb61380abd603b0f83eae2352f40f9376e4b9dc234db18a93798}
 }]Packet disallowed due to invalid e\_\-o\_\-s (end of stream) flag. \index{OGGZ\_\-ERR\_\-BAD\_\-GRANULEPOS@{OGGZ\_\-ERR\_\-BAD\_\-GRANULEPOS}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-ERR\_\-BAD\_\-GRANULEPOS@{OGGZ\_\-ERR\_\-BAD\_\-GRANULEPOS}}\item[{\em 
-OGGZ\_\-ERR\_\-BAD\_\-GRANULEPOS\label{oggz__constants_8h_68ad49468cba9eb61380abd603b0f83e9d49be12111ae95d12252528496a88a7}
+OGGZ\_\-ERR\_\-BAD\_\-GRANULEPOS\label{oggz__constants_8h_a68ad49468cba9eb61380abd603b0f83ea9d49be12111ae95d12252528496a88a7}
 }]Packet disallowed due to invalid granulepos. \index{OGGZ\_\-ERR\_\-BAD\_\-PACKETNO@{OGGZ\_\-ERR\_\-BAD\_\-PACKETNO}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-ERR\_\-BAD\_\-PACKETNO@{OGGZ\_\-ERR\_\-BAD\_\-PACKETNO}}\item[{\em 
-OGGZ\_\-ERR\_\-BAD\_\-PACKETNO\label{oggz__constants_8h_68ad49468cba9eb61380abd603b0f83e5e0116f755d019616406ac341f1f6e98}
+OGGZ\_\-ERR\_\-BAD\_\-PACKETNO\label{oggz__constants_8h_a68ad49468cba9eb61380abd603b0f83ea5e0116f755d019616406ac341f1f6e98}
 }]Packet disallowed due to invalid packetno. \index{OGGZ\_\-ERR\_\-COMMENT\_\-INVALID@{OGGZ\_\-ERR\_\-COMMENT\_\-INVALID}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-ERR\_\-COMMENT\_\-INVALID@{OGGZ\_\-ERR\_\-COMMENT\_\-INVALID}}\item[{\em 
-OGGZ\_\-ERR\_\-COMMENT\_\-INVALID\label{oggz__constants_8h_68ad49468cba9eb61380abd603b0f83ed27c93cddea5ddaeaf168426f14833de}
+OGGZ\_\-ERR\_\-COMMENT\_\-INVALID\label{oggz__constants_8h_a68ad49468cba9eb61380abd603b0f83ead27c93cddea5ddaeaf168426f14833de}
 }]Comment violates VorbisComment restrictions. \index{OGGZ\_\-ERR\_\-BAD\_\-GUARD@{OGGZ\_\-ERR\_\-BAD\_\-GUARD}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-ERR\_\-BAD\_\-GUARD@{OGGZ\_\-ERR\_\-BAD\_\-GUARD}}\item[{\em 
-OGGZ\_\-ERR\_\-BAD\_\-GUARD\label{oggz__constants_8h_68ad49468cba9eb61380abd603b0f83e57d5c64dce5d60f559e13dbe3e3c1c22}
-}]Guard provided by user has non-zero value. \index{OGGZ\_\-ERR\_\-RECURSIVE\_\-WRITE@{OGGZ\_\-ERR\_\-RECURSIVE\_\-WRITE}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-ERR\_\-RECURSIVE\_\-WRITE@{OGGZ\_\-ERR\_\-RECURSIVE\_\-WRITE}}\item[{\em 
-OGGZ\_\-ERR\_\-RECURSIVE\_\-WRITE\label{oggz__constants_8h_68ad49468cba9eb61380abd603b0f83e8f0a11d443e4bf9f89a2cc4d44548081}
-}]Attempt to call \doxyref{oggz\_\-write()}{p.}{group__write__api_g3c97d94ea425d64546adf9c368b71904} or \doxyref{oggz\_\-write\_\-output()}{p.}{group__write__api_g5606dff01964caec4582eb172fde0c1c} from within a hungry() callback. \end{description}
+OGGZ\_\-ERR\_\-BAD\_\-GUARD\label{oggz__constants_8h_a68ad49468cba9eb61380abd603b0f83ea57d5c64dce5d60f559e13dbe3e3c1c22}
+}]Guard provided by user has non-\/zero value. \index{OGGZ\_\-ERR\_\-RECURSIVE\_\-WRITE@{OGGZ\_\-ERR\_\-RECURSIVE\_\-WRITE}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-ERR\_\-RECURSIVE\_\-WRITE@{OGGZ\_\-ERR\_\-RECURSIVE\_\-WRITE}}\item[{\em 
+OGGZ\_\-ERR\_\-RECURSIVE\_\-WRITE\label{oggz__constants_8h_a68ad49468cba9eb61380abd603b0f83ea8f0a11d443e4bf9f89a2cc4d44548081}
+}]Attempt to call \doxyref{oggz\_\-write()}{p.}{group__write__api_ga3c97d94ea425d64546adf9c368b71904} or \doxyref{oggz\_\-write\_\-output()}{p.}{group__write__api_ga5606dff01964caec4582eb172fde0c1c} from within a hungry() callback. \end{description}
 \end{Desc}
 
 \index{oggz\_\-constants.h@{oggz\_\-constants.h}!OggzFlags@{OggzFlags}}
 \index{OggzFlags@{OggzFlags}!oggz_constants.h@{oggz\_\-constants.h}}
-\subsubsection[OggzFlags]{\setlength{\rightskip}{0pt plus 5cm}enum {\bf OggzFlags}}\label{oggz__constants_8h_12afc3c052f6e84eff5a99ac9f1ccdd3}
+\subsubsection[{OggzFlags}]{\setlength{\rightskip}{0pt plus 5cm}enum {\bf OggzFlags}}\label{oggz__constants_8h_a12afc3c052f6e84eff5a99ac9f1ccdd3}
 
 
-Flags to \doxyref{oggz\_\-new()}{p.}{oggz_8h_6eb34d123389ae38d993601f9e7bb9d6}, \doxyref{oggz\_\-open()}{p.}{oggz_8h_65197cdd03f755f7ebfabf2fdff4c7db}, and oggz\_\-openfd(). 
+Flags to \doxyref{oggz\_\-new()}{p.}{oggz_8h_a6eb34d123389ae38d993601f9e7bb9d6}, \doxyref{oggz\_\-open()}{p.}{oggz_8h_a65197cdd03f755f7ebfabf2fdff4c7db}, and oggz\_\-openfd(). 
 
-Can be or'ed together in the following combinations:\begin{itemize}
-\item OGGZ\_\-READ $|$ OGGZ\_\-AUTO\item OGGZ\_\-WRITE $|$ OGGZ\_\-NONSTRICT $|$ OGGZ\_\-PREFIX $|$ OGGZ\_\-SUFFIX \end{itemize}
-\begin{Desc}
+Can be or'ed together in the following combinations:
+\begin{DoxyItemize}
+\item OGGZ\_\-READ $|$ OGGZ\_\-AUTO
+\item OGGZ\_\-WRITE $|$ OGGZ\_\-NONSTRICT $|$ OGGZ\_\-PREFIX $|$ OGGZ\_\-SUFFIX 
+\end{DoxyItemize}\begin{Desc}
 \item[Enumerator: ]\par
 \begin{description}
 \index{OGGZ\_\-READ@{OGGZ\_\-READ}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-READ@{OGGZ\_\-READ}}\item[{\em 
-OGGZ\_\-READ\label{oggz__constants_8h_12afc3c052f6e84eff5a99ac9f1ccdd395bd4a2b27d6e9e119ee11a7c5c26c50}
+OGGZ\_\-READ\label{oggz__constants_8h_a12afc3c052f6e84eff5a99ac9f1ccdd3a95bd4a2b27d6e9e119ee11a7c5c26c50}
 }]Read only. \index{OGGZ\_\-WRITE@{OGGZ\_\-WRITE}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-WRITE@{OGGZ\_\-WRITE}}\item[{\em 
-OGGZ\_\-WRITE\label{oggz__constants_8h_12afc3c052f6e84eff5a99ac9f1ccdd38819c3d01c84191dbf846b5e0a98d757}
+OGGZ\_\-WRITE\label{oggz__constants_8h_a12afc3c052f6e84eff5a99ac9f1ccdd3a8819c3d01c84191dbf846b5e0a98d757}
 }]Write only. \index{OGGZ\_\-NONSTRICT@{OGGZ\_\-NONSTRICT}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-NONSTRICT@{OGGZ\_\-NONSTRICT}}\item[{\em 
-OGGZ\_\-NONSTRICT\label{oggz__constants_8h_12afc3c052f6e84eff5a99ac9f1ccdd324e9b4267730b726756241d7de2e8cf2}
+OGGZ\_\-NONSTRICT\label{oggz__constants_8h_a12afc3c052f6e84eff5a99ac9f1ccdd3a24e9b4267730b726756241d7de2e8cf2}
 }]Disable strict adherence to mapping constraints, eg for handling an incomplete stream. \index{OGGZ\_\-AUTO@{OGGZ\_\-AUTO}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-AUTO@{OGGZ\_\-AUTO}}\item[{\em 
-OGGZ\_\-AUTO\label{oggz__constants_8h_12afc3c052f6e84eff5a99ac9f1ccdd3f5b915c8762126bff52a0499745d1732}
-}]Scan for known headers while reading, and automatically set metrics appropriately. 
-
-Opening a file for reading with {\em flags\/} = OGGZ\_\-READ $|$ OGGZ\_\-AUTO will allow seeking on Speex, Vorbis, FLAC, Theora, CMML and all Annodex streams in units of milliseconds, once all bos pages have been delivered. \index{OGGZ\_\-PREFIX@{OGGZ\_\-PREFIX}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-PREFIX@{OGGZ\_\-PREFIX}}\item[{\em 
-OGGZ\_\-PREFIX\label{oggz__constants_8h_12afc3c052f6e84eff5a99ac9f1ccdd3cb0fc6d8842462d7a1624c3312c299fb}
-}]Write Prefix: Assume that we are only writing the prefix of an Ogg stream, ie. 
-
-disable checking for conformance with end-of-stream constraints. \index{OGGZ\_\-SUFFIX@{OGGZ\_\-SUFFIX}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-SUFFIX@{OGGZ\_\-SUFFIX}}\item[{\em 
-OGGZ\_\-SUFFIX\label{oggz__constants_8h_12afc3c052f6e84eff5a99ac9f1ccdd370e2ea0bfd95ff858125a4f777eb90e8}
-}]Write Suffix: Assume that we are only writing the suffix of an Ogg stream, ie. 
-
-disable checking for conformance with beginning-of-stream constraints. \end{description}
+OGGZ\_\-AUTO\label{oggz__constants_8h_a12afc3c052f6e84eff5a99ac9f1ccdd3af5b915c8762126bff52a0499745d1732}
+}]Scan for known headers while reading, and automatically set metrics appropriately. Opening a file for reading with {\itshape flags\/} = OGGZ\_\-READ $|$ OGGZ\_\-AUTO will allow seeking on Speex, Vorbis, FLAC, Theora, CMML and all Annodex streams in units of milliseconds, once all bos pages have been delivered. \index{OGGZ\_\-PREFIX@{OGGZ\_\-PREFIX}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-PREFIX@{OGGZ\_\-PREFIX}}\item[{\em 
+OGGZ\_\-PREFIX\label{oggz__constants_8h_a12afc3c052f6e84eff5a99ac9f1ccdd3acb0fc6d8842462d7a1624c3312c299fb}
+}]Write Prefix: Assume that we are only writing the prefix of an Ogg stream, ie. disable checking for conformance with end-\/of-\/stream constraints. \index{OGGZ\_\-SUFFIX@{OGGZ\_\-SUFFIX}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-SUFFIX@{OGGZ\_\-SUFFIX}}\item[{\em 
+OGGZ\_\-SUFFIX\label{oggz__constants_8h_a12afc3c052f6e84eff5a99ac9f1ccdd3a70e2ea0bfd95ff858125a4f777eb90e8}
+}]Write Suffix: Assume that we are only writing the suffix of an Ogg stream, ie. disable checking for conformance with beginning-\/of-\/stream constraints. \end{description}
 \end{Desc}
 
 \index{oggz\_\-constants.h@{oggz\_\-constants.h}!OggzFlushOpts@{OggzFlushOpts}}
 \index{OggzFlushOpts@{OggzFlushOpts}!oggz_constants.h@{oggz\_\-constants.h}}
-\subsubsection[OggzFlushOpts]{\setlength{\rightskip}{0pt plus 5cm}enum {\bf OggzFlushOpts}}\label{oggz__constants_8h_6a09e7685c864a9116473b236c847237}
+\subsubsection[{OggzFlushOpts}]{\setlength{\rightskip}{0pt plus 5cm}enum {\bf OggzFlushOpts}}\label{oggz__constants_8h_a6a09e7685c864a9116473b236c847237}
 
 
 Flush options for oggz\_\-write\_\-feed; can be or'ed together. 
@@ -193,26 +196,24 @@
 \item[Enumerator: ]\par
 \begin{description}
 \index{OGGZ\_\-FLUSH\_\-BEFORE@{OGGZ\_\-FLUSH\_\-BEFORE}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-FLUSH\_\-BEFORE@{OGGZ\_\-FLUSH\_\-BEFORE}}\item[{\em 
-OGGZ\_\-FLUSH\_\-BEFORE\label{oggz__constants_8h_6a09e7685c864a9116473b236c8472379dc1d61b8f27fe00ba9d0a8005a9bcfb}
+OGGZ\_\-FLUSH\_\-BEFORE\label{oggz__constants_8h_a6a09e7685c864a9116473b236c847237a9dc1d61b8f27fe00ba9d0a8005a9bcfb}
 }]Flush all streams before beginning this packet. \index{OGGZ\_\-FLUSH\_\-AFTER@{OGGZ\_\-FLUSH\_\-AFTER}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-FLUSH\_\-AFTER@{OGGZ\_\-FLUSH\_\-AFTER}}\item[{\em 
-OGGZ\_\-FLUSH\_\-AFTER\label{oggz__constants_8h_6a09e7685c864a9116473b236c84723742efb730f40edcdb0dfdb8a6294619c4}
+OGGZ\_\-FLUSH\_\-AFTER\label{oggz__constants_8h_a6a09e7685c864a9116473b236c847237a42efb730f40edcdb0dfdb8a6294619c4}
 }]Flush after this packet. \end{description}
 \end{Desc}
 
 \index{oggz\_\-constants.h@{oggz\_\-constants.h}!OggzStopCtl@{OggzStopCtl}}
 \index{OggzStopCtl@{OggzStopCtl}!oggz_constants.h@{oggz\_\-constants.h}}
-\subsubsection[OggzStopCtl]{\setlength{\rightskip}{0pt plus 5cm}enum {\bf OggzStopCtl}}\label{oggz__constants_8h_0dacf1292b80037e9aefeaee1b90f5ff}
-
-
+\subsubsection[{OggzStopCtl}]{\setlength{\rightskip}{0pt plus 5cm}enum {\bf OggzStopCtl}}\label{oggz__constants_8h_a0dacf1292b80037e9aefeaee1b90f5ff}
 \begin{Desc}
 \item[Enumerator: ]\par
 \begin{description}
 \index{OGGZ\_\-CONTINUE@{OGGZ\_\-CONTINUE}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-CONTINUE@{OGGZ\_\-CONTINUE}}\item[{\em 
-OGGZ\_\-CONTINUE\label{oggz__constants_8h_0dacf1292b80037e9aefeaee1b90f5fff5242099c219d1330ddd861585cc3bf3}
+OGGZ\_\-CONTINUE\label{oggz__constants_8h_a0dacf1292b80037e9aefeaee1b90f5ffaf5242099c219d1330ddd861585cc3bf3}
 }]Continue calling read callbacks. \index{OGGZ\_\-STOP\_\-OK@{OGGZ\_\-STOP\_\-OK}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-STOP\_\-OK@{OGGZ\_\-STOP\_\-OK}}\item[{\em 
-OGGZ\_\-STOP\_\-OK\label{oggz__constants_8h_0dacf1292b80037e9aefeaee1b90f5ffc05c70a0c2213533267f8494eb928282}
+OGGZ\_\-STOP\_\-OK\label{oggz__constants_8h_a0dacf1292b80037e9aefeaee1b90f5ffac05c70a0c2213533267f8494eb928282}
 }]Stop calling callbacks, but retain buffered packet data. \index{OGGZ\_\-STOP\_\-ERR@{OGGZ\_\-STOP\_\-ERR}!oggz\_\-constants.h@{oggz\_\-constants.h}}\index{oggz\_\-constants.h@{oggz\_\-constants.h}!OGGZ\_\-STOP\_\-ERR@{OGGZ\_\-STOP\_\-ERR}}\item[{\em 
-OGGZ\_\-STOP\_\-ERR\label{oggz__constants_8h_0dacf1292b80037e9aefeaee1b90f5ff09454b9448ae3d93439b644243b6e552}
+OGGZ\_\-STOP\_\-ERR\label{oggz__constants_8h_a0dacf1292b80037e9aefeaee1b90f5ffa09454b9448ae3d93439b644243b6e552}
 }]Stop calling callbacks, and purge buffered packet data. \end{description}
 \end{Desc}
 
diff -Nru liboggz-1.1.0/doc/liboggz/latex/oggz__deprecated_8h.tex liboggz-1.1.1/doc/liboggz/latex/oggz__deprecated_8h.tex
--- liboggz-1.1.0/doc/liboggz/latex/oggz__deprecated_8h.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/oggz__deprecated_8h.tex	2010-04-24 00:13:55.000000000 +0000
@@ -2,95 +2,91 @@
 \label{oggz__deprecated_8h}\index{oggz\_\-deprecated.h@{oggz\_\-deprecated.h}}
 
 
-\subsection{Detailed Description}
-Deprecated interfaces. 
-
+Deprecated interfaces.  
 
 
 \subsection*{Defines}
-\begin{CompactItemize}
+\begin{DoxyCompactItemize}
 \item 
 \#define {\bf OGGZ\_\-ERR\_\-USER\_\-STOPPED}~OGGZ\_\-ERR\_\-STOP\_\-OK
-\begin{CompactList}\small\item\em DEPRECATED CONSTANT. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em DEPRECATED CONSTANT. \item\end{DoxyCompactList}\item 
 \#define {\bf OGGZ\_\-ERR\_\-READ\_\-STOP\_\-OK}~OGGZ\_\-ERR\_\-STOP\_\-OK
-\begin{CompactList}\small\item\em DEPRECATED CONSTANT. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em DEPRECATED CONSTANT. \item\end{DoxyCompactList}\item 
 \#define {\bf OGGZ\_\-ERR\_\-READ\_\-STOP\_\-ERR}~OGGZ\_\-ERR\_\-STOP\_\-ERR
-\begin{CompactList}\small\item\em DEPRECATED CONSTANT. \item\end{CompactList}\end{CompactItemize}
+\begin{DoxyCompactList}\small\item\em DEPRECATED CONSTANT. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
 \subsection*{Functions}
-\begin{CompactItemize}
+\begin{DoxyCompactItemize}
 \item 
 int {\bf oggz\_\-set\_\-metric\_\-linear} ({\bf OGGZ} $\ast$oggz, long serialno, ogg\_\-int64\_\-t granule\_\-rate\_\-numerator, ogg\_\-int64\_\-t granule\_\-rate\_\-denominator)
-\begin{CompactList}\small\item\em DEPRECATED FUNCTION This function has been replaced with the more clearly named \doxyref{oggz\_\-set\_\-granulerate()}{p.}{group__metric_ga2a86ec590161bc2295a2c8e91cefa49}. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em DEPRECATED FUNCTION This function has been replaced with the more clearly named \doxyref{oggz\_\-set\_\-granulerate()}{p.}{group__metric_gaa2a86ec590161bc2295a2c8e91cefa49}. \item\end{DoxyCompactList}\item 
 ogg\_\-packet $\ast$ {\bf oggz\_\-comment\_\-generate} ({\bf OGGZ} $\ast$oggz, long serialno, {\bf OggzStreamContent} packet\_\-type, int FLAC\_\-final\_\-metadata\_\-block)
-\begin{CompactList}\small\item\em DEPRECATED FUNCTION This function has been replaced with \doxyref{oggz\_\-comments\_\-generate()}{p.}{oggz__comments_8h_1ee69481fa517d80e63db962a23d53ae}, which does not require the packet\_\-type argument. \item\end{CompactList}\end{CompactItemize}
+\begin{DoxyCompactList}\small\item\em DEPRECATED FUNCTION This function has been replaced with \doxyref{oggz\_\-comments\_\-generate()}{p.}{oggz__comments_8h_a1ee69481fa517d80e63db962a23d53ae}, which does not require the packet\_\-type argument. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
 
 
+\subsection{Detailed Description}
+Deprecated interfaces. 
+
 \subsection{Define Documentation}
 \index{oggz\_\-deprecated.h@{oggz\_\-deprecated.h}!OGGZ\_\-ERR\_\-READ\_\-STOP\_\-ERR@{OGGZ\_\-ERR\_\-READ\_\-STOP\_\-ERR}}
 \index{OGGZ\_\-ERR\_\-READ\_\-STOP\_\-ERR@{OGGZ\_\-ERR\_\-READ\_\-STOP\_\-ERR}!oggz_deprecated.h@{oggz\_\-deprecated.h}}
-\subsubsection[OGGZ\_\-ERR\_\-READ\_\-STOP\_\-ERR]{\setlength{\rightskip}{0pt plus 5cm}\#define OGGZ\_\-ERR\_\-READ\_\-STOP\_\-ERR~OGGZ\_\-ERR\_\-STOP\_\-ERR}\label{oggz__deprecated_8h_7fb3e5030a672e6ecfd8e8e6bf57fdfa}
+\subsubsection[{OGGZ\_\-ERR\_\-READ\_\-STOP\_\-ERR}]{\setlength{\rightskip}{0pt plus 5cm}\#define OGGZ\_\-ERR\_\-READ\_\-STOP\_\-ERR~OGGZ\_\-ERR\_\-STOP\_\-ERR}\label{oggz__deprecated_8h_a7fb3e5030a672e6ecfd8e8e6bf57fdfa}
 
 
 DEPRECATED CONSTANT. 
 
 OGGZ\_\-ERR\_\-READ\_\-STOP\_\-OK, OGGZ\_\-ERR\_\-READ\_\-STOP\_\-ERR were introduced to allow the user to differentiate between a cancelled oggz\_\-read\_\-$\ast$() returning due to error or an ok condition. From 0.9.4 similar functionality was added for oggz\_\-write\_\-$\ast$(), hence this constant was renamed. \index{oggz\_\-deprecated.h@{oggz\_\-deprecated.h}!OGGZ\_\-ERR\_\-READ\_\-STOP\_\-OK@{OGGZ\_\-ERR\_\-READ\_\-STOP\_\-OK}}
 \index{OGGZ\_\-ERR\_\-READ\_\-STOP\_\-OK@{OGGZ\_\-ERR\_\-READ\_\-STOP\_\-OK}!oggz_deprecated.h@{oggz\_\-deprecated.h}}
-\subsubsection[OGGZ\_\-ERR\_\-READ\_\-STOP\_\-OK]{\setlength{\rightskip}{0pt plus 5cm}\#define OGGZ\_\-ERR\_\-READ\_\-STOP\_\-OK~OGGZ\_\-ERR\_\-STOP\_\-OK}\label{oggz__deprecated_8h_0d9b4d212038e72fb45d751fe750d3cf}
+\subsubsection[{OGGZ\_\-ERR\_\-READ\_\-STOP\_\-OK}]{\setlength{\rightskip}{0pt plus 5cm}\#define OGGZ\_\-ERR\_\-READ\_\-STOP\_\-OK~OGGZ\_\-ERR\_\-STOP\_\-OK}\label{oggz__deprecated_8h_a0d9b4d212038e72fb45d751fe750d3cf}
 
 
 DEPRECATED CONSTANT. 
 
 OGGZ\_\-ERR\_\-READ\_\-STOP\_\-OK, OGGZ\_\-ERR\_\-READ\_\-STOP\_\-ERR were introduced to allow the user to differentiate between a cancelled oggz\_\-read\_\-$\ast$() returning due to error or an ok condition. From 0.9.4 similar functionality was added for oggz\_\-write\_\-$\ast$(), hence this constant was renamed. \index{oggz\_\-deprecated.h@{oggz\_\-deprecated.h}!OGGZ\_\-ERR\_\-USER\_\-STOPPED@{OGGZ\_\-ERR\_\-USER\_\-STOPPED}}
 \index{OGGZ\_\-ERR\_\-USER\_\-STOPPED@{OGGZ\_\-ERR\_\-USER\_\-STOPPED}!oggz_deprecated.h@{oggz\_\-deprecated.h}}
-\subsubsection[OGGZ\_\-ERR\_\-USER\_\-STOPPED]{\setlength{\rightskip}{0pt plus 5cm}\#define OGGZ\_\-ERR\_\-USER\_\-STOPPED~OGGZ\_\-ERR\_\-STOP\_\-OK}\label{oggz__deprecated_8h_aa24ef96507165b2c5e1ac4108d59288}
+\subsubsection[{OGGZ\_\-ERR\_\-USER\_\-STOPPED}]{\setlength{\rightskip}{0pt plus 5cm}\#define OGGZ\_\-ERR\_\-USER\_\-STOPPED~OGGZ\_\-ERR\_\-STOP\_\-OK}\label{oggz__deprecated_8h_aaa24ef96507165b2c5e1ac4108d59288}
 
 
 DEPRECATED CONSTANT. 
 
-OGGZ\_\-ERR\_\-USER\_\-STOPPED was introduced during development (post 0.8.3), and is similar in functionality to and numerically equal to (ie. ABI compatible with) OGGZ\_\-ERR\_\-STOP\_\-OK in $<$\doxyref{oggz/oggz\_\-constants.h}{p.}{oggz__constants_8h}$>$. It was badly named, as the preferred functionality distinguishes between a user's OggzReadCallback returning OGGZ\_\-STOP\_\-OK or OGGZ\_\-STOP\_\-ERR; your code should distinguish between these two too :-) Hence, don't use this (unreleased) name in new code. 
+OGGZ\_\-ERR\_\-USER\_\-STOPPED was introduced during development (post 0.8.3), and is similar in functionality to and numerically equal to (ie. ABI compatible with) OGGZ\_\-ERR\_\-STOP\_\-OK in $<$\doxyref{oggz/oggz\_\-constants.h}{p.}{oggz__constants_8h}$>$. It was badly named, as the preferred functionality distinguishes between a user's OggzReadCallback returning OGGZ\_\-STOP\_\-OK or OGGZ\_\-STOP\_\-ERR; your code should distinguish between these two too :-\/) Hence, don't use this (unreleased) name in new code. 
 
 \subsection{Function Documentation}
 \index{oggz\_\-deprecated.h@{oggz\_\-deprecated.h}!oggz\_\-comment\_\-generate@{oggz\_\-comment\_\-generate}}
 \index{oggz\_\-comment\_\-generate@{oggz\_\-comment\_\-generate}!oggz_deprecated.h@{oggz\_\-deprecated.h}}
-\subsubsection[oggz\_\-comment\_\-generate]{\setlength{\rightskip}{0pt plus 5cm}ogg\_\-packet$\ast$ oggz\_\-comment\_\-generate ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  {\bf OggzStreamContent} {\em packet\_\-type}, \/  int {\em FLAC\_\-final\_\-metadata\_\-block})}\label{oggz__deprecated_8h_ab908fe161372aceb99f98a3be54ead5}
+\subsubsection[{oggz\_\-comment\_\-generate}]{\setlength{\rightskip}{0pt plus 5cm}ogg\_\-packet$\ast$ oggz\_\-comment\_\-generate ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  {\bf OggzStreamContent} {\em packet\_\-type}, \/  int {\em FLAC\_\-final\_\-metadata\_\-block})}\label{oggz__deprecated_8h_aab908fe161372aceb99f98a3be54ead5}
 
 
-DEPRECATED FUNCTION This function has been replaced with \doxyref{oggz\_\-comments\_\-generate()}{p.}{oggz__comments_8h_1ee69481fa517d80e63db962a23d53ae}, which does not require the packet\_\-type argument. 
+DEPRECATED FUNCTION This function has been replaced with \doxyref{oggz\_\-comments\_\-generate()}{p.}{oggz__comments_8h_a1ee69481fa517d80e63db962a23d53ae}, which does not require the packet\_\-type argument. 
 
 Instead, the packet type is determined by the content type of the stream, which was discovered when the bos packet was passed to oggz\_\-write\_\-feed.
 
-Output a comment packet for the specified stream. \begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]A OGGZ$\ast$ handle (created with OGGZ\_\-WRITE) \item[{\em serialno}]Identify a logical bitstream within {\em oggz\/} \item[{\em packet\_\-type}]Type of comment packet to generate, FLAC, OggPCM, Speex, Theora and Vorbis are supported \item[{\em FLAC\_\-final\_\-metadata\_\-block}]Set this to zero unless the packet\_\-type is FLAC, and there are no further metadata blocks to follow. See note below for details. \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]A comment packet for the stream. When no longer needed it should be freed with \doxyref{oggz\_\-packet\_\-destroy()}{p.}{oggz__comments_8h_9301332e99b0397cff54c3593595b809}. \end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em NULL}]content type does not support comments, not enough memory or comment was too long for FLAC \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Note:]FLAC streams may contain multiple metadata blocks of different types. When encapsulated in Ogg the first of these must be a Vorbis comment packet but PADDING, APPLICATION, SEEKTABLE, CUESHEET and PICTURE may follow. The last metadata block must have its first bit set to 1. Since liboggz does not know whether you will supply more metadata blocks you must tell it if this is the last (or only) metadata block by setting FLAC\_\-final\_\-metadata\_\-block to 1. \par
+Output a comment packet for the specified stream. 
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]A OGGZ$\ast$ handle (created with OGGZ\_\-WRITE) \item[{\em serialno}]Identify a logical bitstream within {\itshape oggz\/} \item[{\em packet\_\-type}]Type of comment packet to generate, FLAC, OggPCM, Speex, Theora and Vorbis are supported \item[{\em FLAC\_\-final\_\-metadata\_\-block}]Set this to zero unless the packet\_\-type is FLAC, and there are no further metadata blocks to follow. See note below for details. \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+A comment packet for the stream. When no longer needed it should be freed with \doxyref{oggz\_\-packet\_\-destroy()}{p.}{oggz__comments_8h_a9301332e99b0397cff54c3593595b809}. 
+\end{DoxyReturn}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em NULL}]content type does not support comments, not enough memory or comment was too long for FLAC \end{DoxyRetVals}
+\begin{DoxyNote}{Note}
+FLAC streams may contain multiple metadata blocks of different types. When encapsulated in Ogg the first of these must be a Vorbis comment packet but PADDING, APPLICATION, SEEKTABLE, CUESHEET and PICTURE may follow. The last metadata block must have its first bit set to 1. Since liboggz does not know whether you will supply more metadata blocks you must tell it if this is the last (or only) metadata block by setting FLAC\_\-final\_\-metadata\_\-block to 1. \par
  As FLAC metadata blocks are limited in size to 16MB minus 1 byte, this function will refuse to produce longer comment packets for FLAC. \par
- See {\tt http://flac.sourceforge.net/format.html} for more details. \end{Desc}
+ See {\tt http://flac.sourceforge.net/format.html} for more details. 
+\end{DoxyNote}
 \index{oggz\_\-deprecated.h@{oggz\_\-deprecated.h}!oggz\_\-set\_\-metric\_\-linear@{oggz\_\-set\_\-metric\_\-linear}}
 \index{oggz\_\-set\_\-metric\_\-linear@{oggz\_\-set\_\-metric\_\-linear}!oggz_deprecated.h@{oggz\_\-deprecated.h}}
-\subsubsection[oggz\_\-set\_\-metric\_\-linear]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-set\_\-metric\_\-linear ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  ogg\_\-int64\_\-t {\em granule\_\-rate\_\-numerator}, \/  ogg\_\-int64\_\-t {\em granule\_\-rate\_\-denominator})}\label{oggz__deprecated_8h_12f232bca448853e66a1226ddccff7e0}
+\subsubsection[{oggz\_\-set\_\-metric\_\-linear}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-set\_\-metric\_\-linear ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno}, \/  ogg\_\-int64\_\-t {\em granule\_\-rate\_\-numerator}, \/  ogg\_\-int64\_\-t {\em granule\_\-rate\_\-denominator})}\label{oggz__deprecated_8h_a12f232bca448853e66a1226ddccff7e0}
+
 
+DEPRECATED FUNCTION This function has been replaced with the more clearly named \doxyref{oggz\_\-set\_\-granulerate()}{p.}{group__metric_gaa2a86ec590161bc2295a2c8e91cefa49}. 
 
-DEPRECATED FUNCTION This function has been replaced with the more clearly named \doxyref{oggz\_\-set\_\-granulerate()}{p.}{group__metric_ga2a86ec590161bc2295a2c8e91cefa49}. 
+Specify that a logical bitstream has a linear metric 
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]Identify the logical bitstream in {\itshape oggz\/} to attach this linear metric to. A value of -\/1 indicates that the metric should be attached to all unattached logical bitstreams in {\itshape oggz\/}. \item[{\em granule\_\-rate\_\-numerator}]The numerator of the granule rate \item[{\em granule\_\-rate\_\-denominator}]The denominator of the granule rate \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+0 Success 
+\end{DoxyReturn}
 
-Specify that a logical bitstream has a linear metric \begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]Identify the logical bitstream in {\em oggz\/} to attach this linear metric to. A value of -1 indicates that the metric should be attached to all unattached logical bitstreams in {\em oggz\/}. \item[{\em granule\_\-rate\_\-numerator}]The numerator of the granule rate \item[{\em granule\_\-rate\_\-denominator}]The denominator of the granule rate \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]0 Success \end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\em serialno\/} does not identify an existing logical bitstream in {\em oggz\/}. \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \end{description}
-\end{Desc}
+\begin{DoxyRetVals}{Return values}
+\item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\itshape serialno\/} does not identify an existing logical bitstream in {\itshape oggz\/}. \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \end{DoxyRetVals}
diff -Nru liboggz-1.1.0/doc/liboggz/latex/oggz__io_8h.tex liboggz-1.1.1/doc/liboggz/latex/oggz__io_8h.tex
--- liboggz-1.1.0/doc/liboggz/latex/oggz__io_8h.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/oggz__io_8h.tex	2010-04-24 00:13:55.000000000 +0000
@@ -2,304 +2,263 @@
 \label{oggz__io_8h}\index{oggz\_\-io.h@{oggz\_\-io.h}}
 
 
-\subsection{Detailed Description}
-Overriding the functions used for input and output of raw data. 
-
-OggzIO provides a way of overriding the functions Oggz uses to access its raw input or output data. This is required in many situations where the raw stream cannot be accessed via stdio, but can be accessed by other means. This is typically useful within media frameworks, where accessing and moving around in the data is possible only using methods provided by the framework.
-
-The functions you provide for overriding IO will be used by Oggz whenever you call \doxyref{oggz\_\-read()}{p.}{group__read__api_g3ce7a31de5da56375057436c6b5108f2} or \doxyref{oggz\_\-write()}{p.}{group__write__api_g3c97d94ea425d64546adf9c368b71904}. They will also be used repeatedly by Oggz when you call \doxyref{oggz\_\-seek()}{p.}{group__seek__api_geef4b261d443701207954e5a636d6817}.
-
-\begin{Desc}
-\item[Note:]Opening a file with \doxyref{oggz\_\-open()}{p.}{oggz_8h_65197cdd03f755f7ebfabf2fdff4c7db} or \doxyref{oggz\_\-open\_\-stdio()}{p.}{oggz_8h_c49e9de0bc4ef1d91b43b13605f98b19} is equivalent to calling \doxyref{oggz\_\-new()}{p.}{oggz_8h_6eb34d123389ae38d993601f9e7bb9d6} and setting stdio based functions for data IO. \end{Desc}
+Overriding the functions used for input and output of raw data.  
 
 
 \subsection*{Typedefs}
-\begin{CompactItemize}
+\begin{DoxyCompactItemize}
 \item 
 typedef size\_\-t($\ast$ {\bf OggzIORead} )(void $\ast$user\_\-handle, void $\ast$buf, size\_\-t n)
-\begin{CompactList}\small\item\em This is the signature of a function which you provide for Oggz to call when it needs to acquire raw input data. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em This is the signature of a function which you provide for Oggz to call when it needs to acquire raw input data. \item\end{DoxyCompactList}\item 
 typedef size\_\-t($\ast$ {\bf OggzIOWrite} )(void $\ast$user\_\-handle, void $\ast$buf, size\_\-t n)
-\begin{CompactList}\small\item\em This is the signature of a function which you provide for Oggz to call when it needs to output raw data. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em This is the signature of a function which you provide for Oggz to call when it needs to output raw data. \item\end{DoxyCompactList}\item 
 typedef int($\ast$ {\bf OggzIOSeek} )(void $\ast$user\_\-handle, long offset, int whence)
-\begin{CompactList}\small\item\em This is the signature of a function which you provide for Oggz to call when it needs to seek on the raw input or output data. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em This is the signature of a function which you provide for Oggz to call when it needs to seek on the raw input or output data. \item\end{DoxyCompactList}\item 
 typedef long($\ast$ {\bf OggzIOTell} )(void $\ast$user\_\-handle)
-\begin{CompactList}\small\item\em This is the signature of a function which you provide for Oggz to call when it needs to determine the current offset of the raw input or output data. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em This is the signature of a function which you provide for Oggz to call when it needs to determine the current offset of the raw input or output data. \item\end{DoxyCompactList}\item 
 typedef int($\ast$ {\bf OggzIOFlush} )(void $\ast$user\_\-handle)
-\begin{CompactList}\small\item\em This is the signature of a function which you provide for Oggz to call when it needs to flush the output data. \item\end{CompactList}\end{CompactItemize}
+\begin{DoxyCompactList}\small\item\em This is the signature of a function which you provide for Oggz to call when it needs to flush the output data. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
 \subsection*{Functions}
-\begin{CompactItemize}
+\begin{DoxyCompactItemize}
 \item 
 int {\bf oggz\_\-io\_\-set\_\-read} ({\bf OGGZ} $\ast$oggz, {\bf OggzIORead} read, void $\ast$user\_\-handle)
-\begin{CompactList}\small\item\em Set a function for Oggz to call when it needs to read input data. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Set a function for Oggz to call when it needs to read input data. \item\end{DoxyCompactList}\item 
 void $\ast$ {\bf oggz\_\-io\_\-get\_\-read\_\-user\_\-handle} ({\bf OGGZ} $\ast$oggz)
-\begin{CompactList}\small\item\em Retrieve the user\_\-handle associated with the function you have provided for reading input data. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Retrieve the user\_\-handle associated with the function you have provided for reading input data. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-io\_\-set\_\-write} ({\bf OGGZ} $\ast$oggz, {\bf OggzIOWrite} write, void $\ast$user\_\-handle)
-\begin{CompactList}\small\item\em Set a function for Oggz to call when it needs to write output data. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Set a function for Oggz to call when it needs to write output data. \item\end{DoxyCompactList}\item 
 void $\ast$ {\bf oggz\_\-io\_\-get\_\-write\_\-user\_\-handle} ({\bf OGGZ} $\ast$oggz)
-\begin{CompactList}\small\item\em Retrieve the user\_\-handle associated with the function you have provided for writing output data. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Retrieve the user\_\-handle associated with the function you have provided for writing output data. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-io\_\-set\_\-seek} ({\bf OGGZ} $\ast$oggz, {\bf OggzIOSeek} seek, void $\ast$user\_\-handle)
-\begin{CompactList}\small\item\em Set a function for Oggz to call when it needs to seek on its raw data. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Set a function for Oggz to call when it needs to seek on its raw data. \item\end{DoxyCompactList}\item 
 void $\ast$ {\bf oggz\_\-io\_\-get\_\-seek\_\-user\_\-handle} ({\bf OGGZ} $\ast$oggz)
-\begin{CompactList}\small\item\em Retrieve the user\_\-handle associated with the function you have provided for seeking on input or output data. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Retrieve the user\_\-handle associated with the function you have provided for seeking on input or output data. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-io\_\-set\_\-tell} ({\bf OGGZ} $\ast$oggz, {\bf OggzIOTell} tell, void $\ast$user\_\-handle)
-\begin{CompactList}\small\item\em Set a function for Oggz to call when it needs to determine the offset within its input data (if OGGZ\_\-READ) or output data (if OGGZ\_\-WRITE). \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Set a function for Oggz to call when it needs to determine the offset within its input data (if OGGZ\_\-READ) or output data (if OGGZ\_\-WRITE). \item\end{DoxyCompactList}\item 
 void $\ast$ {\bf oggz\_\-io\_\-get\_\-tell\_\-user\_\-handle} ({\bf OGGZ} $\ast$oggz)
-\begin{CompactList}\small\item\em Retrieve the user\_\-handle associated with the function you have provided for determining the current offset in input or output data. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Retrieve the user\_\-handle associated with the function you have provided for determining the current offset in input or output data. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-io\_\-set\_\-flush} ({\bf OGGZ} $\ast$oggz, {\bf OggzIOFlush} flush, void $\ast$user\_\-handle)
-\begin{CompactList}\small\item\em Set a function for Oggz to call when it needs to flush its output. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Set a function for Oggz to call when it needs to flush its output. \item\end{DoxyCompactList}\item 
 void $\ast$ {\bf oggz\_\-io\_\-get\_\-flush\_\-user\_\-handle} ({\bf OGGZ} $\ast$oggz)
-\begin{CompactList}\small\item\em Retrieve the user\_\-handle associated with the function you have provided for flushing output. \item\end{CompactList}\end{CompactItemize}
+\begin{DoxyCompactList}\small\item\em Retrieve the user\_\-handle associated with the function you have provided for flushing output. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
+
+
+\subsection{Detailed Description}
+Overriding the functions used for input and output of raw data. OggzIO provides a way of overriding the functions Oggz uses to access its raw input or output data. This is required in many situations where the raw stream cannot be accessed via stdio, but can be accessed by other means. This is typically useful within media frameworks, where accessing and moving around in the data is possible only using methods provided by the framework.
+
+The functions you provide for overriding IO will be used by Oggz whenever you call \doxyref{oggz\_\-read()}{p.}{group__read__api_ga3ce7a31de5da56375057436c6b5108f2} or \doxyref{oggz\_\-write()}{p.}{group__write__api_ga3c97d94ea425d64546adf9c368b71904}. They will also be used repeatedly by Oggz when you call \doxyref{oggz\_\-seek()}{p.}{group__seek__api_gaeef4b261d443701207954e5a636d6817}.
+
+\begin{DoxyNote}{Note}
+Opening a file with \doxyref{oggz\_\-open()}{p.}{oggz_8h_a65197cdd03f755f7ebfabf2fdff4c7db} or \doxyref{oggz\_\-open\_\-stdio()}{p.}{oggz_8h_ac49e9de0bc4ef1d91b43b13605f98b19} is equivalent to calling \doxyref{oggz\_\-new()}{p.}{oggz_8h_a6eb34d123389ae38d993601f9e7bb9d6} and setting stdio based functions for data IO. 
+\end{DoxyNote}
 
 
 \subsection{Typedef Documentation}
 \index{oggz\_\-io.h@{oggz\_\-io.h}!OggzIOFlush@{OggzIOFlush}}
 \index{OggzIOFlush@{OggzIOFlush}!oggz_io.h@{oggz\_\-io.h}}
-\subsubsection[OggzIOFlush]{\setlength{\rightskip}{0pt plus 5cm}typedef int($\ast$ {\bf OggzIOFlush})(void $\ast$user\_\-handle)}\label{oggz__io_8h_2d41d748db3b60bb25f716bcebf2f1e3}
+\subsubsection[{OggzIOFlush}]{\setlength{\rightskip}{0pt plus 5cm}typedef int($\ast$ {\bf OggzIOFlush})(void $\ast$user\_\-handle)}\label{oggz__io_8h_a2d41d748db3b60bb25f716bcebf2f1e3}
 
 
 This is the signature of a function which you provide for Oggz to call when it needs to flush the output data. 
 
 The behaviour of this function is similar to that of fflush() in stdio.
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em user\_\-handle}]A generic pointer you have provided earlier \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em 0}]Success \item[{\em $<$  0}]An error condition \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em user\_\-handle}]A generic pointer you have provided earlier \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em 0}]Success \item[{\em $<$  0}]An error condition \end{DoxyRetVals}
 \index{oggz\_\-io.h@{oggz\_\-io.h}!OggzIORead@{OggzIORead}}
 \index{OggzIORead@{OggzIORead}!oggz_io.h@{oggz\_\-io.h}}
-\subsubsection[OggzIORead]{\setlength{\rightskip}{0pt plus 5cm}typedef size\_\-t($\ast$ {\bf OggzIORead})(void $\ast$user\_\-handle, void $\ast$buf, size\_\-t n)}\label{oggz__io_8h_e4995dabd7027c5a2273fe6db94c4733}
+\subsubsection[{OggzIORead}]{\setlength{\rightskip}{0pt plus 5cm}typedef size\_\-t($\ast$ {\bf OggzIORead})(void $\ast$user\_\-handle, void $\ast$buf, size\_\-t n)}\label{oggz__io_8h_ae4995dabd7027c5a2273fe6db94c4733}
 
 
 This is the signature of a function which you provide for Oggz to call when it needs to acquire raw input data. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em user\_\-handle}]A generic pointer you have provided earlier \item[{\em n}]The length in bytes that Oggz wants to read \item[{\em buf}]The buffer that you read data into \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em $>$  0}]The number of bytes successfully read into the buffer \item[{\em 0}]to indicate that there is no more data to read (End of file) \item[{\em $<$  0}]An error condition \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em user\_\-handle}]A generic pointer you have provided earlier \item[{\em n}]The length in bytes that Oggz wants to read \item[{\em buf}]The buffer that you read data into \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em $>$  0}]The number of bytes successfully read into the buffer \item[{\em 0}]to indicate that there is no more data to read (End of file) \item[{\em $<$  0}]An error condition \end{DoxyRetVals}
 \index{oggz\_\-io.h@{oggz\_\-io.h}!OggzIOSeek@{OggzIOSeek}}
 \index{OggzIOSeek@{OggzIOSeek}!oggz_io.h@{oggz\_\-io.h}}
-\subsubsection[OggzIOSeek]{\setlength{\rightskip}{0pt plus 5cm}typedef int($\ast$ {\bf OggzIOSeek})(void $\ast$user\_\-handle, long offset, int whence)}\label{oggz__io_8h_b92c1e4e1bc98165cb7e9a0920a09b75}
+\subsubsection[{OggzIOSeek}]{\setlength{\rightskip}{0pt plus 5cm}typedef int($\ast$ {\bf OggzIOSeek})(void $\ast$user\_\-handle, long offset, int whence)}\label{oggz__io_8h_ab92c1e4e1bc98165cb7e9a0920a09b75}
 
 
 This is the signature of a function which you provide for Oggz to call when it needs to seek on the raw input or output data. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em user\_\-handle}]A generic pointer you have provided earlier \item[{\em offset}]The offset in bytes to seek to \item[{\em whence}]SEEK\_\-SET, SEEK\_\-CUR or SEEK\_\-END (as for stdio.h) \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em $>$= 0}]The offset seeked to \item[{\em $<$  0}]An error condition\end{description}
-\end{Desc}
-\begin{Desc}
-\item[Note:]If you provide an OggzIOSeek function, you MUST also provide an OggzIOTell function, or else all your seeks will fail. \end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em user\_\-handle}]A generic pointer you have provided earlier \item[{\em offset}]The offset in bytes to seek to \item[{\em whence}]SEEK\_\-SET, SEEK\_\-CUR or SEEK\_\-END (as for stdio.h) \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em $>$= 0}]The offset seeked to \item[{\em $<$  0}]An error condition\end{DoxyRetVals}
+\begin{DoxyNote}{Note}
+If you provide an OggzIOSeek function, you MUST also provide an OggzIOTell function, or else all your seeks will fail. 
+\end{DoxyNote}
 \index{oggz\_\-io.h@{oggz\_\-io.h}!OggzIOTell@{OggzIOTell}}
 \index{OggzIOTell@{OggzIOTell}!oggz_io.h@{oggz\_\-io.h}}
-\subsubsection[OggzIOTell]{\setlength{\rightskip}{0pt plus 5cm}typedef long($\ast$ {\bf OggzIOTell})(void $\ast$user\_\-handle)}\label{oggz__io_8h_dac7e4773781ad067f0591e1699fd669}
+\subsubsection[{OggzIOTell}]{\setlength{\rightskip}{0pt plus 5cm}typedef long($\ast$ {\bf OggzIOTell})(void $\ast$user\_\-handle)}\label{oggz__io_8h_adac7e4773781ad067f0591e1699fd669}
 
 
 This is the signature of a function which you provide for Oggz to call when it needs to determine the current offset of the raw input or output data. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em user\_\-handle}]A generic pointer you have provided earlier \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em $>$= 0}]The offset \item[{\em $<$  0}]An error condition \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em user\_\-handle}]A generic pointer you have provided earlier \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em $>$= 0}]The offset \item[{\em $<$  0}]An error condition \end{DoxyRetVals}
 \index{oggz\_\-io.h@{oggz\_\-io.h}!OggzIOWrite@{OggzIOWrite}}
 \index{OggzIOWrite@{OggzIOWrite}!oggz_io.h@{oggz\_\-io.h}}
-\subsubsection[OggzIOWrite]{\setlength{\rightskip}{0pt plus 5cm}typedef size\_\-t($\ast$ {\bf OggzIOWrite})(void $\ast$user\_\-handle, void $\ast$buf, size\_\-t n)}\label{oggz__io_8h_0274a389b81ba93dae32d3d2fe39637f}
+\subsubsection[{OggzIOWrite}]{\setlength{\rightskip}{0pt plus 5cm}typedef size\_\-t($\ast$ {\bf OggzIOWrite})(void $\ast$user\_\-handle, void $\ast$buf, size\_\-t n)}\label{oggz__io_8h_a0274a389b81ba93dae32d3d2fe39637f}
 
 
 This is the signature of a function which you provide for Oggz to call when it needs to output raw data. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em user\_\-handle}]A generic pointer you have provided earlier \item[{\em n}]The length in bytes of the data \item[{\em buf}]A buffer containing data to write \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em $>$= 0}]The number of bytes successfully written (may be less than {\em n\/} if a write error has occurred) \item[{\em $<$  0}]An error condition \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em user\_\-handle}]A generic pointer you have provided earlier \item[{\em n}]The length in bytes of the data \item[{\em buf}]A buffer containing data to write \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em $>$= 0}]The number of bytes successfully written (may be less than {\itshape n\/} if a write error has occurred) \item[{\em $<$  0}]An error condition \end{DoxyRetVals}
 
 
 \subsection{Function Documentation}
 \index{oggz\_\-io.h@{oggz\_\-io.h}!oggz\_\-io\_\-get\_\-flush\_\-user\_\-handle@{oggz\_\-io\_\-get\_\-flush\_\-user\_\-handle}}
 \index{oggz\_\-io\_\-get\_\-flush\_\-user\_\-handle@{oggz\_\-io\_\-get\_\-flush\_\-user\_\-handle}!oggz_io.h@{oggz\_\-io.h}}
-\subsubsection[oggz\_\-io\_\-get\_\-flush\_\-user\_\-handle]{\setlength{\rightskip}{0pt plus 5cm}void$\ast$ oggz\_\-io\_\-get\_\-flush\_\-user\_\-handle ({\bf OGGZ} $\ast$ {\em oggz})}\label{oggz__io_8h_6150bee0cc28c68553bdcc6d020f6932}
+\subsubsection[{oggz\_\-io\_\-get\_\-flush\_\-user\_\-handle}]{\setlength{\rightskip}{0pt plus 5cm}void$\ast$ oggz\_\-io\_\-get\_\-flush\_\-user\_\-handle ({\bf OGGZ} $\ast$ {\em oggz})}\label{oggz__io_8h_a6150bee0cc28c68553bdcc6d020f6932}
 
 
 Retrieve the user\_\-handle associated with the function you have provided for flushing output. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]the associated user\_\-handle \end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+the associated user\_\-handle 
+\end{DoxyReturn}
 \index{oggz\_\-io.h@{oggz\_\-io.h}!oggz\_\-io\_\-get\_\-read\_\-user\_\-handle@{oggz\_\-io\_\-get\_\-read\_\-user\_\-handle}}
 \index{oggz\_\-io\_\-get\_\-read\_\-user\_\-handle@{oggz\_\-io\_\-get\_\-read\_\-user\_\-handle}!oggz_io.h@{oggz\_\-io.h}}
-\subsubsection[oggz\_\-io\_\-get\_\-read\_\-user\_\-handle]{\setlength{\rightskip}{0pt plus 5cm}void$\ast$ oggz\_\-io\_\-get\_\-read\_\-user\_\-handle ({\bf OGGZ} $\ast$ {\em oggz})}\label{oggz__io_8h_f5bbd37e9a390e3c282fdc8bfadc43f6}
+\subsubsection[{oggz\_\-io\_\-get\_\-read\_\-user\_\-handle}]{\setlength{\rightskip}{0pt plus 5cm}void$\ast$ oggz\_\-io\_\-get\_\-read\_\-user\_\-handle ({\bf OGGZ} $\ast$ {\em oggz})}\label{oggz__io_8h_af5bbd37e9a390e3c282fdc8bfadc43f6}
 
 
 Retrieve the user\_\-handle associated with the function you have provided for reading input data. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]the associated user\_\-handle \end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+the associated user\_\-handle 
+\end{DoxyReturn}
 \index{oggz\_\-io.h@{oggz\_\-io.h}!oggz\_\-io\_\-get\_\-seek\_\-user\_\-handle@{oggz\_\-io\_\-get\_\-seek\_\-user\_\-handle}}
 \index{oggz\_\-io\_\-get\_\-seek\_\-user\_\-handle@{oggz\_\-io\_\-get\_\-seek\_\-user\_\-handle}!oggz_io.h@{oggz\_\-io.h}}
-\subsubsection[oggz\_\-io\_\-get\_\-seek\_\-user\_\-handle]{\setlength{\rightskip}{0pt plus 5cm}void$\ast$ oggz\_\-io\_\-get\_\-seek\_\-user\_\-handle ({\bf OGGZ} $\ast$ {\em oggz})}\label{oggz__io_8h_718ea817110f0d94d9d6f3a457707a08}
+\subsubsection[{oggz\_\-io\_\-get\_\-seek\_\-user\_\-handle}]{\setlength{\rightskip}{0pt plus 5cm}void$\ast$ oggz\_\-io\_\-get\_\-seek\_\-user\_\-handle ({\bf OGGZ} $\ast$ {\em oggz})}\label{oggz__io_8h_a718ea817110f0d94d9d6f3a457707a08}
 
 
 Retrieve the user\_\-handle associated with the function you have provided for seeking on input or output data. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]the associated user\_\-handle \end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+the associated user\_\-handle 
+\end{DoxyReturn}
 \index{oggz\_\-io.h@{oggz\_\-io.h}!oggz\_\-io\_\-get\_\-tell\_\-user\_\-handle@{oggz\_\-io\_\-get\_\-tell\_\-user\_\-handle}}
 \index{oggz\_\-io\_\-get\_\-tell\_\-user\_\-handle@{oggz\_\-io\_\-get\_\-tell\_\-user\_\-handle}!oggz_io.h@{oggz\_\-io.h}}
-\subsubsection[oggz\_\-io\_\-get\_\-tell\_\-user\_\-handle]{\setlength{\rightskip}{0pt plus 5cm}void$\ast$ oggz\_\-io\_\-get\_\-tell\_\-user\_\-handle ({\bf OGGZ} $\ast$ {\em oggz})}\label{oggz__io_8h_54b69e5159280c1224025df925e67b50}
+\subsubsection[{oggz\_\-io\_\-get\_\-tell\_\-user\_\-handle}]{\setlength{\rightskip}{0pt plus 5cm}void$\ast$ oggz\_\-io\_\-get\_\-tell\_\-user\_\-handle ({\bf OGGZ} $\ast$ {\em oggz})}\label{oggz__io_8h_a54b69e5159280c1224025df925e67b50}
 
 
 Retrieve the user\_\-handle associated with the function you have provided for determining the current offset in input or output data. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]the associated user\_\-handle \end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+the associated user\_\-handle 
+\end{DoxyReturn}
 \index{oggz\_\-io.h@{oggz\_\-io.h}!oggz\_\-io\_\-get\_\-write\_\-user\_\-handle@{oggz\_\-io\_\-get\_\-write\_\-user\_\-handle}}
 \index{oggz\_\-io\_\-get\_\-write\_\-user\_\-handle@{oggz\_\-io\_\-get\_\-write\_\-user\_\-handle}!oggz_io.h@{oggz\_\-io.h}}
-\subsubsection[oggz\_\-io\_\-get\_\-write\_\-user\_\-handle]{\setlength{\rightskip}{0pt plus 5cm}void$\ast$ oggz\_\-io\_\-get\_\-write\_\-user\_\-handle ({\bf OGGZ} $\ast$ {\em oggz})}\label{oggz__io_8h_024a62f080f1b64c465b0bf475ebfd2e}
+\subsubsection[{oggz\_\-io\_\-get\_\-write\_\-user\_\-handle}]{\setlength{\rightskip}{0pt plus 5cm}void$\ast$ oggz\_\-io\_\-get\_\-write\_\-user\_\-handle ({\bf OGGZ} $\ast$ {\em oggz})}\label{oggz__io_8h_a024a62f080f1b64c465b0bf475ebfd2e}
 
 
 Retrieve the user\_\-handle associated with the function you have provided for writing output data. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]the associated user\_\-handle \end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+the associated user\_\-handle 
+\end{DoxyReturn}
 \index{oggz\_\-io.h@{oggz\_\-io.h}!oggz\_\-io\_\-set\_\-flush@{oggz\_\-io\_\-set\_\-flush}}
 \index{oggz\_\-io\_\-set\_\-flush@{oggz\_\-io\_\-set\_\-flush}!oggz_io.h@{oggz\_\-io.h}}
-\subsubsection[oggz\_\-io\_\-set\_\-flush]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-io\_\-set\_\-flush ({\bf OGGZ} $\ast$ {\em oggz}, \/  {\bf OggzIOFlush} {\em flush}, \/  void $\ast$ {\em user\_\-handle})}\label{oggz__io_8h_f45a2d33c7e17d1b64f794b32d69e7da}
+\subsubsection[{oggz\_\-io\_\-set\_\-flush}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-io\_\-set\_\-flush ({\bf OGGZ} $\ast$ {\em oggz}, \/  {\bf OggzIOFlush} {\em flush}, \/  void $\ast$ {\em user\_\-handle})}\label{oggz__io_8h_af45a2d33c7e17d1b64f794b32d69e7da}
 
 
 Set a function for Oggz to call when it needs to flush its output. 
 
 The meaning of this is similar to that of fflush() in stdio.
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \item[{\em flush}]Your flushing function \item[{\em user\_\-handle}]Any arbitrary data you wish to pass to the function \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ; {\em oggz\/} not open for writing. \item[{\em OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY}]Out of memory \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \item[{\em flush}]Your flushing function \item[{\em user\_\-handle}]Any arbitrary data you wish to pass to the function \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ; {\itshape oggz\/} not open for writing. \item[{\em OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY}]Out of memory \end{DoxyRetVals}
 \index{oggz\_\-io.h@{oggz\_\-io.h}!oggz\_\-io\_\-set\_\-read@{oggz\_\-io\_\-set\_\-read}}
 \index{oggz\_\-io\_\-set\_\-read@{oggz\_\-io\_\-set\_\-read}!oggz_io.h@{oggz\_\-io.h}}
-\subsubsection[oggz\_\-io\_\-set\_\-read]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-io\_\-set\_\-read ({\bf OGGZ} $\ast$ {\em oggz}, \/  {\bf OggzIORead} {\em read}, \/  void $\ast$ {\em user\_\-handle})}\label{oggz__io_8h_640ecb60fcee9323f1f735ad23f7abc4}
+\subsubsection[{oggz\_\-io\_\-set\_\-read}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-io\_\-set\_\-read ({\bf OGGZ} $\ast$ {\em oggz}, \/  {\bf OggzIORead} {\em read}, \/  void $\ast$ {\em user\_\-handle})}\label{oggz__io_8h_a640ecb60fcee9323f1f735ad23f7abc4}
 
 
 Set a function for Oggz to call when it needs to read input data. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \item[{\em read}]Your reading function \item[{\em user\_\-handle}]Any arbitrary data you wish to pass to the function \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ; {\em oggz\/} not open for reading. \item[{\em OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY}]Out of memory \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \item[{\em read}]Your reading function \item[{\em user\_\-handle}]Any arbitrary data you wish to pass to the function \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ; {\itshape oggz\/} not open for reading. \item[{\em OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY}]Out of memory \end{DoxyRetVals}
 \index{oggz\_\-io.h@{oggz\_\-io.h}!oggz\_\-io\_\-set\_\-seek@{oggz\_\-io\_\-set\_\-seek}}
 \index{oggz\_\-io\_\-set\_\-seek@{oggz\_\-io\_\-set\_\-seek}!oggz_io.h@{oggz\_\-io.h}}
-\subsubsection[oggz\_\-io\_\-set\_\-seek]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-io\_\-set\_\-seek ({\bf OGGZ} $\ast$ {\em oggz}, \/  {\bf OggzIOSeek} {\em seek}, \/  void $\ast$ {\em user\_\-handle})}\label{oggz__io_8h_8482fb0783df2621e811c14d642b01fc}
+\subsubsection[{oggz\_\-io\_\-set\_\-seek}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-io\_\-set\_\-seek ({\bf OGGZ} $\ast$ {\em oggz}, \/  {\bf OggzIOSeek} {\em seek}, \/  void $\ast$ {\em user\_\-handle})}\label{oggz__io_8h_a8482fb0783df2621e811c14d642b01fc}
 
 
 Set a function for Oggz to call when it needs to seek on its raw data. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \item[{\em seek}]Your seeking function \item[{\em user\_\-handle}]Any arbitrary data you wish to pass to the function \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY}]Out of memory\end{description}
-\end{Desc}
-\begin{Desc}
-\item[Note:]If you provide an OggzIOSeek function, you MUST also provide an OggzIOTell function, or else all your seeks will fail. \end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \item[{\em seek}]Your seeking function \item[{\em user\_\-handle}]Any arbitrary data you wish to pass to the function \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY}]Out of memory\end{DoxyRetVals}
+\begin{DoxyNote}{Note}
+If you provide an OggzIOSeek function, you MUST also provide an OggzIOTell function, or else all your seeks will fail. 
+\end{DoxyNote}
 \index{oggz\_\-io.h@{oggz\_\-io.h}!oggz\_\-io\_\-set\_\-tell@{oggz\_\-io\_\-set\_\-tell}}
 \index{oggz\_\-io\_\-set\_\-tell@{oggz\_\-io\_\-set\_\-tell}!oggz_io.h@{oggz\_\-io.h}}
-\subsubsection[oggz\_\-io\_\-set\_\-tell]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-io\_\-set\_\-tell ({\bf OGGZ} $\ast$ {\em oggz}, \/  {\bf OggzIOTell} {\em tell}, \/  void $\ast$ {\em user\_\-handle})}\label{oggz__io_8h_d97da84267d72ab9abf8dbb9ff5e8931}
+\subsubsection[{oggz\_\-io\_\-set\_\-tell}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-io\_\-set\_\-tell ({\bf OGGZ} $\ast$ {\em oggz}, \/  {\bf OggzIOTell} {\em tell}, \/  void $\ast$ {\em user\_\-handle})}\label{oggz__io_8h_ad97da84267d72ab9abf8dbb9ff5e8931}
 
 
 Set a function for Oggz to call when it needs to determine the offset within its input data (if OGGZ\_\-READ) or output data (if OGGZ\_\-WRITE). 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \item[{\em tell}]Your tell function \item[{\em user\_\-handle}]Any arbitrary data you wish to pass to the function \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY}]Out of memory \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \item[{\em tell}]Your tell function \item[{\em user\_\-handle}]Any arbitrary data you wish to pass to the function \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \item[{\em OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY}]Out of memory \end{DoxyRetVals}
 \index{oggz\_\-io.h@{oggz\_\-io.h}!oggz\_\-io\_\-set\_\-write@{oggz\_\-io\_\-set\_\-write}}
 \index{oggz\_\-io\_\-set\_\-write@{oggz\_\-io\_\-set\_\-write}!oggz_io.h@{oggz\_\-io.h}}
-\subsubsection[oggz\_\-io\_\-set\_\-write]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-io\_\-set\_\-write ({\bf OGGZ} $\ast$ {\em oggz}, \/  {\bf OggzIOWrite} {\em write}, \/  void $\ast$ {\em user\_\-handle})}\label{oggz__io_8h_f92f5b20bb5f247b5302dfc8b4edfbee}
+\subsubsection[{oggz\_\-io\_\-set\_\-write}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-io\_\-set\_\-write ({\bf OGGZ} $\ast$ {\em oggz}, \/  {\bf OggzIOWrite} {\em write}, \/  void $\ast$ {\em user\_\-handle})}\label{oggz__io_8h_af92f5b20bb5f247b5302dfc8b4edfbee}
 
 
 Set a function for Oggz to call when it needs to write output data. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \item[{\em write}]Your writing function \item[{\em user\_\-handle}]Any arbitrary data you wish to pass to the function \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ; {\em oggz\/} not open for writing. \item[{\em OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY}]Out of memory \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \item[{\em write}]Your writing function \item[{\em user\_\-handle}]Any arbitrary data you wish to pass to the function \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ; {\itshape oggz\/} not open for writing. \item[{\em OGGZ\_\-ERR\_\-OUT\_\-OF\_\-MEMORY}]Out of memory \end{DoxyRetVals}
diff -Nru liboggz-1.1.0/doc/liboggz/latex/oggz__off__t_8h.tex liboggz-1.1.1/doc/liboggz/latex/oggz__off__t_8h.tex
--- liboggz-1.1.0/doc/liboggz/latex/oggz__off__t_8h.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/oggz__off__t_8h.tex	2010-04-24 00:13:55.000000000 +0000
@@ -2,9 +2,11 @@
 \label{oggz__off__t_8h}\index{oggz\_\-off\_\-t.h@{oggz\_\-off\_\-t.h}}
 
 
-\subsection{Detailed Description}
-Architecture-dependent type and printf format for file position. 
+Architecture-\/dependent type and printf format for file position.  
+
 
-Allows Large File Sizes on systems supporting 64-bit off\_\-t types. 
+{\ttfamily \#include $<$oggz/oggz\_\-off\_\-t\_\-generated.h$>$}\par
 
-{\tt \#include $<$oggz/oggz\_\-off\_\-t\_\-generated.h$>$}\par
+
+\subsection{Detailed Description}
+Architecture-\/dependent type and printf format for file position. Allows Large File Sizes on systems supporting 64-\/bit off\_\-t types. 
\ No newline at end of file
diff -Nru liboggz-1.1.0/doc/liboggz/latex/oggz__packet_8h.tex liboggz-1.1.1/doc/liboggz/latex/oggz__packet_8h.tex
--- liboggz-1.1.0/doc/liboggz/latex/oggz__packet_8h.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/oggz__packet_8h.tex	2010-04-20 12:55:03.000000000 +0000
@@ -2,15 +2,17 @@
 \label{oggz__packet_8h}\index{oggz\_\-packet.h@{oggz\_\-packet.h}}
 
 
-\subsection{Detailed Description}
-Packet positioning. 
+Packet positioning.  
 
-\doxyref{oggz\_\-packet}{p.}{structoggz__packet} derives from ogg\_\-packet, and includes position information. 
 
 \subsection*{Data Structures}
-\begin{CompactItemize}
+\begin{DoxyCompactItemize}
 \item 
 struct {\bf oggz\_\-position}
-\begin{CompactList}\small\item\em The position of an \doxyref{oggz\_\-packet}{p.}{structoggz__packet}. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em The position of an \doxyref{oggz\_\-packet}{p.}{structoggz__packet}. \item\end{DoxyCompactList}\item 
 struct {\bf oggz\_\-packet}
-\begin{CompactList}\small\item\em An ogg\_\-packet and its position in the stream. \item\end{CompactList}\end{CompactItemize}
+\begin{DoxyCompactList}\small\item\em An ogg\_\-packet and its position in the stream. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
+
+
+\subsection{Detailed Description}
+Packet positioning. \doxyref{oggz\_\-packet}{p.}{structoggz__packet} derives from ogg\_\-packet, and includes position information. This positioning information can be copied and used for subsequent calls to \doxyref{oggz\_\-seek\_\-position()}{p.}{group__seek__api_gaaba5386651a013d26adfca8dc5952d67}. 
\ No newline at end of file
diff -Nru liboggz-1.1.0/doc/liboggz/latex/oggz__read_8h.tex liboggz-1.1.1/doc/liboggz/latex/oggz__read_8h.tex
--- liboggz-1.1.0/doc/liboggz/latex/oggz__read_8h.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/oggz__read_8h.tex	2010-04-24 00:13:55.000000000 +0000
@@ -2,108 +2,92 @@
 \label{oggz__read_8h}\index{oggz\_\-read.h@{oggz\_\-read.h}}
 
 
-\subsection{Detailed Description}
-Interfaces for reading Ogg files and streams. 
+Interfaces for reading Ogg files and streams.  
 
 
-
-{\tt \#include $<$oggz/oggz\_\-packet.h$>$}\par
 \subsection*{Typedefs}
-\begin{CompactItemize}
+\begin{DoxyCompactItemize}
 \item 
-typedef int($\ast$ {\bf OggzReadPacket} )({\bf OGGZ} $\ast$oggz, {\bf oggz\_\-packet} $\ast$packet, long serialno, void $\ast$user\_\-data)
-\begin{CompactList}\small\item\em This is the signature of a callback which you must provide for Oggz to call whenever it finds a new packet in the Ogg stream associated with {\em oggz\/}. \item\end{CompactList}\item 
+typedef int($\ast$ {\bf OggzReadPacket} )({\bf OGGZ} $\ast$oggz, ogg\_\-packet $\ast$op, long serialno, void $\ast$user\_\-data)
+\begin{DoxyCompactList}\small\item\em This is the signature of a callback which you must provide for Oggz to call whenever it finds a new packet in the Ogg stream associated with {\itshape oggz\/}. \item\end{DoxyCompactList}\item 
 typedef int($\ast$ {\bf OggzReadPage} )({\bf OGGZ} $\ast$oggz, const ogg\_\-page $\ast$og, long serialno, void $\ast$user\_\-data)
-\begin{CompactList}\small\item\em This is the signature of a callback which you must provide for Oggz to call whenever it finds a new page in the Ogg stream associated with {\em oggz\/}. \item\end{CompactList}\end{CompactItemize}
+\begin{DoxyCompactList}\small\item\em This is the signature of a callback which you must provide for Oggz to call whenever it finds a new page in the Ogg stream associated with {\itshape oggz\/}. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
 \subsection*{Functions}
-\begin{CompactItemize}
+\begin{DoxyCompactItemize}
 \item 
 int {\bf oggz\_\-set\_\-read\_\-callback} ({\bf OGGZ} $\ast$oggz, long serialno, {\bf OggzReadPacket} read\_\-packet, void $\ast$user\_\-data)
-\begin{CompactList}\small\item\em Set a callback for Oggz to call when a new Ogg packet is found in the stream. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Set a callback for Oggz to call when a new Ogg packet is found in the stream. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-set\_\-read\_\-page} ({\bf OGGZ} $\ast$oggz, long serialno, {\bf OggzReadPage} read\_\-page, void $\ast$user\_\-data)
-\begin{CompactList}\small\item\em Set a callback for Oggz to call when a new Ogg page is found in the stream. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Set a callback for Oggz to call when a new Ogg page is found in the stream. \item\end{DoxyCompactList}\item 
 long {\bf oggz\_\-read} ({\bf OGGZ} $\ast$oggz, long n)
-\begin{CompactList}\small\item\em Read n bytes into {\em oggz\/}, calling any read callbacks on the fly. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Read n bytes into {\itshape oggz\/}, calling any read callbacks on the fly. \item\end{DoxyCompactList}\item 
 long {\bf oggz\_\-read\_\-input} ({\bf OGGZ} $\ast$oggz, unsigned char $\ast$buf, long n)
-\begin{CompactList}\small\item\em Input data into {\em oggz\/}. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Input data into {\itshape oggz\/}. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-purge} ({\bf OGGZ} $\ast$oggz)
-\begin{CompactList}\small\item\em Erase any input buffered in Oggz. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Erase any input buffered in Oggz. \item\end{DoxyCompactList}\item 
 {\bf OggzStreamContent} {\bf oggz\_\-stream\_\-get\_\-content} ({\bf OGGZ} $\ast$oggz, long serialno)
-\begin{CompactList}\small\item\em Determine the content type of the oggz stream referred to by {\em serialno\/}. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Determine the content type of the oggz stream referred to by {\itshape serialno\/}. \item\end{DoxyCompactList}\item 
 const char $\ast$ {\bf oggz\_\-stream\_\-get\_\-content\_\-type} ({\bf OGGZ} $\ast$oggz, long serialno)
-\begin{CompactList}\small\item\em Return human-readable string representation of content type of oggz stream referred to by {\em serialno\/}. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Return human-\/readable string representation of content type of oggz stream referred to by {\itshape serialno\/}. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-stream\_\-get\_\-numheaders} ({\bf OGGZ} $\ast$oggz, long serialno)
-\begin{CompactList}\small\item\em Determine the number of headers of the oggz stream referred to by {\em serialno\/}. \item\end{CompactList}\end{CompactItemize}
+\begin{DoxyCompactList}\small\item\em Determine the number of headers of the oggz stream referred to by {\itshape serialno\/}. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
 
 
+\subsection{Detailed Description}
+Interfaces for reading Ogg files and streams. 
+
 \subsection{Function Documentation}
 \index{oggz\_\-read.h@{oggz\_\-read.h}!oggz\_\-purge@{oggz\_\-purge}}
 \index{oggz\_\-purge@{oggz\_\-purge}!oggz_read.h@{oggz\_\-read.h}}
-\subsubsection[oggz\_\-purge]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-purge ({\bf OGGZ} $\ast$ {\em oggz})}\label{oggz__read_8h_df606e6641a7d59eff2030b7b9ce51f8}
+\subsubsection[{oggz\_\-purge}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-purge ({\bf OGGZ} $\ast$ {\em oggz})}\label{oggz__read_8h_adf606e6641a7d59eff2030b7b9ce51f8}
 
 
 Erase any input buffered in Oggz. 
 
 This discards any input read from the underlying IO system but not yet delivered as ogg\_\-packets.
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-SYSTEM}]Error seeking on underlying IO. \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em 0}]Success \item[{\em OGGZ\_\-ERR\_\-SYSTEM}]Error seeking on underlying IO. \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-INVALID}]Operation not suitable for this OGGZ \end{DoxyRetVals}
 \index{oggz\_\-read.h@{oggz\_\-read.h}!oggz\_\-stream\_\-get\_\-content@{oggz\_\-stream\_\-get\_\-content}}
 \index{oggz\_\-stream\_\-get\_\-content@{oggz\_\-stream\_\-get\_\-content}!oggz_read.h@{oggz\_\-read.h}}
-\subsubsection[oggz\_\-stream\_\-get\_\-content]{\setlength{\rightskip}{0pt plus 5cm}{\bf OggzStreamContent} oggz\_\-stream\_\-get\_\-content ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno})}\label{oggz__read_8h_1cd43b28f34bf82dc1830cc517b19e14}
+\subsubsection[{oggz\_\-stream\_\-get\_\-content}]{\setlength{\rightskip}{0pt plus 5cm}{\bf OggzStreamContent} oggz\_\-stream\_\-get\_\-content ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno})}\label{oggz__read_8h_a1cd43b28f34bf82dc1830cc517b19e14}
+
 
+Determine the content type of the oggz stream referred to by {\itshape serialno\/}. 
 
-Determine the content type of the oggz stream referred to by {\em serialno\/}. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]An ogg stream serialno \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em OGGZ\_\-CONTENT\_\-THEORA..OGGZ\_\-CONTENT\_\-UNKNOWN}]content successfully identified \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\em serialno\/} does not refer to an existing stream \end{description}
-\end{Desc}
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]An ogg stream serialno \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em OGGZ\_\-CONTENT\_\-THEORA..OGGZ\_\-CONTENT\_\-UNKNOWN}]content successfully identified \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\itshape serialno\/} does not refer to an existing stream \end{DoxyRetVals}
 \index{oggz\_\-read.h@{oggz\_\-read.h}!oggz\_\-stream\_\-get\_\-content\_\-type@{oggz\_\-stream\_\-get\_\-content\_\-type}}
 \index{oggz\_\-stream\_\-get\_\-content\_\-type@{oggz\_\-stream\_\-get\_\-content\_\-type}!oggz_read.h@{oggz\_\-read.h}}
-\subsubsection[oggz\_\-stream\_\-get\_\-content\_\-type]{\setlength{\rightskip}{0pt plus 5cm}const char$\ast$ oggz\_\-stream\_\-get\_\-content\_\-type ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno})}\label{oggz__read_8h_85665d758dbc159bc48055bf3f572b37}
+\subsubsection[{oggz\_\-stream\_\-get\_\-content\_\-type}]{\setlength{\rightskip}{0pt plus 5cm}const char$\ast$ oggz\_\-stream\_\-get\_\-content\_\-type ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno})}\label{oggz__read_8h_a85665d758dbc159bc48055bf3f572b37}
+
 
+Return human-\/readable string representation of content type of oggz stream referred to by {\itshape serialno\/}. 
 
-Return human-readable string representation of content type of oggz stream referred to by {\em serialno\/}. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]An ogg stream serialno \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em string}]the name of the content type \item[{\em NULL}]{\em oggz\/} or {\em serialno\/} invalid \end{description}
-\end{Desc}
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]An ogg stream serialno \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em string}]the name of the content type \item[{\em NULL}]{\itshape oggz\/} or {\itshape serialno\/} invalid \end{DoxyRetVals}
 \index{oggz\_\-read.h@{oggz\_\-read.h}!oggz\_\-stream\_\-get\_\-numheaders@{oggz\_\-stream\_\-get\_\-numheaders}}
 \index{oggz\_\-stream\_\-get\_\-numheaders@{oggz\_\-stream\_\-get\_\-numheaders}!oggz_read.h@{oggz\_\-read.h}}
-\subsubsection[oggz\_\-stream\_\-get\_\-numheaders]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-stream\_\-get\_\-numheaders ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno})}\label{oggz__read_8h_e3b1aa364b5bf0d7b331aab70646ab10}
+\subsubsection[{oggz\_\-stream\_\-get\_\-numheaders}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-stream\_\-get\_\-numheaders ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno})}\label{oggz__read_8h_ae3b1aa364b5bf0d7b331aab70646ab10}
+
+
+Determine the number of headers of the oggz stream referred to by {\itshape serialno\/}. 
 
 
-Determine the number of headers of the oggz stream referred to by {\em serialno\/}. 
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]An ogg stream serialno \end{DoxyParams}
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]An ogg stream serialno \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em OGGZ\_\-CONTENT\_\-THEORA..OGGZ\_\-CONTENT\_\-UNKNOWN}]content successfully identified \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\em serialno\/} does not refer to an existing stream \end{description}
-\end{Desc}
+\begin{DoxyRetVals}{Return values}
+\item[{\em OGGZ\_\-CONTENT\_\-THEORA..OGGZ\_\-CONTENT\_\-UNKNOWN}]content successfully identified \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\itshape serialno\/} does not refer to an existing stream \end{DoxyRetVals}
diff -Nru liboggz-1.1.0/doc/liboggz/latex/oggz__seek_8h.tex liboggz-1.1.1/doc/liboggz/latex/oggz__seek_8h.tex
--- liboggz-1.1.0/doc/liboggz/latex/oggz__seek_8h.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/oggz__seek_8h.tex	2010-04-24 00:13:55.000000000 +0000
@@ -2,66 +2,64 @@
 \label{oggz__seek_8h}\index{oggz\_\-seek.h@{oggz\_\-seek.h}}
 
 
-\subsection{Detailed Description}
-Seeking within files. 
-
+Seeking within files.  
 
 
 \subsection*{Typedefs}
-\begin{CompactItemize}
+\begin{DoxyCompactItemize}
 \item 
 typedef ogg\_\-int64\_\-t($\ast$ {\bf OggzMetric} )({\bf OGGZ} $\ast$oggz, long serialno, ogg\_\-int64\_\-t granulepos, void $\ast$user\_\-data)
-\begin{CompactList}\small\item\em This is the signature of a function to correlate Ogg streams. \item\end{CompactList}\end{CompactItemize}
+\begin{DoxyCompactList}\small\item\em This is the signature of a function to correlate Ogg streams. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
 \subsection*{Functions}
-\begin{CompactItemize}
+\begin{DoxyCompactItemize}
 \item 
 ogg\_\-int64\_\-t {\bf oggz\_\-tell\_\-units} ({\bf OGGZ} $\ast$oggz)
-\begin{CompactList}\small\item\em Query the current offset in milliseconds, or custom units as specified by a Metric function you have provided. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Query the current offset in milliseconds, or custom units as specified by a Metric function you have provided. \item\end{DoxyCompactList}\item 
 ogg\_\-int64\_\-t {\bf oggz\_\-seek\_\-units} ({\bf OGGZ} $\ast$oggz, ogg\_\-int64\_\-t units, int whence)
-\begin{CompactList}\small\item\em Seek to an offset in milliseconds, or custom units as specified by a Metric function you have provided. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Seek to an offset in milliseconds, or custom units as specified by a Metric function you have provided. \item\end{DoxyCompactList}\item 
 ogg\_\-int64\_\-t {\bf oggz\_\-tell\_\-granulepos} ({\bf OGGZ} $\ast$oggz)
-\begin{CompactList}\small\item\em Provide the exact stored granulepos (from the page header) if relevant to the current packet, or a constructed granulepos if the stored granulepos does not belong to this packet, or -1 if this codec does not have support for granulepos interpolation. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Provide the exact stored granulepos (from the page header) if relevant to the current packet, or a constructed granulepos if the stored granulepos does not belong to this packet, or -\/1 if this codec does not have support for granulepos interpolation. \item\end{DoxyCompactList}\item 
 oggz\_\-off\_\-t {\bf oggz\_\-tell} ({\bf OGGZ} $\ast$oggz)
-\begin{CompactList}\small\item\em Query the file offset in bytes corresponding to the data read. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Query the file offset in bytes corresponding to the data read. \item\end{DoxyCompactList}\item 
 oggz\_\-off\_\-t {\bf oggz\_\-seek} ({\bf OGGZ} $\ast$oggz, oggz\_\-off\_\-t offset, int whence)
-\begin{CompactList}\small\item\em Seek to a specific byte offset. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Seek to a specific byte offset. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-get\_\-preroll} ({\bf OGGZ} $\ast$oggz, long serialno)
-\begin{CompactList}\small\item\em Retrieve the preroll of a logical bitstream. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Retrieve the preroll of a logical bitstream. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-set\_\-preroll} ({\bf OGGZ} $\ast$oggz, long serialno, int preroll)
-\begin{CompactList}\small\item\em Specify the preroll of a logical bitstream. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Specify the preroll of a logical bitstream. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-get\_\-granuleshift} ({\bf OGGZ} $\ast$oggz, long serialno)
-\begin{CompactList}\small\item\em Retrieve the granuleshift of a logical bitstream. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Retrieve the granuleshift of a logical bitstream. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-set\_\-granuleshift} ({\bf OGGZ} $\ast$oggz, long serialno, int granuleshift)
-\begin{CompactList}\small\item\em Specify the granuleshift of a logical bitstream. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Specify the granuleshift of a logical bitstream. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-get\_\-granulerate} ({\bf OGGZ} $\ast$oggz, long serialno, ogg\_\-int64\_\-t $\ast$granulerate\_\-n, ogg\_\-int64\_\-t $\ast$granulerate\_\-d)
-\begin{CompactList}\small\item\em Retrieve the granulerate of a logical bitstream. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Retrieve the granulerate of a logical bitstream. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-set\_\-granulerate} ({\bf OGGZ} $\ast$oggz, long serialno, ogg\_\-int64\_\-t granule\_\-rate\_\-numerator, ogg\_\-int64\_\-t granule\_\-rate\_\-denominator)
-\begin{CompactList}\small\item\em Specify the granulerate of a logical bitstream. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Specify the granulerate of a logical bitstream. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-set\_\-metric} ({\bf OGGZ} $\ast$oggz, long serialno, {\bf OggzMetric} metric, void $\ast$user\_\-data)
-\begin{CompactList}\small\item\em Set the OggzMetric to use for an OGGZ handle. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Set the OggzMetric to use for an OGGZ handle. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-set\_\-data\_\-start} ({\bf OGGZ} $\ast$oggz, oggz\_\-off\_\-t offset)
-\begin{CompactList}\small\item\em Tell Oggz to remember the given offset as the start of data. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Tell Oggz to remember the given offset as the start of data. \item\end{DoxyCompactList}\item 
 ogg\_\-int64\_\-t {\bf oggz\_\-bounded\_\-seek\_\-set} ({\bf OGGZ} $\ast$oggz, ogg\_\-int64\_\-t unit\_\-target, ogg\_\-int64\_\-t offset\_\-begin, ogg\_\-int64\_\-t offset\_\-end)
-\begin{CompactList}\small\item\em Seeks Oggz to time unit\_\-target, but with the bounds of the offset range [offset\_\-begin, offset\_\-end]. \item\end{CompactList}\end{CompactItemize}
+\begin{DoxyCompactList}\small\item\em Seeks Oggz to time unit\_\-target, but with the bounds of the offset range [offset\_\-begin, offset\_\-end]. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
 
 
+\subsection{Detailed Description}
+Seeking within files. 
+
 \subsection{Function Documentation}
 \index{oggz\_\-seek.h@{oggz\_\-seek.h}!oggz\_\-bounded\_\-seek\_\-set@{oggz\_\-bounded\_\-seek\_\-set}}
 \index{oggz\_\-bounded\_\-seek\_\-set@{oggz\_\-bounded\_\-seek\_\-set}!oggz_seek.h@{oggz\_\-seek.h}}
-\subsubsection[oggz\_\-bounded\_\-seek\_\-set]{\setlength{\rightskip}{0pt plus 5cm}ogg\_\-int64\_\-t oggz\_\-bounded\_\-seek\_\-set ({\bf OGGZ} $\ast$ {\em oggz}, \/  ogg\_\-int64\_\-t {\em unit\_\-target}, \/  ogg\_\-int64\_\-t {\em offset\_\-begin}, \/  ogg\_\-int64\_\-t {\em offset\_\-end})}\label{oggz__seek_8h_116cf4ae056573ab69b1161671ff6c59}
+\subsubsection[{oggz\_\-bounded\_\-seek\_\-set}]{\setlength{\rightskip}{0pt plus 5cm}ogg\_\-int64\_\-t oggz\_\-bounded\_\-seek\_\-set ({\bf OGGZ} $\ast$ {\em oggz}, \/  ogg\_\-int64\_\-t {\em unit\_\-target}, \/  ogg\_\-int64\_\-t {\em offset\_\-begin}, \/  ogg\_\-int64\_\-t {\em offset\_\-end})}\label{oggz__seek_8h_a116cf4ae056573ab69b1161671ff6c59}
 
 
 Seeks Oggz to time unit\_\-target, but with the bounds of the offset range [offset\_\-begin, offset\_\-end]. 
 
-This is useful when seeking in network streams where only parts of a media are buffered, and retrieving unbuffered parts is expensive. \begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle previously opened for reading \item[{\em unit\_\-target}]The seek target, in milliseconds, or custom units \item[{\em offset\_\-begin}]Start of offset range to seek inside, in bytes \item[{\em offset\_\-end}]End of offset range to seek inside, in bytes, pass -1 for end of media \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]The new position, in milliseconds or custom units \end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em -1}]on failure (unit\_\-target is not within range) \end{description}
-\end{Desc}
+This is useful when seeking in network streams where only parts of a media are buffered, and retrieving unbuffered parts is expensive. 
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle previously opened for reading \item[{\em unit\_\-target}]The seek target, in milliseconds, or custom units \item[{\em offset\_\-begin}]Start of offset range to seek inside, in bytes \item[{\em offset\_\-end}]End of offset range to seek inside, in bytes, pass -\/1 for end of media \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+The new position, in milliseconds or custom units 
+\end{DoxyReturn}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em -\/1}]on failure (unit\_\-target is not within range) \end{DoxyRetVals}
diff -Nru liboggz-1.1.0/doc/liboggz/latex/oggz__stream_8h.tex liboggz-1.1.1/doc/liboggz/latex/oggz__stream_8h.tex
--- liboggz-1.1.0/doc/liboggz/latex/oggz__stream_8h.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/oggz__stream_8h.tex	2010-04-24 00:13:55.000000000 +0000
@@ -2,71 +2,60 @@
 \label{oggz__stream_8h}\index{oggz\_\-stream.h@{oggz\_\-stream.h}}
 
 
-\subsection{Detailed Description}
-Interfaces for querying Ogg streams. 
-
+Interfaces for querying Ogg streams.  
 
 
 \subsection*{Functions}
-\begin{CompactItemize}
+\begin{DoxyCompactItemize}
 \item 
 {\bf OggzStreamContent} {\bf oggz\_\-stream\_\-get\_\-content} ({\bf OGGZ} $\ast$oggz, long serialno)
-\begin{CompactList}\small\item\em Determine the content type of the oggz stream referred to by {\em serialno\/}. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Determine the content type of the oggz stream referred to by {\itshape serialno\/}. \item\end{DoxyCompactList}\item 
 const char $\ast$ {\bf oggz\_\-stream\_\-get\_\-content\_\-type} ({\bf OGGZ} $\ast$oggz, long serialno)
-\begin{CompactList}\small\item\em Return human-readable string representation of content type of oggz stream referred to by {\em serialno\/}. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Return human-\/readable string representation of content type of oggz stream referred to by {\itshape serialno\/}. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-stream\_\-get\_\-numheaders} ({\bf OGGZ} $\ast$oggz, long serialno)
-\begin{CompactList}\small\item\em Determine the number of headers of the oggz stream referred to by {\em serialno\/}. \item\end{CompactList}\end{CompactItemize}
+\begin{DoxyCompactList}\small\item\em Determine the number of headers of the oggz stream referred to by {\itshape serialno\/}. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
 
 
+\subsection{Detailed Description}
+Interfaces for querying Ogg streams. 
+
 \subsection{Function Documentation}
 \index{oggz\_\-stream.h@{oggz\_\-stream.h}!oggz\_\-stream\_\-get\_\-content@{oggz\_\-stream\_\-get\_\-content}}
 \index{oggz\_\-stream\_\-get\_\-content@{oggz\_\-stream\_\-get\_\-content}!oggz_stream.h@{oggz\_\-stream.h}}
-\subsubsection[oggz\_\-stream\_\-get\_\-content]{\setlength{\rightskip}{0pt plus 5cm}{\bf OggzStreamContent} oggz\_\-stream\_\-get\_\-content ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno})}\label{oggz__stream_8h_1cd43b28f34bf82dc1830cc517b19e14}
+\subsubsection[{oggz\_\-stream\_\-get\_\-content}]{\setlength{\rightskip}{0pt plus 5cm}{\bf OggzStreamContent} oggz\_\-stream\_\-get\_\-content ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno})}\label{oggz__stream_8h_a1cd43b28f34bf82dc1830cc517b19e14}
 
 
-Determine the content type of the oggz stream referred to by {\em serialno\/}. 
+Determine the content type of the oggz stream referred to by {\itshape serialno\/}. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]An ogg stream serialno \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em OGGZ\_\-CONTENT\_\-THEORA..OGGZ\_\-CONTENT\_\-UNKNOWN}]content successfully identified \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\em serialno\/} does not refer to an existing stream \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]An ogg stream serialno \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em OGGZ\_\-CONTENT\_\-THEORA..OGGZ\_\-CONTENT\_\-UNKNOWN}]content successfully identified \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\itshape serialno\/} does not refer to an existing stream \end{DoxyRetVals}
 \index{oggz\_\-stream.h@{oggz\_\-stream.h}!oggz\_\-stream\_\-get\_\-content\_\-type@{oggz\_\-stream\_\-get\_\-content\_\-type}}
 \index{oggz\_\-stream\_\-get\_\-content\_\-type@{oggz\_\-stream\_\-get\_\-content\_\-type}!oggz_stream.h@{oggz\_\-stream.h}}
-\subsubsection[oggz\_\-stream\_\-get\_\-content\_\-type]{\setlength{\rightskip}{0pt plus 5cm}const char$\ast$ oggz\_\-stream\_\-get\_\-content\_\-type ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno})}\label{oggz__stream_8h_85665d758dbc159bc48055bf3f572b37}
+\subsubsection[{oggz\_\-stream\_\-get\_\-content\_\-type}]{\setlength{\rightskip}{0pt plus 5cm}const char$\ast$ oggz\_\-stream\_\-get\_\-content\_\-type ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno})}\label{oggz__stream_8h_a85665d758dbc159bc48055bf3f572b37}
+
 
+Return human-\/readable string representation of content type of oggz stream referred to by {\itshape serialno\/}. 
 
-Return human-readable string representation of content type of oggz stream referred to by {\em serialno\/}. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]An ogg stream serialno \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em string}]the name of the content type \item[{\em NULL}]{\em oggz\/} or {\em serialno\/} invalid \end{description}
-\end{Desc}
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]An ogg stream serialno \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em string}]the name of the content type \item[{\em NULL}]{\itshape oggz\/} or {\itshape serialno\/} invalid \end{DoxyRetVals}
 \index{oggz\_\-stream.h@{oggz\_\-stream.h}!oggz\_\-stream\_\-get\_\-numheaders@{oggz\_\-stream\_\-get\_\-numheaders}}
 \index{oggz\_\-stream\_\-get\_\-numheaders@{oggz\_\-stream\_\-get\_\-numheaders}!oggz_stream.h@{oggz\_\-stream.h}}
-\subsubsection[oggz\_\-stream\_\-get\_\-numheaders]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-stream\_\-get\_\-numheaders ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno})}\label{oggz__stream_8h_e3b1aa364b5bf0d7b331aab70646ab10}
+\subsubsection[{oggz\_\-stream\_\-get\_\-numheaders}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-stream\_\-get\_\-numheaders ({\bf OGGZ} $\ast$ {\em oggz}, \/  long {\em serialno})}\label{oggz__stream_8h_ae3b1aa364b5bf0d7b331aab70646ab10}
+
+
+Determine the number of headers of the oggz stream referred to by {\itshape serialno\/}. 
 
 
-Determine the number of headers of the oggz stream referred to by {\em serialno\/}. 
+\begin{DoxyParams}{Parameters}
+\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]An ogg stream serialno \end{DoxyParams}
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em oggz}]An OGGZ handle \item[{\em serialno}]An ogg stream serialno \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em OGGZ\_\-CONTENT\_\-THEORA..OGGZ\_\-CONTENT\_\-UNKNOWN}]content successfully identified \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\em oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\em serialno\/} does not refer to an existing stream \end{description}
-\end{Desc}
+\begin{DoxyRetVals}{Return values}
+\item[{\em OGGZ\_\-CONTENT\_\-THEORA..OGGZ\_\-CONTENT\_\-UNKNOWN}]content successfully identified \item[{\em OGGZ\_\-ERR\_\-BAD\_\-OGGZ}]{\itshape oggz\/} does not refer to an existing OGGZ \item[{\em OGGZ\_\-ERR\_\-BAD\_\-SERIALNO}]{\itshape serialno\/} does not refer to an existing stream \end{DoxyRetVals}
diff -Nru liboggz-1.1.0/doc/liboggz/latex/oggz__table_8h.tex liboggz-1.1.1/doc/liboggz/latex/oggz__table_8h.tex
--- liboggz-1.1.0/doc/liboggz/latex/oggz__table_8h.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/oggz__table_8h.tex	2010-04-24 00:13:55.000000000 +0000
@@ -2,146 +2,129 @@
 \label{oggz__table_8h}\index{oggz\_\-table.h@{oggz\_\-table.h}}
 
 
-\subsection{Detailed Description}
-A lookup table. 
+A lookup table.  
 
-OggzTable is provided for convenience to allow the storage of serialno-specific data. 
 
 \subsection*{Typedefs}
-\begin{CompactItemize}
+\begin{DoxyCompactItemize}
 \item 
-typedef void {\bf OggzTable}\label{oggz__table_8h_72c5d21d2254089d192176e1c310b023}
+typedef void {\bf OggzTable}\label{oggz__table_8h_a72c5d21d2254089d192176e1c310b023}
 
-\begin{CompactList}\small\item\em A table of key-value pairs. \item\end{CompactList}\end{CompactItemize}
+\begin{DoxyCompactList}\small\item\em A table of key-\/value pairs. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
 \subsection*{Functions}
-\begin{CompactItemize}
+\begin{DoxyCompactItemize}
 \item 
 {\bf OggzTable} $\ast$ {\bf oggz\_\-table\_\-new} (void)
-\begin{CompactList}\small\item\em Instantiate a new OggzTable. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Instantiate a new OggzTable. \item\end{DoxyCompactList}\item 
 void {\bf oggz\_\-table\_\-delete} ({\bf OggzTable} $\ast$table)
-\begin{CompactList}\small\item\em Delete an OggzTable. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Delete an OggzTable. \item\end{DoxyCompactList}\item 
 void $\ast$ {\bf oggz\_\-table\_\-insert} ({\bf OggzTable} $\ast$table, long key, void $\ast$data)
-\begin{CompactList}\small\item\em Insert an element into a table. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Insert an element into a table. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-table\_\-remove} ({\bf OggzTable} $\ast$table, long key)
-\begin{CompactList}\small\item\em Remove the element of an OggzTable indexed by a given key. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Remove the element of an OggzTable indexed by a given key. \item\end{DoxyCompactList}\item 
 void $\ast$ {\bf oggz\_\-table\_\-lookup} ({\bf OggzTable} $\ast$table, long key)
-\begin{CompactList}\small\item\em Retrieve the element of an OggzTable indexed by a given key. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Retrieve the element of an OggzTable indexed by a given key. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-table\_\-size} ({\bf OggzTable} $\ast$table)
-\begin{CompactList}\small\item\em Query the number of elements in an OggzTable. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Query the number of elements in an OggzTable. \item\end{DoxyCompactList}\item 
 void $\ast$ {\bf oggz\_\-table\_\-nth} ({\bf OggzTable} $\ast$table, int n, long $\ast$key)
-\begin{CompactList}\small\item\em Retrieve the nth element of an OggzTable, and optionally its key. \item\end{CompactList}\end{CompactItemize}
+\begin{DoxyCompactList}\small\item\em Retrieve the nth element of an OggzTable, and optionally its key. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
+
 
+\subsection{Detailed Description}
+A lookup table. OggzTable is provided for convenience to allow the storage of serialno-\/specific data. 
 
 \subsection{Function Documentation}
 \index{oggz\_\-table.h@{oggz\_\-table.h}!oggz\_\-table\_\-delete@{oggz\_\-table\_\-delete}}
 \index{oggz\_\-table\_\-delete@{oggz\_\-table\_\-delete}!oggz_table.h@{oggz\_\-table.h}}
-\subsubsection[oggz\_\-table\_\-delete]{\setlength{\rightskip}{0pt plus 5cm}void oggz\_\-table\_\-delete ({\bf OggzTable} $\ast$ {\em table})}\label{oggz__table_8h_989e307feecf2adc2ebe905c067051c4}
+\subsubsection[{oggz\_\-table\_\-delete}]{\setlength{\rightskip}{0pt plus 5cm}void oggz\_\-table\_\-delete ({\bf OggzTable} $\ast$ {\em table})}\label{oggz__table_8h_a989e307feecf2adc2ebe905c067051c4}
 
 
 Delete an OggzTable. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em table}]An OggzTable \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em table}]An OggzTable \end{DoxyParams}
 \index{oggz\_\-table.h@{oggz\_\-table.h}!oggz\_\-table\_\-insert@{oggz\_\-table\_\-insert}}
 \index{oggz\_\-table\_\-insert@{oggz\_\-table\_\-insert}!oggz_table.h@{oggz\_\-table.h}}
-\subsubsection[oggz\_\-table\_\-insert]{\setlength{\rightskip}{0pt plus 5cm}void$\ast$ oggz\_\-table\_\-insert ({\bf OggzTable} $\ast$ {\em table}, \/  long {\em key}, \/  void $\ast$ {\em data})}\label{oggz__table_8h_dbcdb0cdf6e8392c78956e911cbf6634}
+\subsubsection[{oggz\_\-table\_\-insert}]{\setlength{\rightskip}{0pt plus 5cm}void$\ast$ oggz\_\-table\_\-insert ({\bf OggzTable} $\ast$ {\em table}, \/  long {\em key}, \/  void $\ast$ {\em data})}\label{oggz__table_8h_adbcdb0cdf6e8392c78956e911cbf6634}
 
 
 Insert an element into a table. 
 
-If a previous value existed for this key, it is overwritten with the new data element. \begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em table}]An OggzTable \item[{\em key}]Key to access this data element \item[{\em data}]The new element to add \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em data}]If the element was successfully added \item[{\em NULL}]If adding the element failed due to a realloc() error \end{description}
-\end{Desc}
+If a previous value existed for this key, it is overwritten with the new data element. 
+\begin{DoxyParams}{Parameters}
+\item[{\em table}]An OggzTable \item[{\em key}]Key to access this data element \item[{\em data}]The new element to add \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em data}]If the element was successfully added \item[{\em NULL}]If adding the element failed due to a realloc() error \end{DoxyRetVals}
 \index{oggz\_\-table.h@{oggz\_\-table.h}!oggz\_\-table\_\-lookup@{oggz\_\-table\_\-lookup}}
 \index{oggz\_\-table\_\-lookup@{oggz\_\-table\_\-lookup}!oggz_table.h@{oggz\_\-table.h}}
-\subsubsection[oggz\_\-table\_\-lookup]{\setlength{\rightskip}{0pt plus 5cm}void$\ast$ oggz\_\-table\_\-lookup ({\bf OggzTable} $\ast$ {\em table}, \/  long {\em key})}\label{oggz__table_8h_92ea55bffd5657be29cf1972f33364e3}
+\subsubsection[{oggz\_\-table\_\-lookup}]{\setlength{\rightskip}{0pt plus 5cm}void$\ast$ oggz\_\-table\_\-lookup ({\bf OggzTable} $\ast$ {\em table}, \/  long {\em key})}\label{oggz__table_8h_a92ea55bffd5657be29cf1972f33364e3}
 
 
 Retrieve the element of an OggzTable indexed by a given key. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em table}]An OggzTable \item[{\em key}]a key \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]The element indexed by {\em key\/} \end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em NULL}]{\em table\/} is undefined, or no element is indexed by {\em key\/} \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em table}]An OggzTable \item[{\em key}]a key \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+The element indexed by {\itshape key\/} 
+\end{DoxyReturn}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em NULL}]{\itshape table\/} is undefined, or no element is indexed by {\itshape key\/} \end{DoxyRetVals}
 \index{oggz\_\-table.h@{oggz\_\-table.h}!oggz\_\-table\_\-new@{oggz\_\-table\_\-new}}
 \index{oggz\_\-table\_\-new@{oggz\_\-table\_\-new}!oggz_table.h@{oggz\_\-table.h}}
-\subsubsection[oggz\_\-table\_\-new]{\setlength{\rightskip}{0pt plus 5cm}{\bf OggzTable}$\ast$ oggz\_\-table\_\-new (void)}\label{oggz__table_8h_40772505443484de93526882c48f0dd8}
+\subsubsection[{oggz\_\-table\_\-new}]{\setlength{\rightskip}{0pt plus 5cm}{\bf OggzTable}$\ast$ oggz\_\-table\_\-new (void)}\label{oggz__table_8h_a40772505443484de93526882c48f0dd8}
 
 
 Instantiate a new OggzTable. 
 
-\begin{Desc}
-\item[Returns:]A new OggzTable \end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em NULL}]Could not allocate memory for table \end{description}
-\end{Desc}
+\begin{DoxyReturn}{Returns}
+A new OggzTable 
+\end{DoxyReturn}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em NULL}]Could not allocate memory for table \end{DoxyRetVals}
 \index{oggz\_\-table.h@{oggz\_\-table.h}!oggz\_\-table\_\-nth@{oggz\_\-table\_\-nth}}
 \index{oggz\_\-table\_\-nth@{oggz\_\-table\_\-nth}!oggz_table.h@{oggz\_\-table.h}}
-\subsubsection[oggz\_\-table\_\-nth]{\setlength{\rightskip}{0pt plus 5cm}void$\ast$ oggz\_\-table\_\-nth ({\bf OggzTable} $\ast$ {\em table}, \/  int {\em n}, \/  long $\ast$ {\em key})}\label{oggz__table_8h_285c3cbdb46e9b8c2a831728182856f1}
+\subsubsection[{oggz\_\-table\_\-nth}]{\setlength{\rightskip}{0pt plus 5cm}void$\ast$ oggz\_\-table\_\-nth ({\bf OggzTable} $\ast$ {\em table}, \/  int {\em n}, \/  long $\ast$ {\em key})}\label{oggz__table_8h_a285c3cbdb46e9b8c2a831728182856f1}
 
 
 Retrieve the nth element of an OggzTable, and optionally its key. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em table}]An OggzTable \item[{\em n}]An index into the {\em table\/} \item[{\em key}]Return pointer for key corresponding to nth data element of {\em table\/}. Ignored if NULL. \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]The nth data element of {\em table\/} \end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em NULL}]{\em table\/} is undefined, or {\em n\/} is out of range \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em table}]An OggzTable \item[{\em n}]An index into the {\itshape table\/} \item[{\em key}]Return pointer for key corresponding to nth data element of {\itshape table\/}. Ignored if NULL. \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+The nth data element of {\itshape table\/} 
+\end{DoxyReturn}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em NULL}]{\itshape table\/} is undefined, or {\itshape n\/} is out of range \end{DoxyRetVals}
 \index{oggz\_\-table.h@{oggz\_\-table.h}!oggz\_\-table\_\-remove@{oggz\_\-table\_\-remove}}
 \index{oggz\_\-table\_\-remove@{oggz\_\-table\_\-remove}!oggz_table.h@{oggz\_\-table.h}}
-\subsubsection[oggz\_\-table\_\-remove]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-table\_\-remove ({\bf OggzTable} $\ast$ {\em table}, \/  long {\em key})}\label{oggz__table_8h_c137e535f1da63ee52266b47f114020f}
+\subsubsection[{oggz\_\-table\_\-remove}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-table\_\-remove ({\bf OggzTable} $\ast$ {\em table}, \/  long {\em key})}\label{oggz__table_8h_ac137e535f1da63ee52266b47f114020f}
 
 
 Remove the element of an OggzTable indexed by a given key. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em table}]An OggzTable \item[{\em key}]a key \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Return values:]
-\begin{description}
-\item[{\em 0}]Success \item[{\em -1}]Not found \end{description}
-\end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em table}]An OggzTable \item[{\em key}]a key \end{DoxyParams}
+
+\begin{DoxyRetVals}{Return values}
+\item[{\em 0}]Success \item[{\em -\/1}]Not found \end{DoxyRetVals}
 \index{oggz\_\-table.h@{oggz\_\-table.h}!oggz\_\-table\_\-size@{oggz\_\-table\_\-size}}
 \index{oggz\_\-table\_\-size@{oggz\_\-table\_\-size}!oggz_table.h@{oggz\_\-table.h}}
-\subsubsection[oggz\_\-table\_\-size]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-table\_\-size ({\bf OggzTable} $\ast$ {\em table})}\label{oggz__table_8h_62db2037df45db88a75b89b8a8ac7766}
+\subsubsection[{oggz\_\-table\_\-size}]{\setlength{\rightskip}{0pt plus 5cm}int oggz\_\-table\_\-size ({\bf OggzTable} $\ast$ {\em table})}\label{oggz__table_8h_a62db2037df45db88a75b89b8a8ac7766}
 
 
 Query the number of elements in an OggzTable. 
 
-\begin{Desc}
-\item[Parameters:]
-\begin{description}
-\item[{\em table}]An OggzTable \end{description}
-\end{Desc}
-\begin{Desc}
-\item[Returns:]the number of elements in {\em table\/} \end{Desc}
+
+\begin{DoxyParams}{Parameters}
+\item[{\em table}]An OggzTable \end{DoxyParams}
+\begin{DoxyReturn}{Returns}
+the number of elements in {\itshape table\/} 
+\end{DoxyReturn}
diff -Nru liboggz-1.1.0/doc/liboggz/latex/oggz__write_8h.tex liboggz-1.1.1/doc/liboggz/latex/oggz__write_8h.tex
--- liboggz-1.1.0/doc/liboggz/latex/oggz__write_8h.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/oggz__write_8h.tex	2010-04-24 00:13:55.000000000 +0000
@@ -2,26 +2,28 @@
 \label{oggz__write_8h}\index{oggz\_\-write.h@{oggz\_\-write.h}}
 
 
-\subsection{Detailed Description}
-Interfaces for writing Ogg files and streams. 
-
+Interfaces for writing Ogg files and streams.  
 
 
 \subsection*{Typedefs}
-\begin{CompactItemize}
+\begin{DoxyCompactItemize}
 \item 
 typedef int($\ast$ {\bf OggzWriteHungry} )({\bf OGGZ} $\ast$oggz, int empty, void $\ast$user\_\-data)
-\begin{CompactList}\small\item\em This is the signature of a callback which Oggz will call when {\em oggz\/} is \doxyref{hungry }{p.}{group__hungry}. \item\end{CompactList}\end{CompactItemize}
+\begin{DoxyCompactList}\small\item\em This is the signature of a callback which Oggz will call when {\itshape oggz\/} is \doxyref{hungry }{p.}{group__hungry}. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
 \subsection*{Functions}
-\begin{CompactItemize}
+\begin{DoxyCompactItemize}
 \item 
 int {\bf oggz\_\-write\_\-set\_\-hungry\_\-callback} ({\bf OGGZ} $\ast$oggz, {\bf OggzWriteHungry} hungry, int only\_\-when\_\-empty, void $\ast$user\_\-data)
-\begin{CompactList}\small\item\em Set a callback for Oggz to call when {\em oggz\/} is \doxyref{hungry }{p.}{group__hungry}. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Set a callback for Oggz to call when {\itshape oggz\/} is \doxyref{hungry }{p.}{group__hungry}. \item\end{DoxyCompactList}\item 
 int {\bf oggz\_\-write\_\-feed} ({\bf OGGZ} $\ast$oggz, ogg\_\-packet $\ast$op, long serialno, int flush, int $\ast$guard)
-\begin{CompactList}\small\item\em Add a packet to {\em oggz's\/} packet queue. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Add a packet to {\itshape oggz's\/} packet queue. \item\end{DoxyCompactList}\item 
 long {\bf oggz\_\-write\_\-output} ({\bf OGGZ} $\ast$oggz, unsigned char $\ast$buf, long n)
-\begin{CompactList}\small\item\em Output data from an OGGZ handle. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Output data from an OGGZ handle. \item\end{DoxyCompactList}\item 
 long {\bf oggz\_\-write} ({\bf OGGZ} $\ast$oggz, long n)
-\begin{CompactList}\small\item\em Write n bytes from an OGGZ handle. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Write n bytes from an OGGZ handle. \item\end{DoxyCompactList}\item 
 long {\bf oggz\_\-write\_\-get\_\-next\_\-page\_\-size} ({\bf OGGZ} $\ast$oggz)
-\begin{CompactList}\small\item\em Query the number of bytes in the next page to be written. \item\end{CompactList}\end{CompactItemize}
+\begin{DoxyCompactList}\small\item\em Query the number of bytes in the next page to be written. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
+
+
+\subsection{Detailed Description}
+Interfaces for writing Ogg files and streams. 
\ No newline at end of file
diff -Nru liboggz-1.1.0/doc/liboggz/latex/refman.tex liboggz-1.1.1/doc/liboggz/latex/refman.tex
--- liboggz-1.1.0/doc/liboggz/latex/refman.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/refman.tex	2010-04-24 00:13:55.000000000 +0000
@@ -1,14 +1,16 @@
 \documentclass[a4paper]{book}
 \usepackage{a4wide}
 \usepackage{makeidx}
-\usepackage{fancyhdr}
 \usepackage{graphicx}
 \usepackage{multicol}
 \usepackage{float}
+\usepackage{listings}
+\usepackage{color}
 \usepackage{textcomp}
 \usepackage{alltt}
 \usepackage[utf8]{inputenc}
 \usepackage{doxygen}
+\lstset{language=C++,inputencoding=utf8,basicstyle=\footnotesize,breaklines=true,breakatwhitespace=true,tabsize=8,numbers=left }
 \makeindex
 \setcounter{tocdepth}{3}
 \renewcommand{\footrulewidth}{0.4pt}
@@ -16,11 +18,11 @@
 \begin{titlepage}
 \vspace*{7cm}
 \begin{center}
-{\Large liboggz \\[1ex]\large 1.1.0 }\\
+{\Large liboggz \\[1ex]\large 1.0.1 }\\
 \vspace*{1cm}
-{\large Generated by Doxygen 1.5.6}\\
+{\large Generated by Doxygen 1.6.3}\\
 \vspace*{0.5cm}
-{\small Thu Oct 8 18:21:26 2009}\\
+{\small Sat Apr 24 09:13:55 2010}\\
 \end{center}
 \end{titlepage}
 \clearemptydoublepage
@@ -49,9 +51,7 @@
 \include{group__hungry}
 \include{group__write__api}
 \chapter{Data Structure Documentation}
-\input{structoggz__packet}
-\include{structoggz__position}
-\include{structOggzComment}
+\input{structOggzComment}
 \chapter{File Documentation}
 \input{oggz_8h}
 \include{oggz__comments_8h}
@@ -59,7 +59,6 @@
 \include{oggz__deprecated_8h}
 \include{oggz__io_8h}
 \include{oggz__off__t_8h}
-\include{oggz__packet_8h}
 \include{oggz__read_8h}
 \include{oggz__seek_8h}
 \include{oggz__stream_8h}
diff -Nru liboggz-1.1.0/doc/liboggz/latex/structOggzComment.tex liboggz-1.1.1/doc/liboggz/latex/structOggzComment.tex
--- liboggz-1.1.0/doc/liboggz/latex/structOggzComment.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/structOggzComment.tex	2010-04-24 00:13:55.000000000 +0000
@@ -1,30 +1,37 @@
 \section{OggzComment Struct Reference}
 \label{structOggzComment}\index{OggzComment@{OggzComment}}
-{\tt \#include $<$oggz\_\-comments.h$>$}
 
 
+A comment.  
 
-\subsection{Detailed Description}
-A comment. \subsection*{Data Fields}
-\begin{CompactItemize}
+
+
+
+{\ttfamily \#include $<$oggz\_\-comments.h$>$}
+
+\subsection*{Data Fields}
+\begin{DoxyCompactItemize}
 \item 
 char $\ast$ {\bf name}
-\begin{CompactList}\small\item\em The name of the comment, eg. \item\end{CompactList}\item 
-char $\ast$ {\bf value}\label{structOggzComment_e300da8b29b69ea083b47035e944f9bb}
+\begin{DoxyCompactList}\small\item\em The name of the comment, eg. \item\end{DoxyCompactList}\item 
+char $\ast$ {\bf value}\label{structOggzComment_ae300da8b29b69ea083b47035e944f9bb}
+
+\begin{DoxyCompactList}\small\item\em The value of the comment, as UTF-\/8. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
 
-\begin{CompactList}\small\item\em The value of the comment, as UTF-8. \item\end{CompactList}\end{CompactItemize}
 
+\subsection{Detailed Description}
+A comment. 
 
 \subsection{Field Documentation}
 \index{OggzComment@{OggzComment}!name@{name}}
 \index{name@{name}!OggzComment@{OggzComment}}
-\subsubsection[name]{\setlength{\rightskip}{0pt plus 5cm}char$\ast$ {\bf OggzComment::name}}\label{structOggzComment_f1b4e3c3e42e17054b6164bbdee5a37f}
+\subsubsection[{name}]{\setlength{\rightskip}{0pt plus 5cm}char$\ast$ {\bf OggzComment::name}}\label{structOggzComment_af1b4e3c3e42e17054b6164bbdee5a37f}
 
 
 The name of the comment, eg. 
 
 \char`\"{}AUTHOR\char`\"{} 
 
-The documentation for this struct was generated from the following file:\begin{CompactItemize}
+The documentation for this struct was generated from the following file:\begin{DoxyCompactItemize}
 \item 
-{\bf oggz\_\-comments.h}\end{CompactItemize}
+{\bf oggz\_\-comments.h}\end{DoxyCompactItemize}
diff -Nru liboggz-1.1.0/doc/liboggz/latex/structoggz__packet.tex liboggz-1.1.1/doc/liboggz/latex/structoggz__packet.tex
--- liboggz-1.1.0/doc/liboggz/latex/structoggz__packet.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/structoggz__packet.tex	2010-04-20 12:55:03.000000000 +0000
@@ -1,21 +1,28 @@
 \section{oggz\_\-packet Struct Reference}
 \label{structoggz__packet}\index{oggz\_\-packet@{oggz\_\-packet}}
-{\tt \#include $<$oggz\_\-packet.h$>$}
 
 
+An ogg\_\-packet and its position in the stream.  
 
-\subsection{Detailed Description}
-An ogg\_\-packet and its position in the stream. \subsection*{Data Fields}
-\begin{CompactItemize}
+
+
+
+{\ttfamily \#include $<$oggz\_\-packet.h$>$}
+
+\subsection*{Data Fields}
+\begin{DoxyCompactItemize}
 \item 
-ogg\_\-packet {\bf op}\label{structoggz__packet_36cb056219e68a383e7139ce0a2ff715}
+ogg\_\-packet {\bf op}\label{structoggz__packet_a36cb056219e68a383e7139ce0a2ff715}
+
+\begin{DoxyCompactList}\small\item\em The ogg\_\-packet structure, defined in $<$ogg/ogg.h$>$ \item\end{DoxyCompactList}\item 
+{\bf oggz\_\-position} {\bf pos}\label{structoggz__packet_a71d24b8fa94acf2511c0c6f7b24de546}
 
-\begin{CompactList}\small\item\em The ogg\_\-packet structure, defined in $<$ogg/ogg.h$>$. \item\end{CompactList}\item 
-{\bf oggz\_\-position} {\bf pos}\label{structoggz__packet_71d24b8fa94acf2511c0c6f7b24de546}
+\begin{DoxyCompactList}\small\item\em Its position. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
 
-\begin{CompactList}\small\item\em Its position. \item\end{CompactList}\end{CompactItemize}
 
+\subsection{Detailed Description}
+An ogg\_\-packet and its position in the stream. 
 
-The documentation for this struct was generated from the following file:\begin{CompactItemize}
+The documentation for this struct was generated from the following file:\begin{DoxyCompactItemize}
 \item 
-{\bf oggz\_\-packet.h}\end{CompactItemize}
+{\bf oggz\_\-packet.h}\end{DoxyCompactItemize}
diff -Nru liboggz-1.1.0/doc/liboggz/latex/structoggz__position.tex liboggz-1.1.1/doc/liboggz/latex/structoggz__position.tex
--- liboggz-1.1.0/doc/liboggz/latex/structoggz__position.tex	2009-10-08 09:21:26.000000000 +0000
+++ liboggz-1.1.1/doc/liboggz/latex/structoggz__position.tex	2010-04-20 12:55:03.000000000 +0000
@@ -1,51 +1,58 @@
 \section{oggz\_\-position Struct Reference}
 \label{structoggz__position}\index{oggz\_\-position@{oggz\_\-position}}
-{\tt \#include $<$oggz\_\-packet.h$>$}
 
 
+The position of an \doxyref{oggz\_\-packet}{p.}{structoggz__packet}.  
 
-\subsection{Detailed Description}
-The position of an \doxyref{oggz\_\-packet}{p.}{structoggz__packet}. \subsection*{Data Fields}
-\begin{CompactItemize}
+
+
+
+{\ttfamily \#include $<$oggz\_\-packet.h$>$}
+
+\subsection*{Data Fields}
+\begin{DoxyCompactItemize}
 \item 
 ogg\_\-int64\_\-t {\bf calc\_\-granulepos}
-\begin{CompactList}\small\item\em Granulepos calculated by inspection of codec data. \item\end{CompactList}\item 
-oggz\_\-off\_\-t {\bf begin\_\-page\_\-offset}\label{structoggz__position_e9c2a34bd23aea39a2136415b2666487}
+\begin{DoxyCompactList}\small\item\em Granulepos calculated by inspection of codec data. \item\end{DoxyCompactList}\item 
+oggz\_\-off\_\-t {\bf begin\_\-page\_\-offset}\label{structoggz__position_ae9c2a34bd23aea39a2136415b2666487}
 
-\begin{CompactList}\small\item\em Byte offset of the start of the page on which this packet begins. \item\end{CompactList}\item 
-oggz\_\-off\_\-t {\bf end\_\-page\_\-offset}\label{structoggz__position_7130786ffc28acab7c3a9a77c7cfbbb6}
+\begin{DoxyCompactList}\small\item\em Byte offset of the start of the page on which this packet begins. \item\end{DoxyCompactList}\item 
+oggz\_\-off\_\-t {\bf end\_\-page\_\-offset}\label{structoggz__position_a7130786ffc28acab7c3a9a77c7cfbbb6}
 
-\begin{CompactList}\small\item\em Byte offset of the start of the page on which this packet ends. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Byte offset of the start of the page on which this packet ends. \item\end{DoxyCompactList}\item 
 int {\bf pages}
-\begin{CompactList}\small\item\em Number of pages this packet spans. \item\end{CompactList}\item 
+\begin{DoxyCompactList}\small\item\em Number of pages this packet spans. \item\end{DoxyCompactList}\item 
 int {\bf begin\_\-segment\_\-index}
-\begin{CompactList}\small\item\em Index into begin\_\-page's lacing values for the segment that begins this packet. \item\end{CompactList}\end{CompactItemize}
+\begin{DoxyCompactList}\small\item\em Index into begin\_\-page's lacing values for the segment that begins this packet. \item\end{DoxyCompactList}\end{DoxyCompactItemize}
 
 
+\subsection{Detailed Description}
+The position of an \doxyref{oggz\_\-packet}{p.}{structoggz__packet}. 
+
 \subsection{Field Documentation}
-\index{oggz\_\-position@{oggz\_\-position}!calc\_\-granulepos@{calc\_\-granulepos}}
+\index{oggz\_\-position@{oggz\_\-position}!begin\_\-segment\_\-index@{begin\_\-segment\_\-index}}
+\index{begin\_\-segment\_\-index@{begin\_\-segment\_\-index}!oggz_position@{oggz\_\-position}}
+\subsubsection[{begin\_\-segment\_\-index}]{\setlength{\rightskip}{0pt plus 5cm}int {\bf oggz\_\-position::begin\_\-segment\_\-index}}\label{structoggz__position_a8ca77b0acf589531d9970c3f6b589164}
+
+
+Index into begin\_\-page's lacing values for the segment that begins this packet. 
+
+NB. if begin\_\-page is continued then the first of these packets will not be reported by ogg\_\-sync\_\-packetout() after a seek. -\/1 if unknown. \index{oggz\_\-position@{oggz\_\-position}!calc\_\-granulepos@{calc\_\-granulepos}}
 \index{calc\_\-granulepos@{calc\_\-granulepos}!oggz_position@{oggz\_\-position}}
-\subsubsection[calc\_\-granulepos]{\setlength{\rightskip}{0pt plus 5cm}ogg\_\-int64\_\-t {\bf oggz\_\-position::calc\_\-granulepos}}\label{structoggz__position_f7eb619f0da5c818b49cbabc29c540b4}
+\subsubsection[{calc\_\-granulepos}]{\setlength{\rightskip}{0pt plus 5cm}ogg\_\-int64\_\-t {\bf oggz\_\-position::calc\_\-granulepos}}\label{structoggz__position_af7eb619f0da5c818b49cbabc29c540b4}
 
 
 Granulepos calculated by inspection of codec data. 
 
--1 if unknown \index{oggz\_\-position@{oggz\_\-position}!pages@{pages}}
+-\/1 if unknown \index{oggz\_\-position@{oggz\_\-position}!pages@{pages}}
 \index{pages@{pages}!oggz_position@{oggz\_\-position}}
-\subsubsection[pages]{\setlength{\rightskip}{0pt plus 5cm}int {\bf oggz\_\-position::pages}}\label{structoggz__position_d2e55a8276c03f83c6e40b88991305b2}
+\subsubsection[{pages}]{\setlength{\rightskip}{0pt plus 5cm}int {\bf oggz\_\-position::pages}}\label{structoggz__position_ad2e55a8276c03f83c6e40b88991305b2}
 
 
 Number of pages this packet spans. 
 
-\index{oggz\_\-position@{oggz\_\-position}!begin\_\-segment\_\-index@{begin\_\-segment\_\-index}}
-\index{begin\_\-segment\_\-index@{begin\_\-segment\_\-index}!oggz_position@{oggz\_\-position}}
-\subsubsection[begin\_\-segment\_\-index]{\setlength{\rightskip}{0pt plus 5cm}int {\bf oggz\_\-position::begin\_\-segment\_\-index}}\label{structoggz__position_8ca77b0acf589531d9970c3f6b589164}
-
-
-Index into begin\_\-page's lacing values for the segment that begins this packet. 
 
-NB. if begin\_\-page is continued then the first of these packets will not be reported by ogg\_\-sync\_\-packetout() after a seek. -1 if unknown. 
 
-The documentation for this struct was generated from the following file:\begin{CompactItemize}
+The documentation for this struct was generated from the following file:\begin{DoxyCompactItemize}
 \item 
-{\bf oggz\_\-packet.h}\end{CompactItemize}
+{\bf oggz\_\-packet.h}\end{DoxyCompactItemize}
diff -Nru liboggz-1.1.0/doc/Makefile.in liboggz-1.1.1/doc/Makefile.in
--- liboggz-1.1.0/doc/Makefile.in	2009-10-08 09:21:13.000000000 +0000
+++ liboggz-1.1.1/doc/Makefile.in	2010-04-29 01:39:46.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -37,15 +39,38 @@
 DIST_COMMON = $(srcdir)/Doxyfile.in $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac-sys-extra-largefile.m4 \
+	$(top_srcdir)/m4/as-ac-expand.m4 $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = Doxyfile
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+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 = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 man1dir = $(mandir)/man1
 am__installdirs = "$(DESTDIR)$(man1dir)"
 NROFF = nroff
@@ -104,6 +129,7 @@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OGGZ_OFF_MAX = @OGGZ_OFF_MAX@
 OGG_CFLAGS = @OGG_CFLAGS@
@@ -115,6 +141,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -183,6 +210,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 man_MANS = oggz.1 oggz-diff.1 oggz-dump.1 oggz-info.1 oggz-known-codecs.1 oggz-merge.1 oggz-chop.1 \
@@ -204,14 +232,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  doc/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu doc/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -229,6 +257,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 Doxyfile: $(top_builddir)/config.status $(srcdir)/Doxyfile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
@@ -237,51 +266,44 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-man1: $(man1_MANS) $(man_MANS)
+install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
 	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
+	@list=''; test -n "$(man1dir)" || exit 0; \
+	{ for i in $$list; do echo "$$i"; done; \
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.1[a-z]*$$/p'; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
+	  fi; \
 	done; \
-	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
-	done
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+	done; }
+
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
-	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
-	done
+	@list=''; test -n "$(man1dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.1[a-z]*$$/p'; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	test -z "$$files" || { \
+	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
 tags: TAGS
 TAGS:
 
@@ -290,6 +312,19 @@
 
 
 distdir: $(DISTFILES)
+	@list='$(MANS)'; if test -n "$$list"; then \
+	  list=`for p in $$list; do \
+	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
+	  if test -n "$$list" && \
+	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
+	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
+	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
+	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
+	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
+	    exit 1; \
+	  else :; fi; \
+	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -305,13 +340,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -345,6 +384,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -361,6 +401,8 @@
 
 dvi-am:
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -369,18 +411,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man: install-man1
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -469,6 +521,7 @@
 clean-local:
 	if test -d liboggz; then rm -rf liboggz; fi
 	if test -f doxygen-build.stamp; then rm -f doxygen-build.stamp; fi
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru liboggz-1.1.0/include/Makefile.in liboggz-1.1.1/include/Makefile.in
--- liboggz-1.1.0/include/Makefile.in	2009-10-08 09:21:13.000000000 +0000
+++ liboggz-1.1.1/include/Makefile.in	2010-04-29 01:39:46.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -35,13 +37,15 @@
 subdir = include
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac-sys-extra-largefile.m4 \
+	$(top_srcdir)/m4/as-ac-expand.m4 $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -53,10 +57,38 @@
 	ps-recursive uninstall-recursive
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 AMTAR = @AMTAR@
@@ -109,6 +141,7 @@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OGGZ_OFF_MAX = @OGGZ_OFF_MAX@
 OGG_CFLAGS = @OGG_CFLAGS@
@@ -120,6 +153,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -188,6 +222,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = oggz
@@ -198,14 +233,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  include/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu include/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -223,6 +258,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -237,7 +273,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -254,7 +290,7 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -262,7 +298,7 @@
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -288,16 +324,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -305,14 +341,14 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -324,7 +360,7 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -333,29 +369,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -376,29 +417,44 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -428,6 +484,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -446,6 +503,8 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -454,18 +513,28 @@
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -486,8 +555,8 @@
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic clean-libtool \
@@ -503,6 +572,7 @@
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
 	uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru liboggz-1.1.0/include/oggz/Makefile.in liboggz-1.1.1/include/oggz/Makefile.in
--- liboggz-1.1.0/include/oggz/Makefile.in	2009-10-08 09:21:13.000000000 +0000
+++ liboggz-1.1.1/include/oggz/Makefile.in	2010-04-29 01:39:46.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -37,13 +39,15 @@
 DIST_COMMON = $(oggzinclude_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/oggz_off_t_generated.h.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac-sys-extra-largefile.m4 \
+	$(top_srcdir)/m4/as-ac-expand.m4 $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = oggz_off_t_generated.h
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -51,9 +55,23 @@
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(oggzincludedir)"
-oggzincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(oggzinclude_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -110,6 +128,7 @@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OGGZ_OFF_MAX = @OGGZ_OFF_MAX@
 OGG_CFLAGS = @OGG_CFLAGS@
@@ -121,6 +140,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -189,6 +209,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 EXTRA_DIST = oggz_off_t_generated.h.in
@@ -219,14 +240,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/oggz/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  include/oggz/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/oggz/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu include/oggz/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -244,6 +265,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 oggz_off_t_generated.h: $(top_builddir)/config.status $(srcdir)/oggz_off_t_generated.h.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
@@ -255,34 +277,37 @@
 install-oggzincludeHEADERS: $(oggzinclude_HEADERS)
 	@$(NORMAL_INSTALL)
 	test -z "$(oggzincludedir)" || $(MKDIR_P) "$(DESTDIR)$(oggzincludedir)"
-	@list='$(oggzinclude_HEADERS)'; for p in $$list; do \
+	@list='$(oggzinclude_HEADERS)'; test -n "$(oggzincludedir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(oggzincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(oggzincludedir)/$$f'"; \
-	  $(oggzincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(oggzincludedir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(oggzincludedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(oggzincludedir)" || exit $$?; \
 	done
 
 uninstall-oggzincludeHEADERS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(oggzinclude_HEADERS)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(oggzincludedir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(oggzincludedir)/$$f"; \
-	done
+	@list='$(oggzinclude_HEADERS)'; test -n "$(oggzincludedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(oggzincludedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(oggzincludedir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -290,29 +315,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -333,13 +363,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -372,6 +406,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -391,6 +426,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -399,18 +436,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -431,7 +478,7 @@
 
 uninstall-am: uninstall-oggzincludeHEADERS
 
-.MAKE: install-am install-strip
+.MAKE: all check install install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool ctags distclean distclean-generic \
@@ -446,6 +493,7 @@
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-oggzincludeHEADERS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru liboggz-1.1.0/install-sh liboggz-1.1.1/install-sh
--- liboggz-1.1.0/install-sh	2009-06-17 05:24:21.000000000 +0000
+++ liboggz-1.1.1/install-sh	2010-01-18 06:28:57.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2006-12-25.00
+scriptversion=2009-04-28.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -515,5 +515,6 @@
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff -Nru liboggz-1.1.0/ltmain.sh liboggz-1.1.1/ltmain.sh
--- liboggz-1.1.0/ltmain.sh	2009-06-17 05:24:21.000000000 +0000
+++ liboggz-1.1.1/ltmain.sh	2009-12-09 23:55:19.000000000 +0000
@@ -1,6 +1,6 @@
 # Generated from ltmain.m4sh.
 
-# ltmain.sh (GNU libtool) 2.2.4
+# ltmain.sh (GNU libtool) 2.2.6b
 # Written by Gordon Matzigkeit , 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
@@ -65,7 +65,7 @@
 #       compiler:		$LTCC
 #       compiler flags:		$LTCFLAGS
 #       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.4 Debian-2.2.4-0ubuntu4
+#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2
 #       automake:		$automake_version
 #       autoconf:		$autoconf_version
 #
@@ -73,9 +73,9 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="2.2.4 Debian-2.2.4-0ubuntu4"
+VERSION="2.2.6b Debian-2.2.6b-2"
 TIMESTAMP=""
-package_revision=1.2976
+package_revision=1.3017
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -805,7 +805,7 @@
 
 
   case $host in
-    *cygwin* | *mingw* | *pw32*)
+    *cygwin* | *mingw* | *pw32* | *cegcc*)
       # don't eliminate duplications in $postdeps and $predeps
       opt_duplicate_compiler_generated_deps=:
       ;;
@@ -893,8 +893,9 @@
 # determined imposters.
 func_lalib_p ()
 {
-    $SED -e 4q "$1" 2>/dev/null \
-      | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+    test -f "$1" &&
+      $SED -e 4q "$1" 2>/dev/null \
+        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
 }
 
 # func_lalib_unsafe_p file
@@ -907,7 +908,7 @@
 func_lalib_unsafe_p ()
 {
     lalib_p=no
-    if test -r "$1" && exec 5<&0 <"$1"; then
+    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
 	for lalib_p_l in 1 2 3 4
 	do
 	    read lalib_p_line
@@ -1275,7 +1276,7 @@
 
     # On Cygwin there's no "real" PIC flag so we must build both object types
     case $host_os in
-    cygwin* | mingw* | pw32* | os2*)
+    cygwin* | mingw* | pw32* | os2* | cegcc*)
       pic_mode=default
       ;;
     esac
@@ -2046,7 +2047,7 @@
 	      'exit $?'
 	  tstripme="$stripme"
 	  case $host_os in
-	  cygwin* | mingw* | pw32*)
+	  cygwin* | mingw* | pw32* | cegcc*)
 	    case $realname in
 	    *.dll.a)
 	      tstripme=""
@@ -2152,7 +2153,7 @@
 
 	# Do a test to see if this is really a libtool program.
 	case $host in
-	*cygwin*|*mingw*)
+	*cygwin* | *mingw*)
 	    if func_ltwrapper_executable_p "$file"; then
 	      func_ltwrapper_scriptname "$file"
 	      wrapper=$func_ltwrapper_scriptname_result
@@ -2358,7 +2359,7 @@
 	      $RM $export_symbols
 	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
 	      case $host in
-	      *cygwin* | *mingw* )
+	      *cygwin* | *mingw* | *cegcc* )
                 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
                 eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
 	        ;;
@@ -2370,7 +2371,7 @@
 	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
 	      eval '$MV "$nlist"T "$nlist"'
 	      case $host in
-	        *cygwin | *mingw* )
+	        *cygwin | *mingw* | *cegcc* )
 	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
 	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
 	          ;;
@@ -2426,7 +2427,7 @@
 } lt_dlsymlist;
 "
 	  case $host in
-	  *cygwin* | *mingw* )
+	  *cygwin* | *mingw* | *cegcc* )
 	    $ECHO >> "$output_objdir/$my_dlsyms" "\
 /* DATA imports from DLLs on WIN32 con't be const, because
    runtime relocations are performed -- see ld's documentation
@@ -2512,7 +2513,7 @@
 	# Transform the symbol file into the correct name.
 	symfileobj="$output_objdir/${my_outputname}S.$objext"
 	case $host in
-	*cygwin* | *mingw* )
+	*cygwin* | *mingw* | *cegcc* )
 	  if test -f "$output_objdir/$my_outputname.def"; then
 	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
 	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
@@ -2691,25 +2692,16 @@
 
 
 
-# func_emit_wrapper arg
+# func_emit_wrapper_part1 [arg=no]
 #
-# emit a libtool wrapper script on stdout
-# don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable.  Must ONLY be called from within
-# func_mode_link because it depends on a number of variable
-# set therein.
-#
-# arg is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-# variable will take.  If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
-# the '.lib' directory.  This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
+# Emit the first part of a libtool wrapper script on stdout.
+# For more information, see the description associated with
+# func_emit_wrapper(), below.
+func_emit_wrapper_part1 ()
 {
-	func_emit_wrapper_arg1=no
+	func_emit_wrapper_part1_arg1=no
 	if test -n "$1" ; then
-	  func_emit_wrapper_arg1=$1
+	  func_emit_wrapper_part1_arg1=$1
 	fi
 
 	$ECHO "\
@@ -2794,10 +2786,27 @@
     file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
     file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
   done
+"
+}
+# end: func_emit_wrapper_part1
+
+# func_emit_wrapper_part2 [arg=no]
+#
+# Emit the second part of a libtool wrapper script on stdout.
+# For more information, see the description associated with
+# func_emit_wrapper(), below.
+func_emit_wrapper_part2 ()
+{
+	func_emit_wrapper_part2_arg1=no
+	if test -n "$1" ; then
+	  func_emit_wrapper_part2_arg1=$1
+	fi
+
+	$ECHO "\
 
   # Usually 'no', except on cygwin/mingw when embedded into
   # the cwrapper.
-  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
   if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
     # special case for '.'
     if test \"\$thisdir\" = \".\"; then
@@ -2888,7 +2897,7 @@
 "
 	case $host in
 	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2*)
+	*-*-mingw | *-*-os2* | *-cegcc*)
 	  $ECHO "\
       exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
 "
@@ -2914,7 +2923,207 @@
 fi\
 "
 }
-# end: func_emit_wrapper
+# end: func_emit_wrapper_part2
+
+
+# func_emit_wrapper [arg=no]
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable.  Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take.  If 'yes', then the emitted script
+# will assume that the directory in which it is stored is
+# the $objdir directory.  This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+	func_emit_wrapper_arg1=no
+	if test -n "$1" ; then
+	  func_emit_wrapper_arg1=$1
+	fi
+
+	# split this up so that func_emit_cwrapperexe_src
+	# can call each part independently.
+	func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
+	func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
+}
+
+
+# func_to_host_path arg
+#
+# Convert paths to host format when used with build tools.
+# Intended for use with "native" mingw (where libtool itself
+# is running under the msys shell), or in the following cross-
+# build environments:
+#    $build          $host
+#    mingw (msys)    mingw  [e.g. native]
+#    cygwin          mingw
+#    *nix + wine     mingw
+# where wine is equipped with the `winepath' executable.
+# In the native mingw case, the (msys) shell automatically
+# converts paths for any non-msys applications it launches,
+# but that facility isn't available from inside the cwrapper.
+# Similar accommodations are necessary for $host mingw and
+# $build cygwin.  Calling this function does no harm for other
+# $host/$build combinations not listed above.
+#
+# ARG is the path (on $build) that should be converted to
+# the proper representation for $host. The result is stored
+# in $func_to_host_path_result.
+func_to_host_path ()
+{
+  func_to_host_path_result="$1"
+  if test -n "$1" ; then
+    case $host in
+      *mingw* )
+        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+        case $build in
+          *mingw* ) # actually, msys
+            # awkward: cmd appends spaces to result
+            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+            func_to_host_path_tmp1=`( cmd //c echo "$1" |\
+              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          *cygwin* )
+            func_to_host_path_tmp1=`cygpath -w "$1"`
+            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          * )
+            # Unfortunately, winepath does not exit with a non-zero
+            # error code, so we are forced to check the contents of
+            # stdout. On the other hand, if the command is not
+            # found, the shell will set an exit code of 127 and print
+            # *an error message* to stdout. So we must check for both
+            # error code of zero AND non-empty stdout, which explains
+            # the odd construction:
+            func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
+            if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
+              func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+                $SED -e "$lt_sed_naive_backslashify"`
+            else
+              # Allow warning below.
+              func_to_host_path_result=""
+            fi
+            ;;
+        esac
+        if test -z "$func_to_host_path_result" ; then
+          func_error "Could not determine host path corresponding to"
+          func_error "  '$1'"
+          func_error "Continuing, but uninstalled executables may not work."
+          # Fallback:
+          func_to_host_path_result="$1"
+        fi
+        ;;
+    esac
+  fi
+}
+# end: func_to_host_path
+
+# func_to_host_pathlist arg
+#
+# Convert pathlists to host format when used with build tools.
+# See func_to_host_path(), above. This function supports the
+# following $build/$host combinations (but does no harm for
+# combinations not listed here):
+#    $build          $host
+#    mingw (msys)    mingw  [e.g. native]
+#    cygwin          mingw
+#    *nix + wine     mingw
+#
+# Path separators are also converted from $build format to
+# $host format. If ARG begins or ends with a path separator
+# character, it is preserved (but converted to $host format)
+# on output.
+#
+# ARG is a pathlist (on $build) that should be converted to
+# the proper representation on $host. The result is stored
+# in $func_to_host_pathlist_result.
+func_to_host_pathlist ()
+{
+  func_to_host_pathlist_result="$1"
+  if test -n "$1" ; then
+    case $host in
+      *mingw* )
+        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+        # Remove leading and trailing path separator characters from
+        # ARG. msys behavior is inconsistent here, cygpath turns them
+        # into '.;' and ';.', and winepath ignores them completely.
+        func_to_host_pathlist_tmp2="$1"
+        # Once set for this call, this variable should not be
+        # reassigned. It is used in tha fallback case.
+        func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
+          $SED -e 's|^:*||' -e 's|:*$||'`
+        case $build in
+          *mingw* ) # Actually, msys.
+            # Awkward: cmd appends spaces to result.
+            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+            func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
+              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          *cygwin* )
+            func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
+            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          * )
+            # unfortunately, winepath doesn't convert pathlists
+            func_to_host_pathlist_result=""
+            func_to_host_pathlist_oldIFS=$IFS
+            IFS=:
+            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
+              IFS=$func_to_host_pathlist_oldIFS
+              if test -n "$func_to_host_pathlist_f" ; then
+                func_to_host_path "$func_to_host_pathlist_f"
+                if test -n "$func_to_host_path_result" ; then
+                  if test -z "$func_to_host_pathlist_result" ; then
+                    func_to_host_pathlist_result="$func_to_host_path_result"
+                  else
+                    func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
+                  fi
+                fi
+              fi
+              IFS=:
+            done
+            IFS=$func_to_host_pathlist_oldIFS
+            ;;
+        esac
+        if test -z "$func_to_host_pathlist_result" ; then
+          func_error "Could not determine the host path(s) corresponding to"
+          func_error "  '$1'"
+          func_error "Continuing, but uninstalled executables may not work."
+          # Fallback. This may break if $1 contains DOS-style drive
+          # specifications. The fix is not to complicate the expression
+          # below, but for the user to provide a working wine installation
+          # with winepath so that path translation in the cross-to-mingw
+          # case works properly.
+          lt_replace_pathsep_nix_to_dos="s|:|;|g"
+          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
+            $SED -e "$lt_replace_pathsep_nix_to_dos"`
+        fi
+        # Now, add the leading and trailing path separators back
+        case "$1" in
+          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
+            ;;
+        esac
+        case "$1" in
+          *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
+            ;;
+        esac
+        ;;
+    esac
+  fi
+}
+# end: func_to_host_pathlist
 
 # func_emit_cwrapperexe_src
 # emit the source code for a wrapper executable on stdout
@@ -2951,6 +3160,12 @@
 # include 
 # ifdef __CYGWIN__
 #  include 
+#  define HAVE_SETENV
+#  ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+#  endif
 # endif
 #endif
 #include 
@@ -3057,29 +3272,105 @@
 int check_executable (const char *path);
 char *strendzap (char *str, const char *pat);
 void lt_fatal (const char *message, ...);
+void lt_setenv (const char *name, const char *value);
+char *lt_extend_str (const char *orig_value, const char *add, int to_end);
+void lt_opt_process_env_set (const char *arg);
+void lt_opt_process_env_prepend (const char *arg);
+void lt_opt_process_env_append (const char *arg);
+int lt_split_name_value (const char *arg, char** name, char** value);
+void lt_update_exe_path (const char *name, const char *value);
+void lt_update_lib_path (const char *name, const char *value);
 
-static const char *script_text =
+static const char *script_text_part1 =
 EOF
 
-	    func_emit_wrapper yes |
+	    func_emit_wrapper_part1 yes |
+	        $SED -e 's/\([\\"]\)/\\\1/g' \
+	             -e 's/^/  "/' -e 's/$/\\n"/'
+	    echo ";"
+	    cat </dev/null || echo $SHELL`
-		  case $lt_newargv0 in
-		    *.exe | *.EXE) ;;
-		    *) lt_newargv0=$lt_newargv0.exe ;;
-		  esac
-		  ;;
-		* ) lt_newargv0=$SHELL ;;
-	      esac
-	    fi
-
-		cat <")));
+  for (i = 0; i < newargc; i++)
     {
-      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, newargz[i]));
+      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "")));
     }
 
 EOF
 
 	    case $host_os in
 	      mingw*)
-		cat <"),
+                          (value ? value : "")));
+  {
+#ifdef HAVE_SETENV
+    /* always make a copy, for consistency with !HAVE_SETENV */
+    char *str = xstrdup (value);
+    setenv (name, str, 1);
+#else
+    int len = strlen (name) + 1 + strlen (value) + 1;
+    char *str = XMALLOC (char, len);
+    sprintf (str, "%s=%s", name, value);
+    if (putenv (str) != EXIT_SUCCESS)
+      {
+        XFREE (str);
+      }
+#endif
+  }
+}
+
+char *
+lt_extend_str (const char *orig_value, const char *add, int to_end)
+{
+  char *new_value;
+  if (orig_value && *orig_value)
+    {
+      int orig_value_len = strlen (orig_value);
+      int add_len = strlen (add);
+      new_value = XMALLOC (char, add_len + orig_value_len + 1);
+      if (to_end)
+        {
+          strcpy (new_value, orig_value);
+          strcpy (new_value + orig_value_len, add);
+        }
+      else
+        {
+          strcpy (new_value, add);
+          strcpy (new_value + add_len, orig_value);
+        }
+    }
+  else
+    {
+      new_value = xstrdup (add);
+    }
+  return new_value;
+}
+
+int
+lt_split_name_value (const char *arg, char** name, char** value)
+{
+  const char *p;
+  int len;
+  if (!arg || !*arg)
+    return 1;
+
+  p = strchr (arg, (int)'=');
+
+  if (!p)
+    return 1;
+
+  *value = xstrdup (++p);
+
+  len = strlen (arg) - strlen (*value);
+  *name = XMALLOC (char, len);
+  strncpy (*name, arg, len-1);
+  (*name)[len - 1] = '\0';
+
+  return 0;
+}
+
+void
+lt_opt_process_env_set (const char *arg)
+{
+  char *name = NULL;
+  char *value = NULL;
+
+  if (lt_split_name_value (arg, &name, &value) != 0)
+    {
+      XFREE (name);
+      XFREE (value);
+      lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
+    }
+
+  lt_setenv (name, value);
+  XFREE (name);
+  XFREE (value);
+}
+
+void
+lt_opt_process_env_prepend (const char *arg)
+{
+  char *name = NULL;
+  char *value = NULL;
+  char *new_value = NULL;
+
+  if (lt_split_name_value (arg, &name, &value) != 0)
+    {
+      XFREE (name);
+      XFREE (value);
+      lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
+    }
+
+  new_value = lt_extend_str (getenv (name), value, 0);
+  lt_setenv (name, new_value);
+  XFREE (new_value);
+  XFREE (name);
+  XFREE (value);
+}
+
+void
+lt_opt_process_env_append (const char *arg)
+{
+  char *name = NULL;
+  char *value = NULL;
+  char *new_value = NULL;
+
+  if (lt_split_name_value (arg, &name, &value) != 0)
+    {
+      XFREE (name);
+      XFREE (value);
+      lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
+    }
+
+  new_value = lt_extend_str (getenv (name), value, 1);
+  lt_setenv (name, new_value);
+  XFREE (new_value);
+  XFREE (name);
+  XFREE (value);
+}
+
+void
+lt_update_exe_path (const char *name, const char *value)
+{
+  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+                          (name ? name : ""),
+                          (value ? value : "")));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      /* some systems can't cope with a ':'-terminated path #' */
+      int len = strlen (new_value);
+      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+        {
+          new_value[len-1] = '\0';
+        }
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+void
+lt_update_lib_path (const char *name, const char *value)
+{
+  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+                          (name ? name : ""),
+                          (value ? value : "")));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+
 EOF
 }
 # end: func_emit_cwrapperexe_src
@@ -3515,7 +4033,7 @@
 {
     $opt_debug
     case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
       # It is impossible to link a dll without this setting, and
       # we shouldn't force the makefile maintainer to figure out
       # which system we are compiling for in order to pass an extra
@@ -3959,6 +4477,13 @@
       -L*)
 	func_stripname '-L' '' "$arg"
 	dir=$func_stripname_result
+	if test -z "$dir"; then
+	  if test "$#" -gt 0; then
+	    func_fatal_error "require no space between \`-L' and \`$1'"
+	  else
+	    func_fatal_error "need path for \`-L' option"
+	  fi
+	fi
 	# We need an absolute path.
 	case $dir in
 	[\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -3977,14 +4502,16 @@
 	  ;;
 	esac
 	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
 	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$dir:"*) ;;
+	  ::) dllsearchpath=$dir;;
 	  *) dllsearchpath="$dllsearchpath:$dir";;
 	  esac
 	  case :$dllsearchpath: in
 	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
 	  *) dllsearchpath="$dllsearchpath:$testbindir";;
 	  esac
 	  ;;
@@ -3995,7 +4522,7 @@
       -l*)
 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
 	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
 	    # These systems don't actually have a C or math library (as such)
 	    continue
 	    ;;
@@ -4072,7 +4599,7 @@
 
       -no-install)
 	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
 	  # The PATH hackery in wrapper scripts is required on Windows
 	  # and Darwin in order for the loader to find any dlls it needs.
 	  func_warning "\`-no-install' is ignored for $host"
@@ -4820,19 +5347,19 @@
 	    # It is a libtool convenience library, so add in its objects.
 	    convenience="$convenience $ladir/$objdir/$old_library"
 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+	    tmp_libs=
+	    for deplib in $dependency_libs; do
+	      deplibs="$deplib $deplibs"
+	      if $opt_duplicate_deps ; then
+		case "$tmp_libs " in
+		*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+		esac
+	      fi
+	      tmp_libs="$tmp_libs $deplib"
+	    done
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
 	    func_fatal_error "\`$lib' is not a convenience library"
 	  fi
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    deplibs="$deplib $deplibs"
-	    if $opt_duplicate_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done
 	  continue
 	fi # $pass = conv
 
@@ -5032,7 +5559,7 @@
 	if test -n "$library_names" &&
 	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
 	  case $host in
-	  *cygwin* | *mingw*)
+	  *cygwin* | *mingw* | *cegcc*)
 	      # No point in relinking DLLs because paths are not encoded
 	      notinst_deplibs="$notinst_deplibs $lib"
 	      need_relink=no
@@ -5102,7 +5629,7 @@
 	    elif test -n "$soname_spec"; then
 	      # bleh windows
 	      case $host in
-	      *cygwin* | mingw*)
+	      *cygwin* | mingw* | *cegcc*)
 	        func_arith $current - $age
 		major=$func_arith_result
 		versuffix="-$major"
@@ -5369,6 +5896,7 @@
 	  if test "$link_all_deplibs" != no; then
 	    # Add the search paths of all dependency libraries
 	    for deplib in $dependency_libs; do
+	      path=
 	      case $deplib in
 	      -L*) path="$deplib" ;;
 	      *.la)
@@ -5884,7 +6412,7 @@
 	tempremovelist=`$ECHO "$output_objdir/*"`
 	for p in $tempremovelist; do
 	  case $p in
-	    *.$objext)
+	    *.$objext | *.gcno)
 	       ;;
 	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
 	       if test "X$precious_files_regex" != "X"; then
@@ -5955,7 +6483,7 @@
       if test "$build_libtool_libs" = yes; then
 	if test -n "$rpath"; then
 	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
 	    # these systems don't actually have a c library (as such)!
 	    ;;
 	  *-*-rhapsody* | *-*-darwin1.[012])
@@ -6454,7 +6982,7 @@
 
 	orig_export_symbols=
 	case $host_os in
-	cygwin* | mingw*)
+	cygwin* | mingw* | cegcc*)
 	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
 	    # exporting using user supplied symfile
 	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
@@ -7079,14 +7607,16 @@
 	  esac
 	fi
 	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
 	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$libdir:"*) ;;
+	  ::) dllsearchpath=$libdir;;
 	  *) dllsearchpath="$dllsearchpath:$libdir";;
 	  esac
 	  case :$dllsearchpath: in
 	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
 	  *) dllsearchpath="$dllsearchpath:$testbindir";;
 	  esac
 	  ;;
@@ -7156,6 +7686,10 @@
           wrappers_required=no
         fi
         ;;
+      *cegcc)
+        # Disable wrappers for cegcc, we are cross compiling anyway.
+        wrappers_required=no
+        ;;
       *)
         if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
           wrappers_required=no
@@ -7308,11 +7842,10 @@
 
 	    func_emit_cwrapperexe_src > $cwrappersource
 
-	    # we should really use a build-platform specific compiler
-	    # here, but OTOH, the wrappers (shell script and this C one)
-	    # are only useful if you want to execute the "real" binary.
-	    # Since the "real" binary is built for $host, then this
-	    # wrapper might as well be built for $host, too.
+	    # The wrapper executable is built using the $host compiler,
+	    # because it contains $host paths and files. If cross-
+	    # compiling, it, like the target executable, must be
+	    # executed on the $host or under an emulation environment.
 	    $opt_dry_run || {
 	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
 	      $STRIP $cwrapper
@@ -7597,7 +8130,7 @@
 	  # place dlname in correct position for cygwin
 	  tdlname=$dlname
 	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
 	  esac
 	  $ECHO > $output "\
 # $outputname - a libtool library file
diff -Nru liboggz-1.1.0/m4/ac-sys-extra-largefile.m4 liboggz-1.1.1/m4/ac-sys-extra-largefile.m4
--- liboggz-1.1.0/m4/ac-sys-extra-largefile.m4	1970-01-01 00:00:00.000000000 +0000
+++ liboggz-1.1.1/m4/ac-sys-extra-largefile.m4	2010-01-30 05:55:59.000000000 +0000
@@ -0,0 +1,114 @@
+dnl By default, many hosts won't let programs access large files;
+dnl one must use special compiler options to get large-file access to work.
+dnl For more details about this brain damage please see:
+dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html
+
+dnl Written by Paul Eggert .
+
+dnl Internal subroutine of AC_SYS_EXTRA_LARGEFILE.
+dnl AC_SYS_EXTRA_LARGEFILE_FLAGS(FLAGSNAME)
+AC_DEFUN([AC_SYS_EXTRA_LARGEFILE_FLAGS],
+  [AC_CACHE_CHECK([for $1 value to request large file support],
+     ac_cv_sys_largefile_$1,
+     [ac_cv_sys_largefile_$1=`($GETCONF LFS_$1) 2>/dev/null` || {
+	ac_cv_sys_largefile_$1=no
+	ifelse($1, CFLAGS,
+	  [case "$host_os" in
+	   # IRIX 6.2 and later require cc -n32.
+changequote(, )dnl
+	   irix6.[2-9]* | irix6.1[0-9]* | irix[7-9].* | irix[1-9][0-9]*)
+changequote([, ])dnl
+	     if test "$GCC" != yes; then
+	       ac_cv_sys_largefile_CFLAGS=-n32
+	     fi
+	     ac_save_CC="$CC"
+	     CC="$CC $ac_cv_sys_largefile_CFLAGS"
+	     AC_TRY_LINK(, , , ac_cv_sys_largefile_CFLAGS=no)
+	     CC="$ac_save_CC"
+	   esac])
+      }])])
+
+dnl Internal subroutine of AC_SYS_EXTRA_LARGEFILE.
+dnl AC_SYS_EXTRA_LARGEFILE_SPACE_APPEND(VAR, VAL)
+AC_DEFUN([AC_SYS_EXTRA_LARGEFILE_SPACE_APPEND],
+  [case $2 in
+   no) ;;
+   ?*)
+     case "[$]$1" in
+     '') $1=$2 ;;
+     *) $1=[$]$1' '$2 ;;
+     esac ;;
+   esac])
+
+dnl Internal subroutine of AC_SYS_EXTRA_LARGEFILE.
+dnl AC_SYS_EXTRA_LARGEFILE_MACRO_VALUE(C-MACRO, CACHE-VAR, COMMENT, CODE-TO-SET-DEFAULT)
+AC_DEFUN([AC_SYS_EXTRA_LARGEFILE_MACRO_VALUE],
+  [AC_CACHE_CHECK([for $1], $2,
+     [$2=no
+changequote(, )dnl
+      $4
+      for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do
+	case "$ac_flag" in
+	-D$1)
+	  $2=1 ;;
+	-D$1=*)
+	  $2=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;;
+	esac
+      done
+changequote([, ])dnl
+      ])
+   if test "[$]$2" != no; then
+     AC_DEFINE_UNQUOTED([$1], [$]$2, [$3])
+   fi])
+
+AC_DEFUN([AC_SYS_EXTRA_LARGEFILE],
+  [AC_REQUIRE([AC_CANONICAL_HOST])
+   AC_ARG_ENABLE(largefile,
+     [  --disable-largefile     omit support for large files])
+   if test "$enable_largefile" != no; then
+     AC_CHECK_TOOL(GETCONF, getconf)
+     AC_SYS_EXTRA_LARGEFILE_FLAGS(CFLAGS)
+     AC_SYS_EXTRA_LARGEFILE_FLAGS(LDFLAGS)
+     AC_SYS_EXTRA_LARGEFILE_FLAGS(LIBS)
+
+     for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do
+       case "$ac_flag" in
+       no) ;;
+       -D_FILE_OFFSET_BITS=*) ;;
+       -D_LARGEFILE_SOURCE | -D_LARGEFILE_SOURCE=*) ;;
+       -D_LARGE_FILES | -D_LARGE_FILES=*) ;;
+       -D?* | -I?*)
+	 AC_SYS_EXTRA_LARGEFILE_SPACE_APPEND(CPPFLAGS, "$ac_flag") ;;
+       *)
+	 AC_SYS_EXTRA_LARGEFILE_SPACE_APPEND(CFLAGS, "$ac_flag") ;;
+       esac
+     done
+     AC_SYS_EXTRA_LARGEFILE_SPACE_APPEND(LDFLAGS, "$ac_cv_sys_largefile_LDFLAGS")
+     AC_SYS_EXTRA_LARGEFILE_SPACE_APPEND(LIBS, "$ac_cv_sys_largefile_LIBS")
+     AC_SYS_EXTRA_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS,
+       ac_cv_sys_file_offset_bits,
+       [Number of bits in a file offset, on hosts where this is settable.])
+       [case "$host_os" in
+	# HP-UX 10.20 and later
+	hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)
+	  ac_cv_sys_file_offset_bits=64 ;;
+	esac]
+     AC_SYS_EXTRA_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE,
+       ac_cv_sys_largefile_source,
+       [Define to make fseeko etc. visible, on some hosts.],
+       [case "$host_os" in
+	# HP-UX 10.20 and later
+	hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)
+	  ac_cv_sys_largefile_source=1 ;;
+	esac])
+     AC_SYS_EXTRA_LARGEFILE_MACRO_VALUE(_LARGE_FILES,
+       ac_cv_sys_large_files,
+       [Define for large files, on AIX-style hosts.],
+       [case "$host_os" in
+	# AIX 4.2 and later
+	aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*)
+	  ac_cv_sys_large_files=1 ;;
+	esac])
+   fi
+  ])
+
diff -Nru liboggz-1.1.0/m4/as-ac-expand.m4 liboggz-1.1.1/m4/as-ac-expand.m4
--- liboggz-1.1.0/m4/as-ac-expand.m4	1970-01-01 00:00:00.000000000 +0000
+++ liboggz-1.1.1/m4/as-ac-expand.m4	2010-01-30 05:55:59.000000000 +0000
@@ -0,0 +1,43 @@
+dnl as-ac-expand.m4 0.2.0
+dnl autostars m4 macro for expanding directories using configure's prefix
+dnl thomas@apestaart.org
+
+dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
+dnl example
+dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
+dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
+
+AC_DEFUN([AS_AC_EXPAND],
+[
+  EXP_VAR=[$1]
+  FROM_VAR=[$2]
+
+  dnl first expand prefix and exec_prefix if necessary
+  prefix_save=$prefix
+  exec_prefix_save=$exec_prefix
+
+  dnl if no prefix given, then use /usr/local, the default prefix
+  if test "x$prefix" = "xNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  dnl if no exec_prefix given, then use prefix
+  if test "x$exec_prefix" = "xNONE"; then
+    exec_prefix=$prefix
+  fi
+
+  full_var="$FROM_VAR"
+  dnl loop until it doesn't change anymore
+  while true; do
+    new_full_var="`eval echo $full_var`"
+    if test "x$new_full_var" = "x$full_var"; then break; fi
+    full_var=$new_full_var
+  done
+
+  dnl clean up
+  full_var=$new_full_var
+  AC_SUBST([$1], "$full_var")
+
+  dnl restore prefix and exec_prefix
+  prefix=$prefix_save
+  exec_prefix=$exec_prefix_save
+])
diff -Nru liboggz-1.1.0/Makefile.in liboggz-1.1.1/Makefile.in
--- liboggz-1.1.0/Makefile.in	2009-10-08 09:21:14.000000000 +0000
+++ liboggz-1.1.1/Makefile.in	2010-04-29 01:39:46.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -28,8 +29,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -50,10 +52,11 @@
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(srcdir)/oggz-uninstalled.pc.in $(srcdir)/oggz.pc.in \
 	$(top_srcdir)/apache/oggz-chop.conf.in $(top_srcdir)/configure \
-	AUTHORS COPYING ChangeLog INSTALL NEWS config.guess config.sub \
-	depcomp install-sh ltmain.sh missing
+	AUTHORS COPYING ChangeLog INSTALL NEWS TODO config.guess \
+	config.sub depcomp install-sh ltmain.sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac-sys-extra-largefile.m4 \
+	$(top_srcdir)/m4/as-ac-expand.m4 $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -62,6 +65,7 @@
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = apache/oggz-chop.conf oggz.pc oggz-uninstalled.pc
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -76,12 +80,29 @@
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
-pkgconfigDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(pkgconfig_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -89,9 +110,34 @@
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
+  { test ! -d "$(distdir)" \
+    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr "$(distdir)"; }; }
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
@@ -148,6 +194,7 @@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OGGZ_OFF_MAX = @OGGZ_OFF_MAX@
 OGG_CFLAGS = @OGG_CFLAGS@
@@ -159,6 +206,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -227,6 +275,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror
@@ -348,15 +397,15 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -372,9 +421,10 @@
 	$(SHELL) ./config.status --recheck
 
 $(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
+	$(am__cd) $(srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
 
 config.h: stamp-h1
 	@if test ! -f $@; then \
@@ -386,7 +436,7 @@
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
 $(srcdir)/config.h.in:  $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
 	rm -f stamp-h1
 	touch $@
 
@@ -406,24 +456,27 @@
 	-rm -rf .libs _libs
 
 distclean-libtool:
-	-rm -f libtool
+	-rm -f libtool config.lt
 install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
-	@list='$(pkgconfig_DATA)'; for p in $$list; do \
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
-	  $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
 	done
 
 uninstall-pkgconfigDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(pkgconfig_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
-	done
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -432,7 +485,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -449,7 +502,7 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -457,7 +510,7 @@
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -483,16 +536,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -500,14 +553,14 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -519,7 +572,7 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
@@ -528,36 +581,41 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	test -d $(distdir) || mkdir $(distdir)
+	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -573,38 +631,55 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
 	done
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	-test -n "$(am__skip_mode_fix)" \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
+	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
@@ -617,6 +692,10 @@
 	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
 	$(am__remove_distdir)
 
+dist-xz: distdir
+	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	$(am__remove_distdir)
+
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
@@ -640,15 +719,17 @@
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.xz*) \
+	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
@@ -656,9 +737,11 @@
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
+	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
+	  && am__cwd=`pwd` \
+	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
@@ -680,13 +763,15 @@
 	  && rm -rf "$$dc_destdir" \
 	  && $(MAKE) $(AM_MAKEFLAGS) dist \
 	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+	  && cd "$$am__cwd" \
+	  || exit 1
 	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
+	@$(am__cd) '$(distuninstallcheck_dir)' \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
@@ -731,6 +816,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -751,6 +837,8 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -759,18 +847,28 @@
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -793,25 +891,26 @@
 
 uninstall-am: uninstall-pkgconfigDATA
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+	ctags-recursive install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am am--refresh check check-am clean clean-generic \
 	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
-	distclean distclean-generic distclean-hdr distclean-libtool \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-pkgconfigDATA
+	dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
+	distcheck distclean distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pkgconfigDATA install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-pkgconfigDATA
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Nru liboggz-1.1.0/missing liboggz-1.1.1/missing
--- liboggz-1.1.0/missing	2008-04-07 08:59:36.000000000 +0000
+++ liboggz-1.1.1/missing	2010-01-18 06:28:57.000000000 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2003-09-02.23
+scriptversion=2009-04-28.21; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 
-#   Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard , 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see .
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -33,6 +31,8 @@
 fi
 
 run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
 
 # In the cases where this matters, `missing' is being run in the
 # srcdir already.
@@ -44,7 +44,7 @@
 
 msg="missing on your system"
 
-case "$1" in
+case $1 in
 --run)
   # Try to run requested program, and just exit if it succeeds.
   run=
@@ -60,11 +60,6 @@
     msg="probably too old"
   fi
   ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
 
   -h|--h|--he|--hel|--help)
     echo "\
@@ -82,6 +77,7 @@
   aclocal      touch file \`aclocal.m4'
   autoconf     touch file \`configure'
   autoheader   touch file \`config.h.in'
+  autom4te     touch the output file, or create a stub one
   automake     touch all \`Makefile.in' files
   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
   flex         create \`lex.yy.c', if possible, from existing .c
@@ -91,11 +87,16 @@
   tar          try tar, gnutar, gtar, then tar without non-portable flags
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
 Send bug reports to ."
+    exit $?
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
     echo "missing $scriptversion (GNU Automake)"
+    exit $?
     ;;
 
   -*)
@@ -104,12 +105,49 @@
     exit 1
     ;;
 
-  aclocal*)
+esac
+
+# normalize program name to check for.
+program=`echo "$1" | sed '
+  s/^gnu-//; t
+  s/^gnu//; t
+  s/^g//; t'`
+
+# Now exit if we have it, but it failed.  Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).  This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+  lex*|yacc*)
+    # Not GNU programs, they don't have --version.
+    ;;
+
+  tar*)
+    if test -n "$run"; then
+       echo 1>&2 "ERROR: \`tar' requires --run"
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       exit 1
+    fi
+    ;;
+
+  *)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.
        exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       # Could not run --version or --help.  This is probably someone
+       # running `$TOOL --version' or `$TOOL --help' to check whether
+       # $TOOL exists and not knowing $TOOL uses missing.
+       exit 1
     fi
+    ;;
+esac
 
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $program in
+  aclocal*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
@@ -118,12 +156,7 @@
     touch aclocal.m4
     ;;
 
-  autoconf)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
+  autoconf*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`${configure_ac}'.  You might want to install the
@@ -132,12 +165,7 @@
     touch configure
     ;;
 
-  autoheader)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
+  autoheader*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`acconfig.h' or \`${configure_ac}'.  You might want
@@ -147,7 +175,7 @@
     test -z "$files" && files="config.h"
     touch_files=
     for f in $files; do
-      case "$f" in
+      case $f in
       *:*) touch_files="$touch_files "`echo "$f" |
 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
       *) touch_files="$touch_files $f.in";;
@@ -157,11 +185,6 @@
     ;;
 
   automake*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
@@ -172,12 +195,7 @@
 	   while read f; do touch "$f"; done
     ;;
 
-  autom4te)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
+  autom4te*)
     echo 1>&2 "\
 WARNING: \`$1' is needed, but is $msg.
          You might have modified some files without having the
@@ -185,8 +203,8 @@
          You can get \`$1' as part of \`Autoconf' from any GNU
          archive site."
 
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -f "$file"; then
 	touch $file
     else
@@ -200,90 +218,78 @@
     fi
     ;;
 
-  bison|yacc)
+  bison*|yacc*)
     echo 1>&2 "\
 WARNING: \`$1' $msg.  You should only need it if
          you modified a \`.y' file.  You may need the \`Bison' package
          in order for those modifications to take effect.  You can get
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.c
 	    fi
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.h
 	    fi
 	  ;;
 	esac
     fi
-    if [ ! -f y.tab.h ]; then
+    if test ! -f y.tab.h; then
 	echo >y.tab.h
     fi
-    if [ ! -f y.tab.c ]; then
+    if test ! -f y.tab.c; then
 	echo 'main() { return 0; }' >y.tab.c
     fi
     ;;
 
-  lex|flex)
+  lex*|flex*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified a \`.l' file.  You may need the \`Flex' package
          in order for those modifications to take effect.  You can get
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" lex.yy.c
 	    fi
 	  ;;
 	esac
     fi
-    if [ ! -f lex.yy.c ]; then
+    if test ! -f lex.yy.c; then
 	echo 'main() { return 0; }' >lex.yy.c
     fi
     ;;
 
-  help2man)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
+  help2man*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
 	 you modified a dependency of a manual page.  You may need the
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
 
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
 	touch $file
     else
 	test -z "$file" || exec >$file
 	echo ".ab help2man is required to generate this page"
-	exit 1
+	exit $?
     fi
     ;;
 
-  makeinfo)
-    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-       # We have makeinfo, but it failed.
-       exit 1
-    fi
-
+  makeinfo*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -291,20 +297,29 @@
          call might also be the consequence of using a buggy \`make' (AIX,
          DU, IRIX).  You might want to install the \`Texinfo' package or
          the \`GNU make' package.  Grab either from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    # The file to touch is that specified with -o ...
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-    fi
+      # ... or it is the one specified with @setfilename ...
+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '
+	/^@setfilename/{
+	  s/.* \([^ ]*\) *$/\1/
+	  p
+	  q
+	}' $infile`
+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+    fi
+    # If the file does not exist, the user really needs makeinfo;
+    # let's fail without touching anything.
+    test -f $file || exit 1
     touch $file
     ;;
 
-  tar)
+  tar*)
     shift
-    if test -n "$run"; then
-      echo 1>&2 "ERROR: \`tar' requires --run"
-      exit 1
-    fi
 
     # We have already tried tar in the generic part.
     # Look for gnutar/gtar before invocation to avoid ugly error
@@ -317,13 +332,13 @@
     fi
     firstarg="$1"
     if shift; then
-	case "$firstarg" in
+	case $firstarg in
 	*o*)
 	    firstarg=`echo "$firstarg" | sed s/o//`
 	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
-	case "$firstarg" in
+	case $firstarg in
 	*h*)
 	    firstarg=`echo "$firstarg" | sed s/h//`
 	    tar "$firstarg" "$@" && exit 0
@@ -356,5 +371,6 @@
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff -Nru liboggz-1.1.0/PATCHES liboggz-1.1.1/PATCHES
--- liboggz-1.1.0/PATCHES	2009-09-10 14:02:48.000000000 +0000
+++ liboggz-1.1.1/PATCHES	2010-04-20 12:24:25.000000000 +0000
@@ -2,6 +2,7 @@
 ------------------
 
 First ensure you have an up-to-date checkout of the git repository.
+liboggz is maintained in git at git://git.xiph.org/liboggz.git
 
 Please generate patches using git-format-patch. You'll just need to commit
 your changes to your local copy first:
diff -Nru liboggz-1.1.0/README liboggz-1.1.1/README
--- liboggz-1.1.0/README	2009-10-07 05:42:00.000000000 +0000
+++ liboggz-1.1.1/README	2010-04-20 12:24:25.000000000 +0000
@@ -74,6 +74,18 @@
     win32/             files necessary to compile the library and tools for
                        Microsoft Windows
 
+Developers
+----------
+
+liboggz is maintained in git at git://git.xiph.org/liboggz.git
+
+A list of outstanding tasks is maintained in the TODO file of this source
+distribution. When implementing anything listed in this file, please update
+it by deleting that entry, and include that as part of the patch or commit
+that implements the fix.
+
+Please send patches to ogg-dev@xiph.org
+
 Programming with liboggz
 ------------------------
 
diff -Nru liboggz-1.1.0/src/examples/Makefile.in liboggz-1.1.1/src/examples/Makefile.in
--- liboggz-1.1.0/src/examples/Makefile.in	2009-10-08 09:21:14.000000000 +0000
+++ liboggz-1.1.1/src/examples/Makefile.in	2010-04-29 01:39:46.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -37,13 +39,15 @@
 subdir = src/examples
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac-sys-extra-largefile.m4 \
+	$(top_srcdir)/m4/as-ac-expand.m4 $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 @OGGZ_CONFIG_READ_TRUE@@OGGZ_CONFIG_WRITE_TRUE@am__EXEEXT_1 = identity$(EXEEXT) \
 @OGGZ_CONFIG_READ_TRUE@@OGGZ_CONFIG_WRITE_TRUE@	rewrite-pages$(EXEEXT) \
 @OGGZ_CONFIG_READ_TRUE@@OGGZ_CONFIG_WRITE_TRUE@	fix-eos$(EXEEXT) \
@@ -84,6 +88,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -158,6 +163,7 @@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OGGZ_OFF_MAX = @OGGZ_OFF_MAX@
 OGG_CFLAGS = @OGG_CFLAGS@
@@ -169,6 +175,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -237,6 +244,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 INCLUDES = -I$(top_builddir) -I$(top_builddir)/include \
@@ -274,14 +282,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/examples/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/examples/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/examples/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu src/examples/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -299,13 +307,16 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 dump-comments$(EXEEXT): $(dump_comments_OBJECTS) $(dump_comments_DEPENDENCIES) 
 	@rm -f dump-comments$(EXEEXT)
 	$(LINK) $(dump_comments_OBJECTS) $(dump_comments_LDADD) $(LIBS)
@@ -352,21 +363,21 @@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -382,14 +393,14 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -397,29 +408,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -440,13 +456,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -474,6 +494,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -495,6 +516,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -503,18 +526,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -552,6 +585,7 @@
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru liboggz-1.1.0/src/liboggz/Makefile.in liboggz-1.1.1/src/liboggz/Makefile.in
--- liboggz-1.1.0/src/liboggz/Makefile.in	2009-10-08 09:21:14.000000000 +0000
+++ liboggz-1.1.1/src/liboggz/Makefile.in	2010-04-29 01:39:46.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -37,21 +39,37 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/Version_script.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac-sys-extra-largefile.m4 \
+	$(top_srcdir)/m4/as-ac-expand.m4 $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = Version_script
+CONFIG_CLEAN_VPATH_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__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(libdir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 liboggz_la_DEPENDENCIES =
 am_liboggz_la_OBJECTS = oggz.lo oggz_comments.lo oggz_io.lo \
@@ -65,6 +83,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -131,6 +150,7 @@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OGGZ_OFF_MAX = @OGGZ_OFF_MAX@
 OGG_CFLAGS = @OGG_CFLAGS@
@@ -142,6 +162,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -210,6 +231,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 INCLUDES = $(INCLTDL) \
@@ -247,14 +269,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/liboggz/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/liboggz/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/liboggz/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu src/liboggz/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -272,25 +294,30 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 Version_script: $(top_builddir)/config.status $(srcdir)/Version_script.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; 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"; \
+	    list2="$$list2 $$p"; \
 	  else :; fi; \
-	done
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
 
 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"; \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -326,21 +353,21 @@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -356,14 +383,14 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -371,29 +398,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -414,13 +446,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -451,6 +487,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -472,6 +509,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -480,18 +519,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libLTLIBRARIES
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -530,6 +579,7 @@
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-libLTLIBRARIES
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru liboggz-1.1.0/src/liboggz/oggz_auto.c liboggz-1.1.1/src/liboggz/oggz_auto.c
--- liboggz-1.1.0/src/liboggz/oggz_auto.c	2009-09-22 09:55:43.000000000 +0000
+++ liboggz-1.1.1/src/liboggz/oggz_auto.c	2010-04-24 00:34:52.000000000 +0000
@@ -371,8 +371,10 @@
   info = oggz_malloc(sizeof(dirac_info));
   if (info == NULL) return -1;
 
-  if (dirac_parse_info(info, data, length) == -1)
+  if (dirac_parse_info(info, data, length) == -1) {
+    oggz_free (info);
     return -1;
+  }
 
   /* the granulerate is twice the frame rate (in order to handle interlace) */
   oggz_set_granulerate (oggz, serialno,
@@ -1088,7 +1090,7 @@
   {"Speex", 5, "Speex", auto_speex, auto_calc_speex, NULL},
   {"PCM     ", 8, "PCM", auto_oggpcm2, NULL, NULL},
   {"CMML\0\0\0\0", 8, "CMML", auto_cmml, NULL, NULL},
-  {"Annodex", 8, "Annodex", auto_annodex, NULL, NULL},
+  {"Annodex", 7, "Annodex", auto_annodex, NULL, NULL},
   {"fishead", 7, "Skeleton", auto_fishead, NULL, NULL},
   {"fLaC", 4, "Flac0", auto_flac0, auto_calc_flac, NULL},
   {"\177FLAC", 5, "Flac", auto_flac, auto_calc_flac, NULL},
diff -Nru liboggz-1.1.0/src/liboggz/oggz.c liboggz-1.1.1/src/liboggz/oggz.c
--- liboggz-1.1.0/src/liboggz/oggz.c	2009-09-10 14:00:20.000000000 +0000
+++ liboggz-1.1.1/src/liboggz/oggz.c	2010-02-11 08:35:05.000000000 +0000
@@ -215,7 +215,7 @@
   oggz_vector_foreach (oggz->streams, oggz_stream_clear);
   oggz_vector_delete (oggz->streams);
 
-  assert(oggz_dlist_is_empty(oggz->packet_buffer));
+  oggz_dlist_deliter(oggz->packet_buffer, oggz_read_free_pbuffers);
   oggz_dlist_delete(oggz->packet_buffer);
   
   if (oggz->metric_internal)
diff -Nru liboggz-1.1.0/src/liboggz/oggz_comments.c liboggz-1.1.1/src/liboggz/oggz_comments.c
--- liboggz-1.1.0/src/liboggz/oggz_comments.c	2009-09-10 14:02:48.000000000 +0000
+++ liboggz-1.1.1/src/liboggz/oggz_comments.c	2010-04-20 12:24:25.000000000 +0000
@@ -147,11 +147,11 @@
                                      buf[base+2]=(char)((val)&0xff);
 
 static int
-oggz_comment_validate_byname (const char * name, const char * value)
+oggz_comment_validate_byname (const char * name)
 {
   const char * c;
 
-  if (!name || !value) return 0;
+  if (!name) return 0;
 
   for (c = name; *c; c++) {
     if (*c < 0x20 || *c > 0x7D || *c == 0x3D) {
@@ -172,8 +172,8 @@
 {
   OggzComment * comment;
 
-  if (!oggz_comment_validate_byname (name, value)) return NULL;
-  /* Ensures that name != NULL, value != NULL, and validates strings */
+  if (!oggz_comment_validate_byname (name)) return NULL;
+  /* Ensures that name != NULL and contains only valid characters */
 
   comment = oggz_malloc (sizeof (OggzComment));
   if (comment == NULL) return NULL;
@@ -184,11 +184,15 @@
     return NULL;
   }
 
-  comment->value = oggz_strdup (value);
-  if (comment->value == NULL) {
-    oggz_free (comment->name);
-    oggz_free (comment);
-    return NULL;
+  if (value) {
+    comment->value = oggz_strdup (value);
+    if (comment->value == NULL) {
+      oggz_free (comment->name);
+      oggz_free (comment);
+      return NULL;
+    }
+  } else {
+    comment->value = NULL;
   }
 
   return comment;
@@ -302,7 +306,7 @@
 
   if (name == NULL) return oggz_vector_nth_p (stream->comments, 0);
 
-  if (!oggz_comment_validate_byname (name, ""))
+  if (!oggz_comment_validate_byname (name))
     return NULL;
 
   for (i = 0; i < oggz_vector_size (stream->comments); i++) {
@@ -397,7 +401,7 @@
   if (oggz->flags & OGGZ_WRITE) {
     if (OGGZ_CONFIG_WRITE) {
 
-      if (!oggz_comment_validate_byname (comment->name, comment->value))
+      if (!oggz_comment_validate_byname (comment->name))
         return OGGZ_ERR_COMMENT_INVALID;
 
       if (_oggz_comment_add_byname (stream, comment->name, comment->value) == NULL)
@@ -430,7 +434,7 @@
   if (oggz->flags & OGGZ_WRITE) {
     if (OGGZ_CONFIG_WRITE) {
 
-      if (!oggz_comment_validate_byname (name, value))
+      if (!oggz_comment_validate_byname (name))
         return OGGZ_ERR_COMMENT_INVALID;
 
       if (_oggz_comment_add_byname (stream, name, value) == NULL)
@@ -615,19 +619,22 @@
       c+=4;
       if (len>(size_t)(end-c)) return -1;
 
+      n = 0;
       name = c;
       value = oggz_index_len (c, '=', len);
       if (value) {
          *value = '\0';
          value++;
-
          n = c+len - value;
+      }
+
+      if (n != 0) {
          if ((nvalue = oggz_strdup_len (value, n)) == NULL)
            return OGGZ_ERR_OUT_OF_MEMORY;
 
 #ifdef DEBUG
-         printf ("oggz_comments_decode: %s -> %s (length %d)\n",
-         name, nvalue, n);
+         printf ("oggz_comments_decode: [%d] %s -> %s (length %d)\n",
+         i, name, nvalue, n);
 #endif
          if (_oggz_comment_add_byname (stream, name, nvalue) == NULL) {
            oggz_free (nvalue);
@@ -636,9 +643,19 @@
 
          oggz_free (nvalue);
       } else {
+        /* For the case of a comment which is not in key=value form,
+         * duplicate exactly the length of the comment, as it is
+         * not NUL-terminated. In the case of the last comment of the
+         * packet, it will be followed immediately by a framing bit.
+         */
          if ((nvalue = oggz_strdup_len (name, len)) == NULL)
            return OGGZ_ERR_OUT_OF_MEMORY;
 
+#ifdef DEBUG
+         printf ("oggz_comments_decode: [%d] %s (no value) (length %d)\n",
+         i, nvalue, len);
+#endif
+
          if (_oggz_comment_add_byname (stream, nvalue, NULL) == NULL) {
            oggz_free (nvalue);
            return OGGZ_ERR_OUT_OF_MEMORY;
diff -Nru liboggz-1.1.0/src/liboggz/oggz_dlist.c liboggz-1.1.1/src/liboggz/oggz_dlist.c
--- liboggz-1.1.0/src/liboggz/oggz_dlist.c	2009-04-11 07:20:46.000000000 +0000
+++ liboggz-1.1.1/src/liboggz/oggz_dlist.c	2010-04-20 11:49:00.000000000 +0000
@@ -138,17 +138,23 @@
   return 0;
 }
 
-void
+int
 oggz_dlist_iter(OggzDList *dlist, OggzDListIterFunc func) {
 
   OggzDListElem *p;
 
   for (p = dlist->head->next; p != dlist->tail; p = p->next) {
-    if (func(p->data) == DLIST_ITER_CANCEL) {
+    int r = func(p->data);
+    if (r == DLIST_ITER_ERROR) {
+      return -1;
+    }
+
+    if (r == DLIST_ITER_CANCEL) {
       break;
     }
   }
 
+  return 0;
 }
 
 void
@@ -163,13 +169,19 @@
   }
 }
 
-void
+int
 oggz_dlist_deliter(OggzDList *dlist, OggzDListIterFunc func) {
 
   OggzDListElem *p, *q;
+  int result = 0;
 
   for (p = dlist->head->next; p != dlist->tail; p = q) {
-    if (func(p->data) == DLIST_ITER_CANCEL) {
+    int r = func(p->data);
+    if (r == DLIST_ITER_ERROR) {
+      result = -1;
+    }
+
+    if (r == DLIST_ITER_CANCEL) {
       break;
     }
 
@@ -179,7 +191,7 @@
 
     oggz_free(p);
   }
-
+  return result;
 }
 
 void
@@ -191,7 +203,6 @@
     if (func(p->data) == DLIST_ITER_CANCEL) {
       break;
     }
-
     q = p->prev;
     p->prev->next = p->next;
     p->next->prev = p->prev;
diff -Nru liboggz-1.1.0/src/liboggz/oggz_dlist.h liboggz-1.1.1/src/liboggz/oggz_dlist.h
--- liboggz-1.1.0/src/liboggz/oggz_dlist.h	2009-04-11 07:20:46.000000000 +0000
+++ liboggz-1.1.1/src/liboggz/oggz_dlist.h	2010-04-20 11:49:00.000000000 +0000
@@ -36,7 +36,7 @@
 struct _OggzDList;
 typedef struct _OggzDList OggzDList;
 
-typedef enum {DLIST_ITER_CANCEL, DLIST_ITER_CONTINUE} OggzDListIterResponse;
+typedef enum {DLIST_ITER_ERROR=-1, DLIST_ITER_CANCEL=0, DLIST_ITER_CONTINUE=1} OggzDListIterResponse;
 
 typedef OggzDListIterResponse (*OggzDListIterFunc) (void *elem);
 
@@ -55,13 +55,13 @@
 int
 oggz_dlist_prepend(OggzDList *dlist, void *elem);
 
-void
+int
 oggz_dlist_iter(OggzDList *dlist, OggzDListIterFunc func);
 
 void
 oggz_dlist_reverse_iter(OggzDList *dlist, OggzDListIterFunc func);
 
-void
+int
 oggz_dlist_deliter(OggzDList *dlist, OggzDListIterFunc func);
 
 void
diff -Nru liboggz-1.1.0/src/liboggz/oggz_private.h liboggz-1.1.1/src/liboggz/oggz_private.h
--- liboggz-1.1.0/src/liboggz/oggz_private.h	2009-10-08 09:17:41.000000000 +0000
+++ liboggz-1.1.1/src/liboggz/oggz_private.h	2010-04-29 01:13:19.000000000 +0000
@@ -328,4 +328,7 @@
 long oggz_io_tell (OGGZ * oggz);
 int oggz_io_flush (OGGZ * oggz);
 
+/* oggz_read */
+OggzDListIterResponse oggz_read_free_pbuffers(void *elem);
+
 #endif /* __OGGZ_PRIVATE_H__ */
diff -Nru liboggz-1.1.0/src/liboggz/oggz_read.c liboggz-1.1.1/src/liboggz/oggz_read.c
--- liboggz-1.1.0/src/liboggz/oggz_read.c	2009-10-08 09:17:41.000000000 +0000
+++ liboggz-1.1.1/src/liboggz/oggz_read.c	2010-04-29 01:13:19.000000000 +0000
@@ -261,6 +261,16 @@
 }
 
 OggzDListIterResponse
+oggz_read_free_pbuffers(void *elem)
+{
+  OggzBufferedPacket *p = (OggzBufferedPacket *)elem;
+
+  oggz_read_free_pbuffer_entry(p);
+
+  return DLIST_ITER_CONTINUE;
+}
+
+OggzDListIterResponse
 oggz_read_update_gp(void *elem) {
 
   OggzBufferedPacket *p = (OggzBufferedPacket *)elem;
@@ -291,6 +301,7 @@
   OggzBufferedPacket *p = (OggzBufferedPacket *)elem;
   ogg_int64_t gp_stored;
   ogg_int64_t unit_stored;
+  int cb_ret;
 
   if (p->zp.pos.calc_granulepos == -1) {
     return DLIST_ITER_CANCEL;
@@ -305,11 +316,19 @@
     oggz_get_unit (p->oggz, p->serialno, p->zp.pos.calc_granulepos);
 
   if (p->stream->read_packet) {
-    p->stream->read_packet(p->oggz, &(p->zp), p->serialno, 
-                           p->stream->read_user_data);
+    if ((cb_ret = p->stream->read_packet(p->oggz, &(p->zp), p->serialno, 
+			       p->stream->read_user_data)) < 0) {
+      p->oggz->cb_next = cb_ret;
+      if (cb_ret == -1)
+        return DLIST_ITER_ERROR;
+    }
   } else if (p->reader->read_packet) {
-    p->reader->read_packet(p->oggz, &(p->zp), p->serialno, 
-                           p->reader->read_user_data);
+    if ((cb_ret = p->reader->read_packet(p->oggz, &(p->zp), p->serialno, 
+			       p->reader->read_user_data)) < 0) {
+      p->oggz->cb_next = cb_ret;
+      if (cb_ret == -1)
+        return DLIST_ITER_ERROR;
+    }
   }
 
   p->reader->current_granulepos = gp_stored;
@@ -465,7 +484,16 @@
               ogg_int64_t gp_stored = stream->last_granulepos;
               stream->last_packet = op;
               oggz_dlist_reverse_iter(oggz->packet_buffer, oggz_read_update_gp);
-              oggz_dlist_deliter(oggz->packet_buffer, oggz_read_deliver_packet);
+	      oggz->cb_next = 0;
+              if (oggz_dlist_deliter(oggz->packet_buffer, oggz_read_deliver_packet) == -1) {
+                return OGGZ_ERR_HOLE_IN_DATA;
+	      }
+	      if (oggz->cb_next > 0) {
+                cb_ret = oggz->cb_next;
+		oggz->cb_next = 0;
+		continue;
+	      }
+	      oggz->cb_next = 0;
 
               /* Fix up the stream granulepos. */
               stream->last_granulepos = gp_stored;
@@ -525,7 +553,10 @@
     }
 
     /* If we've got a stop already, don't read more data in */
-    if (cb_ret == OGGZ_STOP_OK || cb_ret == OGGZ_STOP_ERR) return cb_ret;
+    if (cb_ret == OGGZ_STOP_OK || 
+	cb_ret == OGGZ_STOP_ERR || 
+	cb_ret == OGGZ_ERR_HOLE_IN_DATA) 
+      return cb_ret;
 
     if(oggz_read_get_next_page (oggz, &og) < 0)
       return OGGZ_READ_EMPTY; /* eof. leave uninitialized */
@@ -636,8 +667,9 @@
       nread += bytes_read;
       
       cb_ret = oggz_read_sync (oggz);
-      if (cb_ret == OGGZ_ERR_OUT_OF_MEMORY)
+      if (cb_ret == OGGZ_ERR_OUT_OF_MEMORY || cb_ret == OGGZ_ERR_HOLE_IN_DATA) {
         return cb_ret;
+      }
     }
   }
 
diff -Nru liboggz-1.1.0/src/liboggz/oggz_seek.c liboggz-1.1.1/src/liboggz/oggz_seek.c
--- liboggz-1.1.0/src/liboggz/oggz_seek.c	2009-10-08 09:17:41.000000000 +0000
+++ liboggz-1.1.1/src/liboggz/oggz_seek.c	2010-04-29 00:36:42.000000000 +0000
@@ -479,6 +479,8 @@
 #else
       do {
         offset_at = oggz_get_prev_start_page(oggz, og, &granule_at, &serialno);
+        if (offset_at < 0)
+          break;
         unit_at = oggz_get_unit(oggz, serialno, granule_at);
       } while (unit_at > unit_target);
       return offset_at;
diff -Nru liboggz-1.1.0/src/Makefile.in liboggz-1.1.1/src/Makefile.in
--- liboggz-1.1.0/src/Makefile.in	2009-10-08 09:21:13.000000000 +0000
+++ liboggz-1.1.1/src/Makefile.in	2010-04-29 01:39:46.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -35,13 +37,15 @@
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac-sys-extra-largefile.m4 \
+	$(top_srcdir)/m4/as-ac-expand.m4 $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -53,10 +57,38 @@
 	ps-recursive uninstall-recursive
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 AMTAR = @AMTAR@
@@ -109,6 +141,7 @@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OGGZ_OFF_MAX = @OGGZ_OFF_MAX@
 OGG_CFLAGS = @OGG_CFLAGS@
@@ -120,6 +153,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -188,6 +222,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = liboggz tools tests examples
@@ -198,14 +233,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -223,6 +258,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -237,7 +273,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -254,7 +290,7 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -262,7 +298,7 @@
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -288,16 +324,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -305,14 +341,14 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -324,7 +360,7 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -333,29 +369,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -376,29 +417,44 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -428,6 +484,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -446,6 +503,8 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -454,18 +513,28 @@
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -486,8 +555,8 @@
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic clean-libtool \
@@ -503,6 +572,7 @@
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
 	uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru liboggz-1.1.0/src/tests/comment-test.c liboggz-1.1.1/src/tests/comment-test.c
--- liboggz-1.1.0/src/tests/comment-test.c	2009-09-10 14:00:20.000000000 +0000
+++ liboggz-1.1.1/src/tests/comment-test.c	2010-04-20 12:24:25.000000000 +0000
@@ -73,18 +73,6 @@
     FAIL ("Comment add to fresh bitstream failed");
   if (err < 0) FAIL ("Operation failed");
 
-  INFO ("+ Testing add of invalid unstructured COMMENT byname");
-  err = oggz_comment_add_byname (oggz, serialno, COMMENT, NULL);
-  if (err != OGGZ_ERR_COMMENT_INVALID)
-    FAIL ("Invalid comment not detected");
-
-  INFO ("+ Testing add of invalid unstructured COMMENT from local storage");
-  mycomment.name = COMMENT;
-  mycomment.value = NULL;
-  err = oggz_comment_add (oggz, serialno, &mycomment);
-  if (err != OGGZ_ERR_COMMENT_INVALID)
-    FAIL ("Invalid comment not detected");
-
   INFO ("+ Adding COPYRIGHT byname");
   err = oggz_comment_add_byname (oggz, serialno, "COPYRIGHT", COPYRIGHT);
   if (err < 0) FAIL ("Operation failed");
@@ -268,6 +256,15 @@
   if(op) FAIL ("Returned comment packet for invalid serialno");
   oggz_packet_destroy(op);
 
+  INFO ("+ Testing add of valid plain (not key=value) COMMENT byname");
+  err = oggz_comment_add_byname (oggz, serialno, COMMENT, NULL);
+  if (err < 0) FAIL ("Operation failed");
+
+  INFO ("+ Testing add of valid plain (not key=value) COMMENT from local storage");
+  mycomment.name = COMMENT;
+  mycomment.value = NULL;
+  err = oggz_comment_add (oggz, serialno, &mycomment);
+  if (err < 0) FAIL ("Operation failed");
 
   INFO ("+ Adding duplicate tag");
   err = oggz_comment_add_byname (oggz, serialno, "PERFORMER", PERFORMER);
diff -Nru liboggz-1.1.0/src/tests/Makefile.in liboggz-1.1.1/src/tests/Makefile.in
--- liboggz-1.1.0/src/tests/Makefile.in	2009-10-08 09:21:14.000000000 +0000
+++ liboggz-1.1.1/src/tests/Makefile.in	2010-04-29 01:39:46.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,8 +19,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,13 +44,15 @@
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac-sys-extra-largefile.m4 \
+	$(top_srcdir)/m4/as-ac-expand.m4 $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__EXEEXT_1 = comment-test$(EXEEXT)
 @OGGZ_CONFIG_WRITE_TRUE@am__EXEEXT_2 = write-bad-guard$(EXEEXT) \
 @OGGZ_CONFIG_WRITE_TRUE@	write-unmarked-guard$(EXEEXT) \
@@ -151,6 +155,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -187,6 +192,8 @@
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
+am__tty_colors = \
+red=; grn=; lgn=; blu=; std=
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -240,6 +247,7 @@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OGGZ_OFF_MAX = @OGGZ_OFF_MAX@
 OGG_CFLAGS = @OGG_CFLAGS@
@@ -251,6 +259,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -319,6 +328,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 INCLUDES = -I$(top_builddir) -I$(top_builddir)/include \
@@ -400,14 +410,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/tests/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/tests/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/tests/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu src/tests/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -425,13 +435,16 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 comment-test$(EXEEXT): $(comment_test_OBJECTS) $(comment_test_DEPENDENCIES) 
 	@rm -f comment-test$(EXEEXT)
 	$(LINK) $(comment_test_OBJECTS) $(comment_test_LDADD) $(LIBS)
@@ -538,21 +551,21 @@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -568,14 +581,14 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -583,37 +596,43 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
 	srcdir=$(srcdir); export srcdir; \
 	list=' $(TESTS) '; \
+	$(am__tty_colors); \
 	if test -n "$$list"; then \
 	  for tst in $$list; do \
 	    if test -f ./$$tst; then dir=./; \
@@ -622,49 +641,63 @@
 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *$$ws$$tst$$ws*) \
+	      *[\ \	]$$tst[\ \	]*) \
 		xpass=`expr $$xpass + 1`; \
 		failed=`expr $$failed + 1`; \
-		echo "XPASS: $$tst"; \
+		col=$$red; res=XPASS; \
 	      ;; \
 	      *) \
-		echo "PASS: $$tst"; \
+		col=$$grn; res=PASS; \
 	      ;; \
 	      esac; \
 	    elif test $$? -ne 77; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *$$ws$$tst$$ws*) \
+	      *[\ \	]$$tst[\ \	]*) \
 		xfail=`expr $$xfail + 1`; \
-		echo "XFAIL: $$tst"; \
+		col=$$lgn; res=XFAIL; \
 	      ;; \
 	      *) \
 		failed=`expr $$failed + 1`; \
-		echo "FAIL: $$tst"; \
+		col=$$red; res=FAIL; \
 	      ;; \
 	      esac; \
 	    else \
 	      skip=`expr $$skip + 1`; \
-	      echo "SKIP: $$tst"; \
+	      col=$$blu; res=SKIP; \
 	    fi; \
+	    echo "$${col}$$res$${std}: $$tst"; \
 	  done; \
+	  if test "$$all" -eq 1; then \
+	    tests="test"; \
+	    All=""; \
+	  else \
+	    tests="tests"; \
+	    All="All "; \
+	  fi; \
 	  if test "$$failed" -eq 0; then \
 	    if test "$$xfail" -eq 0; then \
-	      banner="All $$all tests passed"; \
+	      banner="$$All$$all $$tests passed"; \
 	    else \
-	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
 	    fi; \
 	  else \
 	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all tests failed"; \
+	      banner="$$failed of $$all $$tests failed"; \
 	    else \
-	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
 	    fi; \
 	  fi; \
 	  dashes="$$banner"; \
 	  skipped=""; \
 	  if test "$$skip" -ne 0; then \
-	    skipped="($$skip tests were not run)"; \
+	    if test "$$skip" -eq 1; then \
+	      skipped="($$skip test was not run)"; \
+	    else \
+	      skipped="($$skip tests were not run)"; \
+	    fi; \
 	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
 	      dashes="$$skipped"; \
 	  fi; \
@@ -675,11 +708,15 @@
 	      dashes="$$report"; \
 	  fi; \
 	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  echo "$$dashes"; \
+	  if test "$$failed" -eq 0; then \
+	    echo "$$grn$$dashes"; \
+	  else \
+	    echo "$$red$$dashes"; \
+	  fi; \
 	  echo "$$banner"; \
 	  test -z "$$skipped" || echo "$$skipped"; \
 	  test -z "$$report" || echo "$$report"; \
-	  echo "$$dashes"; \
+	  echo "$$dashes$$std"; \
 	  test "$$failed" -eq 0; \
 	else :; fi
 
@@ -699,13 +736,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -734,6 +775,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -755,6 +797,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -763,18 +807,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -797,7 +851,7 @@
 
 uninstall-am:
 
-.MAKE: install-am install-strip
+.MAKE: check-am install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
 	clean-generic clean-libtool clean-noinstPROGRAMS ctags \
@@ -815,6 +869,7 @@
 
 
 test: check
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru liboggz-1.1.0/src/tools/Makefile.in liboggz-1.1.1/src/tools/Makefile.in
--- liboggz-1.1.0/src/tools/Makefile.in	2009-10-08 09:21:14.000000000 +0000
+++ liboggz-1.1.1/src/tools/Makefile.in	2010-04-29 01:39:46.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,8 +19,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -41,13 +43,15 @@
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/oggz-diff.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac-sys-extra-largefile.m4 \
+	$(top_srcdir)/m4/as-ac-expand.m4 $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = oggz-diff
+CONFIG_CLEAN_VPATH_FILES =
 am__EXEEXT_1 = oggz$(EXEEXT) oggz-known-codecs$(EXEEXT)
 @OGGZ_CONFIG_READ_TRUE@am__EXEEXT_2 = oggz-dump$(EXEEXT) \
 @OGGZ_CONFIG_READ_TRUE@	oggz-info$(EXEEXT) oggz-scan$(EXEEXT) \
@@ -58,7 +62,6 @@
 @OGGZ_CONFIG_READ_TRUE@@OGGZ_CONFIG_WRITE_TRUE@	oggz-comment$(EXEEXT) \
 @OGGZ_CONFIG_READ_TRUE@@OGGZ_CONFIG_WRITE_TRUE@	oggz-sort$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 am__EXEEXT_4 =
 @OGGZ_CONFIG_READ_TRUE@@OGGZ_CONFIG_WRITE_TRUE@am__EXEEXT_5 = oggz-basetime$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
@@ -102,11 +105,32 @@
 am_oggz_validate_OBJECTS = oggz-validate.$(OBJEXT) $(am__objects_1)
 oggz_validate_OBJECTS = $(am_oggz_validate_OBJECTS)
 oggz_validate_DEPENDENCIES = $(am__DEPENDENCIES_1)
-binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+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 = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 SCRIPTS = $(bin_SCRIPTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -138,10 +162,38 @@
 HEADERS = $(noinst_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 AMTAR = @AMTAR@
@@ -194,6 +246,7 @@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OGGZ_OFF_MAX = @OGGZ_OFF_MAX@
 OGG_CFLAGS = @OGG_CFLAGS@
@@ -205,6 +258,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -273,6 +327,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = oggz-chop
@@ -324,14 +379,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/tools/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/tools/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/tools/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu src/tools/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -349,43 +404,61 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 oggz-diff: $(top_builddir)/config.status $(srcdir)/oggz-diff.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 
 clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 oggz$(EXEEXT): $(oggz_OBJECTS) $(oggz_DEPENDENCIES) 
 	@rm -f oggz$(EXEEXT)
 	$(LINK) $(oggz_OBJECTS) $(oggz_LDADD) $(LIBS)
@@ -425,22 +498,37 @@
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f $$d$$p; then \
-	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	    $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
-	  else :; fi; \
-	done
+	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n' \
+	    -e 'h;s|.*|.|' \
+	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+	      if (++n[d] == $(am__install_max)) { \
+		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+	    else { print "f", d "/" $$4, $$1 } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	     test -z "$$files" || { \
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	     } \
+	; done
 
 uninstall-binSCRIPTS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(bin_SCRIPTS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
+	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	       sed -e 's,.*/,,;$(transform)'`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -467,35 +555,35 @@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 dirac.o: $(srcdir)/../liboggz/dirac.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dirac.o -MD -MP -MF $(DEPDIR)/dirac.Tpo -c -o dirac.o `test -f '$(srcdir)/../liboggz/dirac.c' || echo '$(srcdir)/'`$(srcdir)/../liboggz/dirac.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/dirac.Tpo $(DEPDIR)/dirac.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/dirac.Tpo $(DEPDIR)/dirac.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../liboggz/dirac.c' object='dirac.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dirac.o `test -f '$(srcdir)/../liboggz/dirac.c' || echo '$(srcdir)/'`$(srcdir)/../liboggz/dirac.c
 
 dirac.obj: $(srcdir)/../liboggz/dirac.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dirac.obj -MD -MP -MF $(DEPDIR)/dirac.Tpo -c -o dirac.obj `if test -f '$(srcdir)/../liboggz/dirac.c'; then $(CYGPATH_W) '$(srcdir)/../liboggz/dirac.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../liboggz/dirac.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/dirac.Tpo $(DEPDIR)/dirac.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/dirac.Tpo $(DEPDIR)/dirac.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../liboggz/dirac.c' object='dirac.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dirac.obj `if test -f '$(srcdir)/../liboggz/dirac.c'; then $(CYGPATH_W) '$(srcdir)/../liboggz/dirac.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../liboggz/dirac.c'; fi`
@@ -513,7 +601,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -530,7 +618,7 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -538,7 +626,7 @@
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -564,16 +652,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -581,14 +669,14 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -600,7 +688,7 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -609,29 +697,34 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -652,29 +745,44 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -707,6 +815,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -728,6 +837,8 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -736,19 +847,29 @@
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am: install-binPROGRAMS install-binSCRIPTS \
 	install-exec-local
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -772,8 +893,8 @@
 uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
 	uninstall-local
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-binPROGRAMS \
@@ -815,6 +936,7 @@
 	    $(RM) $(exec_prefix)/bin/oggz$$p ; \
 	  fi ; \
 	done
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru liboggz-1.1.0/src/tools/oggz-chop/Makefile.in liboggz-1.1.1/src/tools/oggz-chop/Makefile.in
--- liboggz-1.1.0/src/tools/oggz-chop/Makefile.in	2009-10-08 09:21:14.000000000 +0000
+++ liboggz-1.1.1/src/tools/oggz-chop/Makefile.in	2010-04-29 01:39:46.000000000 +0000
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,8 +18,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -41,16 +43,17 @@
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac-sys-extra-largefile.m4 \
+	$(top_srcdir)/m4/as-ac-expand.m4 $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 @OGGZ_CONFIG_READ_TRUE@@OGGZ_CONFIG_WRITE_TRUE@am__EXEEXT_1 = oggz-chop$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 am_httpdate_test_OBJECTS = httpdate.$(OBJEXT) httpdate_test.$(OBJEXT)
 httpdate_test_OBJECTS = $(am_httpdate_test_OBJECTS)
@@ -65,6 +68,7 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -79,6 +83,8 @@
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
+am__tty_colors = \
+red=; grn=; lgn=; blu=; std=
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -132,6 +138,7 @@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OGGZ_OFF_MAX = @OGGZ_OFF_MAX@
 OGG_CFLAGS = @OGG_CFLAGS@
@@ -143,6 +150,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -211,6 +219,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 INCLUDES = -I$(top_builddir) -I$(top_builddir)/include \
@@ -237,14 +246,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/tools/oggz-chop/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/tools/oggz-chop/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/tools/oggz-chop/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu src/tools/oggz-chop/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -262,41 +271,59 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 
 clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 httpdate_test$(EXEEXT): $(httpdate_test_OBJECTS) $(httpdate_test_DEPENDENCIES) 
 	@rm -f httpdate_test$(EXEEXT)
 	$(LINK) $(httpdate_test_OBJECTS) $(httpdate_test_LDADD) $(LIBS)
@@ -325,77 +352,77 @@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 oggz_tools.o: $(srcdir)/../oggz_tools.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT oggz_tools.o -MD -MP -MF $(DEPDIR)/oggz_tools.Tpo -c -o oggz_tools.o `test -f '$(srcdir)/../oggz_tools.c' || echo '$(srcdir)/'`$(srcdir)/../oggz_tools.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/oggz_tools.Tpo $(DEPDIR)/oggz_tools.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/oggz_tools.Tpo $(DEPDIR)/oggz_tools.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../oggz_tools.c' object='oggz_tools.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o oggz_tools.o `test -f '$(srcdir)/../oggz_tools.c' || echo '$(srcdir)/'`$(srcdir)/../oggz_tools.c
 
 oggz_tools.obj: $(srcdir)/../oggz_tools.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT oggz_tools.obj -MD -MP -MF $(DEPDIR)/oggz_tools.Tpo -c -o oggz_tools.obj `if test -f '$(srcdir)/../oggz_tools.c'; then $(CYGPATH_W) '$(srcdir)/../oggz_tools.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../oggz_tools.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/oggz_tools.Tpo $(DEPDIR)/oggz_tools.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/oggz_tools.Tpo $(DEPDIR)/oggz_tools.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../oggz_tools.c' object='oggz_tools.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o oggz_tools.obj `if test -f '$(srcdir)/../oggz_tools.c'; then $(CYGPATH_W) '$(srcdir)/../oggz_tools.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../oggz_tools.c'; fi`
 
 skeleton.o: $(srcdir)/../skeleton.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT skeleton.o -MD -MP -MF $(DEPDIR)/skeleton.Tpo -c -o skeleton.o `test -f '$(srcdir)/../skeleton.c' || echo '$(srcdir)/'`$(srcdir)/../skeleton.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/skeleton.Tpo $(DEPDIR)/skeleton.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/skeleton.Tpo $(DEPDIR)/skeleton.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../skeleton.c' object='skeleton.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o skeleton.o `test -f '$(srcdir)/../skeleton.c' || echo '$(srcdir)/'`$(srcdir)/../skeleton.c
 
 skeleton.obj: $(srcdir)/../skeleton.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT skeleton.obj -MD -MP -MF $(DEPDIR)/skeleton.Tpo -c -o skeleton.obj `if test -f '$(srcdir)/../skeleton.c'; then $(CYGPATH_W) '$(srcdir)/../skeleton.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../skeleton.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/skeleton.Tpo $(DEPDIR)/skeleton.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/skeleton.Tpo $(DEPDIR)/skeleton.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../skeleton.c' object='skeleton.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o skeleton.obj `if test -f '$(srcdir)/../skeleton.c'; then $(CYGPATH_W) '$(srcdir)/../skeleton.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../skeleton.c'; fi`
 
 mimetypes.o: $(srcdir)/../mimetypes.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mimetypes.o -MD -MP -MF $(DEPDIR)/mimetypes.Tpo -c -o mimetypes.o `test -f '$(srcdir)/../mimetypes.c' || echo '$(srcdir)/'`$(srcdir)/../mimetypes.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mimetypes.Tpo $(DEPDIR)/mimetypes.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mimetypes.Tpo $(DEPDIR)/mimetypes.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../mimetypes.c' object='mimetypes.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mimetypes.o `test -f '$(srcdir)/../mimetypes.c' || echo '$(srcdir)/'`$(srcdir)/../mimetypes.c
 
 mimetypes.obj: $(srcdir)/../mimetypes.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mimetypes.obj -MD -MP -MF $(DEPDIR)/mimetypes.Tpo -c -o mimetypes.obj `if test -f '$(srcdir)/../mimetypes.c'; then $(CYGPATH_W) '$(srcdir)/../mimetypes.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../mimetypes.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mimetypes.Tpo $(DEPDIR)/mimetypes.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mimetypes.Tpo $(DEPDIR)/mimetypes.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../mimetypes.c' object='mimetypes.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mimetypes.obj `if test -f '$(srcdir)/../mimetypes.c'; then $(CYGPATH_W) '$(srcdir)/../mimetypes.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../mimetypes.c'; fi`
 
 dirac.o: $(srcdir)/../../liboggz/dirac.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dirac.o -MD -MP -MF $(DEPDIR)/dirac.Tpo -c -o dirac.o `test -f '$(srcdir)/../../liboggz/dirac.c' || echo '$(srcdir)/'`$(srcdir)/../../liboggz/dirac.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/dirac.Tpo $(DEPDIR)/dirac.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/dirac.Tpo $(DEPDIR)/dirac.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../../liboggz/dirac.c' object='dirac.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dirac.o `test -f '$(srcdir)/../../liboggz/dirac.c' || echo '$(srcdir)/'`$(srcdir)/../../liboggz/dirac.c
 
 dirac.obj: $(srcdir)/../../liboggz/dirac.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dirac.obj -MD -MP -MF $(DEPDIR)/dirac.Tpo -c -o dirac.obj `if test -f '$(srcdir)/../../liboggz/dirac.c'; then $(CYGPATH_W) '$(srcdir)/../../liboggz/dirac.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../../liboggz/dirac.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/dirac.Tpo $(DEPDIR)/dirac.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/dirac.Tpo $(DEPDIR)/dirac.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../../liboggz/dirac.c' object='dirac.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dirac.obj `if test -f '$(srcdir)/../../liboggz/dirac.c'; then $(CYGPATH_W) '$(srcdir)/../../liboggz/dirac.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../../liboggz/dirac.c'; fi`
@@ -411,14 +438,14 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -426,37 +453,43 @@
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
 	srcdir=$(srcdir); export srcdir; \
 	list=' $(TESTS) '; \
+	$(am__tty_colors); \
 	if test -n "$$list"; then \
 	  for tst in $$list; do \
 	    if test -f ./$$tst; then dir=./; \
@@ -465,49 +498,63 @@
 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *$$ws$$tst$$ws*) \
+	      *[\ \	]$$tst[\ \	]*) \
 		xpass=`expr $$xpass + 1`; \
 		failed=`expr $$failed + 1`; \
-		echo "XPASS: $$tst"; \
+		col=$$red; res=XPASS; \
 	      ;; \
 	      *) \
-		echo "PASS: $$tst"; \
+		col=$$grn; res=PASS; \
 	      ;; \
 	      esac; \
 	    elif test $$? -ne 77; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *$$ws$$tst$$ws*) \
+	      *[\ \	]$$tst[\ \	]*) \
 		xfail=`expr $$xfail + 1`; \
-		echo "XFAIL: $$tst"; \
+		col=$$lgn; res=XFAIL; \
 	      ;; \
 	      *) \
 		failed=`expr $$failed + 1`; \
-		echo "FAIL: $$tst"; \
+		col=$$red; res=FAIL; \
 	      ;; \
 	      esac; \
 	    else \
 	      skip=`expr $$skip + 1`; \
-	      echo "SKIP: $$tst"; \
+	      col=$$blu; res=SKIP; \
 	    fi; \
+	    echo "$${col}$$res$${std}: $$tst"; \
 	  done; \
+	  if test "$$all" -eq 1; then \
+	    tests="test"; \
+	    All=""; \
+	  else \
+	    tests="tests"; \
+	    All="All "; \
+	  fi; \
 	  if test "$$failed" -eq 0; then \
 	    if test "$$xfail" -eq 0; then \
-	      banner="All $$all tests passed"; \
+	      banner="$$All$$all $$tests passed"; \
 	    else \
-	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
 	    fi; \
 	  else \
 	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all tests failed"; \
+	      banner="$$failed of $$all $$tests failed"; \
 	    else \
-	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
 	    fi; \
 	  fi; \
 	  dashes="$$banner"; \
 	  skipped=""; \
 	  if test "$$skip" -ne 0; then \
-	    skipped="($$skip tests were not run)"; \
+	    if test "$$skip" -eq 1; then \
+	      skipped="($$skip test was not run)"; \
+	    else \
+	      skipped="($$skip tests were not run)"; \
+	    fi; \
 	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
 	      dashes="$$skipped"; \
 	  fi; \
@@ -518,11 +565,15 @@
 	      dashes="$$report"; \
 	  fi; \
 	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  echo "$$dashes"; \
+	  if test "$$failed" -eq 0; then \
+	    echo "$$grn$$dashes"; \
+	  else \
+	    echo "$$red$$dashes"; \
+	  fi; \
 	  echo "$$banner"; \
 	  test -z "$$skipped" || echo "$$skipped"; \
 	  test -z "$$report" || echo "$$report"; \
-	  echo "$$dashes"; \
+	  echo "$$dashes$$std"; \
 	  test "$$failed" -eq 0; \
 	else :; fi
 
@@ -542,13 +593,17 @@
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -580,6 +635,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -601,6 +657,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -609,18 +667,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-binPROGRAMS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -643,7 +711,7 @@
 
 uninstall-am: uninstall-binPROGRAMS
 
-.MAKE: install-am install-strip
+.MAKE: check-am install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
 	clean-binPROGRAMS clean-generic clean-libtool \
@@ -660,6 +728,7 @@
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
 	uninstall-binPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru liboggz-1.1.0/src/tools/oggz-diff liboggz-1.1.1/src/tools/oggz-diff
--- liboggz-1.1.0/src/tools/oggz-diff	2009-10-08 09:21:22.000000000 +0000
+++ liboggz-1.1.1/src/tools/oggz-diff	2010-04-29 01:39:49.000000000 +0000
@@ -31,7 +31,7 @@
 ## SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 version () {
-  echo >&2 "oggz-diff version "1.1.0
+  echo >&2 "oggz-diff version "1.1.1
   exit 1
 }
 
diff -Nru liboggz-1.1.0/src/tools/oggz-validate.c liboggz-1.1.1/src/tools/oggz-validate.c
--- liboggz-1.1.0/src/tools/oggz-validate.c	2009-10-08 09:20:39.000000000 +0000
+++ liboggz-1.1.1/src/tools/oggz-validate.c	2010-04-29 01:13:19.000000000 +0000
@@ -297,7 +297,7 @@
 
     packetno = (int)oggz_table_lookup (ovdata->packetno, serialno);
     headers = oggz_stream_get_numheaders (oggz, serialno);
-    if (packetno < headers) {
+    if (packetno < headers-1) {
       /* The previous page was headers, and more are expected */
       packetno += packets;
       if (oggz_table_insert (ovdata->packetno, serialno, (void *)packetno) == NULL)
diff -Nru liboggz-1.1.0/TODO liboggz-1.1.1/TODO
--- liboggz-1.1.0/TODO	1970-01-01 00:00:00.000000000 +0000
+++ liboggz-1.1.1/TODO	2010-04-29 01:13:19.000000000 +0000
@@ -0,0 +1,175 @@
+
+This is a loosely-categorized list of outstanding tasks and ideas for improving
+liboggz and the oggz tools. When implementing any of these, please include an
+update to this TODO file removing that task, in the same commit.
+
+Library
+=======
+
+Documentation
+-------------
+
+	Doxygen
+	* add docs about auto gp functionality
+	* review: is all functionality covered?
+	* separate into intro/advanced topics
+	* rewrite intro so that newer, simpler functionality is covered.
+
+Seeking
+-------
+(See seek-rewrite branch for updates)
+
+	State
+	* add seek_packet() function to return to a previous packet
+
+	Keyframe seeking
+	* add seek_keyframe() (double-seek) function, using method from thread
+	titled "ogg double seek algorithm" to a11y list 18/11/2008 including
+	Ralph's corrections
+
+	* seek to a specific gp (not time)
+
+	* switch table to a vector
+	* seek_units (SET, CUR, END)
+
+	oggz_get_duration()
+	* add new public API call
+	* subtract file start / presentation time from duration
+
+	Large file offsets
+	* introduce seek_offset(), tell_offset() variants using oggz_off_t
+	interface, and deprecate oggz_seek(), oggz_tell()
+
+	* s/units/time/ throughout (or more explicitly "milliseconds" or
+	"nanoseconds")
+
+	New seek API calls:
+	* next(), prev(), key(): seek to the next, prev or keyframe of this packet
+
+Internals
+---------
+
+	* replace table implementation, allow NULL insertion
+
+	* use debug_printf() (eg. from libshcodecs) instead of #ifdef DEBUG
+	throughout
+
+Cleanups
+--------
+	* dirac.c is included in tools/Makefile.am in LIBS. Instead, include it
+	where it is actually used (by oggz_tools.c)
+
+API
+---
+	* rename all track-specific functions to oggz_track_*() ?
+
+	* add a OGGZ_SORT option (flag w/ OGGZ_WRITE) which queues pages like
+	oggz-merge internally. Use this for oggz-merge (and libannodex ...)
+
+	* add low-level public functions to extract packets from a page?
+	(like in fix-eos)
+
+
+Tools
+===== 
+
+	* verbose operation in oggz-sort, oggz-merge etc. should print to stderr,
+	not clobber stdout
+
+	* use libexplain in tools, esp. oggz-chop logging errors.
+
+oggz-addskel
+------------
+	* new tool to add skeleton (though oggz-chop with no args does this)
+
+oggz-chop
+---------
+(See chop-rewrite branch for updates)
+
+	Content-Duration
+	* add Content-Duration header
+	* use get_duration() in oggz-chop
+
+	Content-Length
+	* if no subview, return length of file
+	* if supports byte range redirect, cache control section and return its
+	length. Print that, then sendfile() the control section.
+	Else, build, write and send the whole subview.
+
+	* use seek_keyframe() to find chop point, from which to accumulate headers.
+	Confirm same output as current version.
+
+	Error handling
+	* handle failed parse of query: redirect to canonical file rather than
+	producing output (for caching sanity), or reject the request?
+	* strip unknown parameters and redirect to canonical form?
+
+	Range requests
+	* handle Range requests
+
+	Skeleton
+	* add message header fields for Chopped-By, Encoded-By etc.
+
+	Multiple time ranges
+	* support multiple time ranges, convert to byte ranges
+
+	* Terminate when all tracks are at EOS, don't spin to end of file.
+
+	FastCGI support
+
+	sndfile()
+
+	TCP_CORK
+
+oggz-comment
+------------
+	* add a -p option to add padding, like rareware's oggenc2. This will need
+	to track page boundaries accurately, ie. when inserting tags, see if it
+	can be done inplace and do that if possible.
+
+oggz-diff
+---------
+	* is not using mkfifo
+
+oggz-dump
+---------
+	* add info to "oggz-dump --help" explaining how to interpret the info.
+	Point to RFC3533 for details. Explain serialno, and explain granulepos for
+	audio, Theora and Dirac -- ie. how to interpret keyframe.
+
+oggz-optimize
+-------------
+	* new tool: optimize the flushing on an ogg stream. Give limits on page
+	duration or size.
+
+oggz-merge
+----------
+	* Accumulate gp -1 pages rather than writing them out as soon as they
+	are available, so that single-packet continued pages are placed immediately
+	prior to the page their contained packet finishes on.
+	(reported by gmaxwell, 20100318)
+
+	* Dirac: take pt,dt into account. See
+	http://lists.xiph.org/pipermail/ogg-dev/2008-November/001264.html
+	* but first, reject Dirac streams
+
+oggz-sort
+---------
+	* Accumulate gp -1 pages rather than writing them out as soon as they
+	are available, so that single-packet continued pages are placed immediately
+	prior to the page their contained packet finishes on.
+	(reported by gmaxwell, 20100318)
+
+	* Dirac: take pt,dt into account. See
+	http://lists.xiph.org/pipermail/ogg-dev/2008-November/001264.html
+	* but first, reject Dirac streams
+
+oggz-validate
+-------------
+	* Throw an error for pages with gp -1 that have a packet finishing on them
+	(requested by derf 20100316, framing spec clearly states that "A special
+	value of '-1' (in two's complement) indicates that no packets finish on this
+	page."
+
+	* validate skeleton
+